r54948 - in /desktop/unstable/gtk+2.0/debian: changelog rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Fri Dec  1 20:19:14 2017
New Revision: 54948

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54948
Log:
Don't restrict gtk2 dh_shlibdeps hack to Ubuntu

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    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=54948&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog	[utf-8] Fri Dec  1 20:19:14 2017
@@ -2,7 +2,6 @@
 
   * Don't have gtk2-engines-pixbuf depend on libgtk2.0-0 to allow
     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/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=54948&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/rules	[utf-8] Fri Dec  1 20:19:14 2017
@@ -295,11 +295,7 @@
 		-- -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
-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