Merge lp:~mitya57/overlay-scrollbar/lp1084255 into lp:overlay-scrollbar

[Dmitry Shachnev]

There is a patch at debian/patches/01_workaround_qt_overlay_crash.patch that fixes bug 1005677 but it's not applied in the current raring version because of 1.0 source format and absense of debian/patches/series. This branch aims to fix that.

[Mathieu Trudel-Lapierre (cyphermox)]

A more correct way to handle this would be to apply the patch "upstream" directly. Do you want to resubmit this MP for applying the patch directly to lp:overlay-scrollbar?

review: Disapprove

[Dmitry Shachnev (mitya57)]

That patch was not approved for including into lp:overlay-scrollbar, so was kept as a distro patch. See https://code.launchpad.net/~aacid/overlay-scrollbar/qt_no_overlay_scrollbar/+merge/124697/comments/268767.

[Mathieu Trudel-Lapierre (cyphermox)]

I still think it would be a more correct procedure. There is no reason why such a patch can't be fixed to be applicable upstream.

Rather than changing to format 3.0; it would be better in this case to use --with quilt and add a Build-Depends on quilt. Could you fix this?

review: Needs Fixing

[Didier Roche-Tolomelli (didrocks)]

@Mathieu: vlc is broken right now because of that, I went ahead and did merge it upstream in https://code.launchpad.net/~didrocks/overlay-scrollbar/fix-calibre-freeze/+merge/137122.

@Dmitry: we don't do anymore distro patch on any PS projects, if a fix isn't suitable upstream, it's not suitable for ubuntu.

Thanks Dmitry!

[Dmitry Shachnev (mitya57)]

Now overlay scrollbars won't compile on non-Ubuntu systems as ubuntu_gtk_get_use_overlay_scrollbar() is defined only on Ubuntu...

Unmerged revisions

363. By Dmitry Shachnev on 2012-11-29

Use 3.0 (quilt) source format and add debian/patches/series
(LP: #1084255).

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-28 06:30:37 +0000
+++ debian/changelog	2012-11-29 18:10:37 +0000
@@ -16,6 +16,10 @@
     - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL.
   * debian/copyright: update to properly reflect upstream copyright.
 
+  [ Dmitry Shachnev ]
+  * Use 3.0 (quilt) source format and add debian/patches/series
+    (LP: #1084255).
+
   [ Automatic PS uploader ]
   * Automatic snapshot from revision 361
 
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-11-29 18:10:37 +0000
@@ -0,0 +1,1 @@
+01_workaround_qt_overlay_crash.patch
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-11-29 18:10:37 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)