r54942 - in /desktop/unstable/gtk+2.0/debian: changelog control control.in rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Thu Nov 30 18:19:24 2017
New Revision: 54942

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54942
Log:
Fix up gtk2-engines dependency change and only apply it on Ubuntu

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/control
    desktop/unstable/gtk+2.0/debian/control.in
    desktop/unstable/gtk+2.0/debian/rules

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=54942&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog	[utf-8] Thu Nov 30 18:19:24 2017
@@ -1,7 +1,8 @@
 gtk+2.0 (2.24.31-4) UNRELEASED; urgency=medium
 
   * Don't have gtk2-engines-pixbuf depend on libgtk2.0-0 to allow
-    themes to be installed without requiring GTK+ 2 to be installed
+    themes to be installed without requiring GTK+ 2 to be installed.
+    Only make that change on Ubuntu for now.
 
  -- Jeremy Bicha <jbicha at debian.org>  Wed, 29 Nov 2017 21:07:12 -0500
 

Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=54942&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control	[utf-8] Thu Nov 30 18:19:24 2017
@@ -198,8 +198,7 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libgtk2.0-0 (= ${binary:Version})
+         ${shlibs:Depends}
 Description: pixbuf-based theme for GTK+ 2.x
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable

Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=54942&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control.in	[utf-8] Thu Nov 30 18:19:24 2017
@@ -198,8 +198,7 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         @SHARED_PKG@ (= ${binary:Version})
+         ${shlibs:Depends}
 Description: pixbuf-based theme for GTK+ 2.x
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=54942&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/rules	[utf-8] Thu Nov 30 18:19:24 2017
@@ -295,8 +295,14 @@
 		-- -c4
 	dh_girepository -pgir1.2-gtk-2.0
 	dh_installdeb -s
+ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 	dh_shlibdeps -p$(PIXBUF_PKG) -- -xlibgtk2.0-0
-	dh_shlibdeps --remaining-packages
+else
+	dh_shlibdeps -p$(PIXBUF_PKG)
+endif
+	# --remaining-packages didn't work right so let's at least make sure
+	# it doesn't run a second time for the pixbuf .so
+	dh_shlibdeps --remaining-packages -Xlibpixmap.so
 	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s -- -Zxz