callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't restrict gtk2 dh_shlibdeps hack to Ubuntu

Browse Source
This commit is contained in:
Jeremy Bicha
2017-12-01 20:19:14 +00:00
parent 53082d0b7e
commit ccc10fb872
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -2,7 +2,6 @@ gtk+2.0 (2.24.31-4) UNRELEASED; urgency=medium
* Don't have gtk2-engines-pixbuf depend on libgtk2.0-0 to allow * 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@debian.org> Wed, 29 Nov 2017 21:07:12 -0500 -- Jeremy Bicha <jbicha@debian.org> Wed, 29 Nov 2017 21:07:12 -0500

4
debian/rules vendored
View File

@ -295,11 +295,7 @@ binary-arch: build-arch $(maybe_check) install-arch $(call dh_subst_files,$(BINA
-- -c4 -- -c4
dh_girepository -pgir1.2-gtk-2.0 dh_girepository -pgir1.2-gtk-2.0
dh_installdeb -s dh_installdeb -s
ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
dh_shlibdeps -p$(PIXBUF_PKG) -- -xlibgtk2.0-0 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 # --remaining-packages didn't work right so let's at least make sure
# it doesn't run a second time for the pixbuf .so # it doesn't run a second time for the pixbuf .so
dh_shlibdeps --remaining-packages -Xlibpixmap.so dh_shlibdeps --remaining-packages -Xlibpixmap.so