From 7617969d1ecc4ac3a8f6af26d94f71c3e48dcda8 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 15 Dec 2005 18:09:27 +0000 Subject: [PATCH 01/18] gtk+2.0 (2.8.9-2) unstable; urgency=low * Upload to unstable -- Sebastien Bacher Thu, 15 Dec 2005 15:13:32 +0100 gtk+2.0 (2.8.9-1) experimental; urgency=low * New upstream version: Bugs fixed: - File chooser filter behaves weird - 2.8.4 to 2.8.6: sound-juicer crash, fileselector assertions - On unsetting the Model, GtkTreeView does not clear it's associated TreeSelection - Crash on selecting a file of null mime-type - gtktoolbutton leaks a pixbuf - GdkEvent leaked in gtktreeview.c / gtk_tree_view_key_press - Typo in trap_activate_cb() - gtkcalendar.c: The identifier is already declared. - gtk_menu_attach_to_widget() does not take NULL detacher - Unhinted fonts are measured incorrectly and drawing problems occur as a result - unwanted scrolling in recent gtk - Toolbars without icons are invisible in icon-only mode - Search-entry in the TreeView not working properly - gtktoolbutton.c:562: warning: 'image' is used uninitialized in this function - reference count of textbuffer increases with each paste - gtk_selection_data_get_uris leaks memory Other changes: - Remove GMemChunk from public header files to support building against GLib 2.10 - Report errors in option parsing - Merge upstream xdgmime changes to handle duplicate glob patterns -- Sebastien Bacher Sat, 10 Dec 2005 18:22:50 +0100 --- debian/changelog | 37 +++++++++++++++++++++++++++++++++++++ debian/scripts/vars | 2 +- debian/sources | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3a586c72c..2fbf0aba5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,40 @@ +gtk+2.0 (2.8.9-2) unstable; urgency=low + + * Upload to unstable + + -- Sebastien Bacher Thu, 15 Dec 2005 15:13:32 +0100 + +gtk+2.0 (2.8.9-1) experimental; urgency=low + + * New upstream version: + Bugs fixed: + - File chooser filter behaves weird + - 2.8.4 to 2.8.6: sound-juicer crash, fileselector assertions + - On unsetting the Model, GtkTreeView does not clear + it's associated TreeSelection + - Crash on selecting a file of null mime-type + - gtktoolbutton leaks a pixbuf + - GdkEvent leaked in gtktreeview.c / gtk_tree_view_key_press + - Typo in trap_activate_cb() + - gtkcalendar.c: The identifier is already declared. + - gtk_menu_attach_to_widget() does not take NULL detacher + - Unhinted fonts are measured incorrectly and drawing + problems occur as a result + - unwanted scrolling in recent gtk + - Toolbars without icons are invisible in icon-only mode + - Search-entry in the TreeView not working properly + - gtktoolbutton.c:562: warning: 'image' is used + uninitialized in this function + - reference count of textbuffer increases with each paste + - gtk_selection_data_get_uris leaks memory + Other changes: + - Remove GMemChunk from public header files to + support building against GLib 2.10 + - Report errors in option parsing + - Merge upstream xdgmime changes to handle duplicate glob patterns + + -- Sebastien Bacher Sat, 10 Dec 2005 18:22:50 +0100 + gtk+2.0 (2.8.8-1) experimental; urgency=low * New upstream version: diff --git a/debian/scripts/vars b/debian/scripts/vars index 936b28f2a6..197483fec6 100644 --- a/debian/scripts/vars +++ b/debian/scripts/vars @@ -8,7 +8,7 @@ SOURCE_DIR=build-tree # For a single pkg, this is the directory that is embedded in the tarball. # For multiple pkgs, this is null. -TAR_DIR=gtk+-2.8.8 +TAR_DIR=gtk+-2.8.9 # Where to place all the stamp files. This directory can be removed, and # all the targets will then be rerun. STAMP_DIR=debian/stampdir diff --git a/debian/sources b/debian/sources index 56645b929e..a7d0a84e12 100644 --- a/debian/sources +++ b/debian/sources @@ -1 +1 @@ -upstream tar ../gtk+-2.8.8.tar.gz +upstream tar ../gtk+-2.8.9.tar.gz From 205a218bae330207f19b95ce203fb13c6cb5d562 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sun, 25 Jun 2006 20:15:14 +0000 Subject: [PATCH 02/18] Revert the LD_LIBRARY_PATH hack, removed by mistake. --- debian/rules | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index b89183343b..48c074305b 100644 --- a/debian/rules +++ b/debian/rules @@ -41,6 +41,8 @@ glibver=2.0 atkver=1.0 pangover=1.0 shver=2.8.0 +libpath=$(CURDIR)/$(BUILD_SHARED_DIR)/gdk-pixbuf/.libs:$(CURDIR)/$(BUILD_SHARED_DIR)/gdk/.libs:$(CURDIR)/$(BUILD_SHARED_DIR)/gtk/.libs +libpath_dfb=$(CURDIR)/$(BUILD_DFB_DIR)/gdk-pixbuf/.libs:$(CURDIR)/$(BUILD_DFB_DIR)/gdk/.libs:$(CURDIR)/$(BUILD_DFB_DIR)/gtk/.libs debian/control: @@ -156,7 +158,8 @@ $(STAMP_DIR)/build-shared-stamp: -rm -f $(STAMP_DIR)/install-test-stamp # Add here commands to compile the package. - $(MAKE) -C $(BUILD_SHARED_DIR) + $(MAKE) -C $(BUILD_SHARED_DIR) \ + LD_LIBRARY_PATH=$(libpath):$(LD_LIBRARY_PATH) touch $@ @@ -179,7 +182,8 @@ $(STAMP_DIR)/build-dfb-stamp: -rm -f $(STAMP_DIR)/install-test-stamp # Add here commands to compile the package. - $(MAKE) -C $(BUILD_DFB_DIR) + $(MAKE) -C $(BUILD_DFB_DIR) \ + LD_LIBRARY_PATH=$(libpath_dfb):$(LD_LIBRARY_PATH) touch $@ From 8590a45c1b5180ba9bf84452b5b96796516f04a2 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sun, 25 Jun 2006 20:37:13 +0000 Subject: [PATCH 03/18] Document that I ran aclocal. Fix DESTDIR use in the install-dfb target. --- debian/changelog | 4 ++-- debian/rules | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 852403b6b8..71be99e359 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,8 @@ gtk+2.0 (2.8.18-3) experimental; urgency=low * 003_gtk+-2.8.17-directfb.patch: new patch, bringing a new directfb backend. * 004_reautoconf.patch: new patch, result of "libtoolize --force - --copy; autoheader; automake -acf; autoconf; rm -rf autom4te.cache" - with the previous patches applied. + --copy; aclocal; autoheader; automake -acf; autoconf; rm -rf + autom4te.cache" with the previous patches applied. * Make 3 new packages: libgtk+2.0-directfb0-udeb, libgtk+2.0-directfb-dev and libgtk+2.0-directfb0. * Add a new build flavour for directfb (only the shared version). diff --git a/debian/rules b/debian/rules index 48c074305b..0964410d71 100644 --- a/debian/rules +++ b/debian/rules @@ -225,13 +225,13 @@ install-static: build-static install-test install-dfb: build-shared install-test # Add here commands to install the package into debian/tmp - dest=$(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix) - $(MAKE) -C $(BUILD_SHARED_DIR) install DESTDIR=$(dest) + $(MAKE) -C $(BUILD_SHARED_DIR) install \ + DESTDIR=$(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix) find $(dest) -name \*.la -exec rm -f \{\} \; - mkdir -p $(dest)-udeb/etc/gtk-2.0 + mkdir -p debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/etc/gtk-2.0 $(BUILD_SHARED_DIR)/gdk-pixbuf/gdk-pixbuf-query-loaders \ $(dest)/usr/lib/gtk-2.0/*/loaders | \ - sed s,$(dest),, > $(dest)-udeb/etc/gtk-2.0/gdk-pixbuf.loaders + sed s,$(dest),, > debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/etc/gtk-2.0/gdk-pixbuf.loaders install: install-static install-shared install-dfb # generating debian files from .in From e409e2b1e65b9d21f10c46a145b5ba383b9dde7a Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sun, 25 Jun 2006 20:57:07 +0000 Subject: [PATCH 04/18] Fix gdk-pixbuf.loaders generation. --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 0964410d71..c330526a96 100644 --- a/debian/rules +++ b/debian/rules @@ -227,11 +227,11 @@ install-dfb: build-shared install-test # Add here commands to install the package into debian/tmp $(MAKE) -C $(BUILD_SHARED_DIR) install \ DESTDIR=$(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix) - find $(dest) -name \*.la -exec rm -f \{\} \; + find $(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix) -name \*.la -exec rm -f \{\} \; mkdir -p debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/etc/gtk-2.0 $(BUILD_SHARED_DIR)/gdk-pixbuf/gdk-pixbuf-query-loaders \ - $(dest)/usr/lib/gtk-2.0/*/loaders | \ - sed s,$(dest),, > debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/etc/gtk-2.0/gdk-pixbuf.loaders + $(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix)/usr/lib/gtk-2.0/*/loaders/*.so | \ + sed s,$(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix),, > debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/etc/gtk-2.0/gdk-pixbuf.loaders install: install-static install-shared install-dfb # generating debian files from .in From 57a7237094a7049a8d039069f9b974491571d0ff Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sun, 25 Jun 2006 21:21:35 +0000 Subject: [PATCH 05/18] Also remove symbolic links. Install from the correct directory. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index c330526a96..b703fbf0b8 100644 --- a/debian/rules +++ b/debian/rules @@ -225,7 +225,7 @@ install-static: build-static install-test install-dfb: build-shared install-test # Add here commands to install the package into debian/tmp - $(MAKE) -C $(BUILD_SHARED_DIR) install \ + $(MAKE) -C $(BUILD_DFB_DIR) install \ DESTDIR=$(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix) find $(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix) -name \*.la -exec rm -f \{\} \; mkdir -p debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/etc/gtk-2.0 @@ -249,7 +249,7 @@ install: install-static install-shared install-dfb # remove files that are already here in the other build cd debian/libgtk$(apiver)-$(soname)$(suffix) && \ - find -type f -exec \ + find -L -type f -exec \ rm -f ../libgtk+$(apiver)-directfb$(soname)$(suffix)/\{\} \; # for -doc From 96d32d2fee66847150424f8f4a400bd9d2f728e5 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 06:22:10 +0000 Subject: [PATCH 06/18] Fix doc symlinks. Name the .files correctly. * Use chrpath to remove the rpath in the udeb. * Generate a fake shlibs.local to handle all intra-gtk dependencies by hand. --- debian/changelog | 5 ++++- debian/control | 2 +- debian/control.in | 2 +- ...-directfb-dev.files => libgtk+2.0-directfb-dev.files} | 0 debian/rules | 9 +++++++-- 5 files changed, 13 insertions(+), 5 deletions(-) rename debian/{libgtk2.0-directfb-dev.files => libgtk+2.0-directfb-dev.files} (100%) diff --git a/debian/changelog b/debian/changelog index 71be99e359..81abcf5aff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,10 +8,13 @@ gtk+2.0 (2.8.18-3) experimental; urgency=low * Make 3 new packages: libgtk+2.0-directfb0-udeb, libgtk+2.0-directfb-dev and libgtk+2.0-directfb0. * Add a new build flavour for directfb (only the shared version). + * Use chrpath to remove the rpath in the udeb. + * Generate a fake shlibs.local to handle all intra-gtk dependencies by + hand. * Switch to debhelper compatibility mode 5 and require 5.0.22. * Standards-version is 3.7.2. - -- Josselin Mouette Sun, 25 Jun 2006 21:34:50 +0200 + -- Josselin Mouette Mon, 26 Jun 2006 08:20:44 +0200 gtk+2.0 (2.8.18-2) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 973e488046..3a1866acde 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc HE Brockschmidt , Marco Cabizza , Ondřej Surý , Ross Burton , Sjoerd Simons , Takuo KITAME -Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools +Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.7.2 diff --git a/debian/control.in b/debian/control.in index 7164e6e38a..ab1995fc1c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools +Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.7.2 diff --git a/debian/libgtk2.0-directfb-dev.files b/debian/libgtk+2.0-directfb-dev.files similarity index 100% rename from debian/libgtk2.0-directfb-dev.files rename to debian/libgtk+2.0-directfb-dev.files diff --git a/debian/rules b/debian/rules index b703fbf0b8..8afdd30b01 100644 --- a/debian/rules +++ b/debian/rules @@ -243,6 +243,8 @@ install: install-static install-shared install-dfb mkdir -p debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/usr/lib/gtk-2.0 cp debian/libgtk+$(apiver)-directfb$(soname)$(suffix)/usr/lib/*.so.? \ debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/usr/lib/ + # We don't need the rpath in the udeb + chrpath -d debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/usr/lib/*.so.? cp -r debian/libgtk+$(apiver)-directfb$(soname)$(suffix)/usr/lib/gtk-2.0/[0-9]* \ debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/usr/lib/gtk-2.0/ rm -rf debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/usr/lib/gtk-2.0/*/{engines,immodules} @@ -350,7 +352,7 @@ binary-arch: build install usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ usr/share/doc/libgtk+$(apiver)-directfb$(soname) dh_link -plibgtk+$(apiver)-directfb-dev \ - usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ + usr/share/doc/libgtk+$(apiver)-directfb$(soname)$(suffix) \ usr/share/doc/libgtk+$(apiver)-directfb-dev dh_link -plibgtk$(apiver)-bin \ usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ @@ -366,9 +368,12 @@ binary-arch: build install dh_strip -a --dbg-package=libgtk$(apiver)-$(soname)-dbg dh_compress -a dh_fixperms -a - dh_makeshlibs -a -X usr/lib/gtk-$(apiver) -plibgtk$(apiver)-$(soname)$(suffix) -V "libgtk${apiver}-${soname}${suffix} (>= ${shver})" --add-udeb=libgtk+$(apiver)-directfb$(soname)-dbg + dh_makeshlibs -X usr/lib/gtk-$(apiver) -plibgtk$(apiver)-$(soname)$(suffix) -V "libgtk${apiver}-${soname}${suffix} (>= ${shver})" --add-udeb=libgtk+$(apiver)-directfb$(soname)-udeb + dh_makeshlibs -X usr/lib/gtk-$(apiver) -plibgtk+$(apiver)-directfb$(soname)$(suffix) -V "libgtk+${apiver}-directfb${soname}${suffix} (>= ${shver})" --add-udeb=libgtk+$(apiver)-directfb$(soname)-udeb dh_installdeb -a + cat debian/*/DEBIAN/shlibs | awk "{ print $$1,$$2 }" > debian/shlibs.local dh_shlibdeps -a + rm -f debian/shlibs.local dh_gencontrol -a dh_md5sums -a dh_builddeb -a From 825ef5f48ec2c790a71f9c36ad2c378f4eebb330 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 07:12:46 +0000 Subject: [PATCH 07/18] Replace the dh_movefiles call by a hand-made move, because of a bug in debhelper when the sourcedir has a "+" character in it. --- debian/libgtk+2.0-directfb-dev.files | 3 --- debian/rules | 9 +++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 debian/libgtk+2.0-directfb-dev.files diff --git a/debian/libgtk+2.0-directfb-dev.files b/debian/libgtk+2.0-directfb-dev.files deleted file mode 100644 index fbbc11235e..0000000000 --- a/debian/libgtk+2.0-directfb-dev.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/include -usr/lib/lib*.{so,a} -usr/lib/pkgconfig diff --git a/debian/rules b/debian/rules index 8afdd30b01..1475e5700c 100644 --- a/debian/rules +++ b/debian/rules @@ -278,8 +278,13 @@ install: install-static install-shared install-dfb # clean the unnecessary files up rm -rf debian/libgtk$(apiver)-$(soname)$(suffix)/usr/share/gtk-doc - dh_movefiles -Nlibgtk+$(apiver)-directfb-dev --sourcedir=debian/libgtk$(apiver)-$(soname)$(suffix) - dh_movefiles -plibgtk+$(apiver)-directfb-dev --sourcedir=debian/libgtk+$(apiver)-directfb$(soname)$(suffix) + dh_movefiles --sourcedir=debian/libgtk$(apiver)-$(soname)$(suffix) + + mkdir -p debian/libgtk+$(apiver)-directfb-dev/usr/lib + mv debian/libgtk+$(apiver)-directfb$(soname)$(suffix)/usr/lib/{pkgconfig,*.so} \ + debian/libgtk+$(apiver)-directfb-dev/usr/lib/ + mv debian/libgtk+$(apiver)-directfb$(soname)$(suffix)/usr/include \ + debian/libgtk+$(apiver)-directfb-dev/usr/ -find $(CURDIR)/debian/ -type d -empty | xargs rmdir -p > /dev/null 2>&1 From 2da4e5bcfd692ba2e9d2daa419100c7f2ff1f916 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 07:33:27 +0000 Subject: [PATCH 08/18] I suck even in my awk command lines... --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 1475e5700c..8baf6c242e 100644 --- a/debian/rules +++ b/debian/rules @@ -376,7 +376,7 @@ binary-arch: build install dh_makeshlibs -X usr/lib/gtk-$(apiver) -plibgtk$(apiver)-$(soname)$(suffix) -V "libgtk${apiver}-${soname}${suffix} (>= ${shver})" --add-udeb=libgtk+$(apiver)-directfb$(soname)-udeb dh_makeshlibs -X usr/lib/gtk-$(apiver) -plibgtk+$(apiver)-directfb$(soname)$(suffix) -V "libgtk+${apiver}-directfb${soname}${suffix} (>= ${shver})" --add-udeb=libgtk+$(apiver)-directfb$(soname)-udeb dh_installdeb -a - cat debian/*/DEBIAN/shlibs | awk "{ print $$1,$$2 }" > debian/shlibs.local + cat debian/*/DEBIAN/shlibs | awk '{ print $$1,$$2 }' > debian/shlibs.local dh_shlibdeps -a rm -f debian/shlibs.local dh_gencontrol -a From 6d68f96e1286b66549a6b331aab19335fb329da7 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 16:07:05 +0000 Subject: [PATCH 09/18] * Break the circular dependency between libgtk2.0-0, libgtk2.0-bin and libgtk2.0-common (closes: #309604). + Remove libgtk2.0-common dependency on libgtk2.0-0. + Remove libgtk2.0-0 dependency on libgtk2.0-bin. + Use ${binary:Version} and ${source:Version} to ensure strict dependencies. + Build-depend on dpkg-dev 1.13.19. + Invert the libgtk2.0-common -> libgtk2.0-0 symbolic link. + libgtk2.0-common.preinst, libgtk2.0-0.postinst: dance the symbolic link samba. + Move support binaries and scripts to libgtk2.0-0 and make libgtk2.0-bin a binary-all package containing only scripts. + Move /usr/sbin/update-* calls to libgtk2.0-0. --- debian/changelog | 17 ++++++++++++-- debian/control | 25 ++++++++++---------- debian/control.in | 25 ++++++++++---------- debian/libgtk2.0-0.postinst | 19 +++++++++++++++ debian/libgtk2.0-0.postrm | 10 ++++++++ debian/libgtk2.0-bin.files | 3 --- debian/libgtk2.0-bin.postrm | 41 --------------------------------- debian/libgtk2.0-common.preinst | 8 +++++++ debian/rules | 24 +++++++++++++------ debian/update-gdkpixbuf-loaders | 2 +- debian/update-gtk-immodules.in | 2 +- 11 files changed, 97 insertions(+), 79 deletions(-) create mode 100644 debian/libgtk2.0-0.postinst create mode 100644 debian/libgtk2.0-0.postrm delete mode 100644 debian/libgtk2.0-bin.postrm create mode 100644 debian/libgtk2.0-common.preinst diff --git a/debian/changelog b/debian/changelog index 81abcf5aff..e525680f02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,12 +9,25 @@ gtk+2.0 (2.8.18-3) experimental; urgency=low libgtk+2.0-directfb-dev and libgtk+2.0-directfb0. * Add a new build flavour for directfb (only the shared version). * Use chrpath to remove the rpath in the udeb. - * Generate a fake shlibs.local to handle all intra-gtk dependencies by + * Generate a fake shlibs.local to handle all intra-gtk dependencies by hand. * Switch to debhelper compatibility mode 5 and require 5.0.22. * Standards-version is 3.7.2. + * Break the circular dependency between libgtk2.0-0, libgtk2.0-bin and + libgtk2.0-common (closes: #309604). + + Remove libgtk2.0-common dependency on libgtk2.0-0. + + Remove libgtk2.0-0 dependency on libgtk2.0-bin. + + Use ${binary:Version} and ${source:Version} to ensure strict + dependencies. + + Build-depend on dpkg-dev 1.13.19. + + Invert the libgtk2.0-common -> libgtk2.0-0 symbolic link. + + libgtk2.0-common.preinst, libgtk2.0-0.postinst: dance the symbolic + link samba. + + Move support binaries and scripts to libgtk2.0-0 and make + libgtk2.0-bin a binary-all package containing only scripts. + + Move /usr/sbin/update-* calls to libgtk2.0-0. - -- Josselin Mouette Mon, 26 Jun 2006 08:20:44 +0200 + -- Josselin Mouette Mon, 26 Jun 2006 18:05:21 +0200 gtk+2.0 (2.8.18-2) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 3a1866acde..ffbb0f2b6d 100644 --- a/debian/control +++ b/debian/control @@ -3,17 +3,17 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc HE Brockschmidt , Marco Cabizza , Ondřej Surý , Ross Burton , Sjoerd Simons , Takuo KITAME -Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath +Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.7.2 Package: libgtk2.0-0 Section: libs Architecture: any -Depends: libgtk2.0-common (>= ${Source-Version}), libgtk2.0-bin (>= ${Source-Version}), ${shlibs:Depends} +Depends: libgtk2.0-common (= ${source:Version}), ${shlibs:Depends} Conflicts: libgtk2.0-0png3, eog2 (<< 1.0.1-4), gnome-panel2 (<< 2.0.4-1), celestia (<< 1.2.4-4), gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<< 2.0.6-2), gtk2.0-examples (<< 2.2.0), libgdkxft0, gtk2-engines-wonderland (<= 1.0-2), gtk2-engines-cleanice (<= 1.2.8-1), gtk2-engines-thinice (<< 2.6), gtk2-engines-crux (<< 2.6), gtk2-engines-mist (<< 2.6), gtk2-engines-highcontrast (<< 2.6), gtk2-engines-lighthouseblue (<< 2.6), gnome-themes (<< 2.6), gtk2-engines-industrial (<< 0.2.32-5), gtk2-engines-pixbuf (<< 2.2.0-2.1), gtk2-engines-redmond95 (<< 2.2.0-2.1), gtk2-engines-metal (<< 2.2.0-2.1), gtk2-engines-magicchicken (<= 1.1.1-4), gtk2-engines-qtpixmap (<= 0.28-1), gtk2-engines-smooth (<< 0.5.6-3), gtk2-engines-xfce (<= 2.1.8-1), tamil-gtk2im (<= 2.2-4), imhangul (<< 0.9.9-3), librsvg2-common (<< 2.6.3-1) Replaces: libgtk2.0-0png3 -Recommends: hicolor-icon-theme +Recommends: hicolor-icon-theme, libgtk2.0-bin Description: The GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -25,7 +25,7 @@ Description: The GTK+ graphical user interface library Package: libgtk+2.0-directfb0 Section: libs Architecture: any -Depends: libgtk2.0-0 (= ${Source-Version}), ${shlibs:Depends} +Depends: libgtk2.0-0 (= ${binary:Version}), ${shlibs:Depends} Description: The GTK+ graphical user interface library - DirectFB runtime The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -53,7 +53,8 @@ Description: The GTK+ graphical user interface library - minimal runtime Package: libgtk2.0-common Section: misc Architecture: all -Depends: libgtk2.0-0, ${misc:Depends} +Depends: ${misc:Depends} +Recommends: libgtk2.0-0 Replaces: libgtk1.3-common, libgtk2.0-data Conflicts: libgtk1.3-common, libgtk2.0-data Description: Common files for the GTK+ graphical user interface library @@ -66,8 +67,8 @@ Description: Common files for the GTK+ graphical user interface library Package: libgtk2.0-bin Section: misc -Architecture: any -Depends: ${shlibs:Depends} +Architecture: all +Depends: ${misc:Depends}, libgtk2.0-0 (>= ${source:Version}) Replaces: libgtk2.0-common (<= 2.4.0-3), libgtk2.0-dev (<= 2.4.3-1) Conflicts: libgtk2.0-dev (<= 2.4.3-1) Description: The programs for the GTK+ graphical user interface library @@ -82,7 +83,7 @@ Description: The programs for the GTK+ graphical user interface library Package: libgtk2.0-dev Section: libdevel Architecture: any -Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev (>= 2:1.0.0-6), libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config +Depends: libgtk2.0-0 (= ${binary:Version}), libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev (>= 2:1.0.0-6), libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config Suggests: libgtk2.0-doc Replaces: libgtk1.3-dev Conflicts: libgtk1.3-dev @@ -98,7 +99,7 @@ Description: Development files for the GTK+ library Package: libgtk+2.0-directfb-dev Section: libdevel Architecture: any -Depends: libgtk+2.0-directfb0 (= ${Source-Version}), libgtk2.0-dev (= ${Source-Version}), libcairo-directfb2-dev +Depends: libgtk+2.0-directfb0 (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev Description: Development files for the GTK+ library - DirectFB version The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -113,7 +114,7 @@ Package: libgtk2.0-0-dbg Section: libdevel Priority: extra Architecture: any -Depends: libgtk2.0-0 (= ${Source-Version}) +Depends: libgtk2.0-0 (= ${binary:Version}) Conflicts: libgtk2.0-dbg Replaces: libgtk2.0-dbg Description: The GTK+ libraries and debugging symbols @@ -149,7 +150,7 @@ Package: gtk2.0-examples Section: x11 Priority: extra Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, libgtk2.0-0 (= ${binary:Version}) Replaces: libgtk1.3-dev Description: Examples files for the GTK+ 2.0 The GTK+ is a multi-platform toolkit for creating graphical user @@ -164,7 +165,7 @@ Package: gtk2-engines-pixbuf Section: graphics Priority: optional Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, libgtk2.0-0 (= ${binary:Version}) Suggests: gtk-engines-pixmap Conflicts: gtk2.0-engines-pixbuf Replaces: gtk2.0-engines-pixbuf diff --git a/debian/control.in b/debian/control.in index ab1995fc1c..bff19c69aa 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,17 +3,17 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath +Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.7.2 Package: libgtk2.0-@SONAME@ Section: libs Architecture: any -Depends: libgtk2.0-common (>= ${Source-Version}), libgtk2.0-bin (>= ${Source-Version}), ${shlibs:Depends} +Depends: libgtk2.0-common (= ${source:Version}), ${shlibs:Depends} Conflicts: libgtk2.0-0png3, eog2 (<< 1.0.1-4), gnome-panel2 (<< 2.0.4-1), celestia (<< 1.2.4-4), gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<< 2.0.6-2), gtk2.0-examples (<< 2.2.0), libgdkxft0, gtk2-engines-wonderland (<= 1.0-2), gtk2-engines-cleanice (<= 1.2.8-1), gtk2-engines-thinice (<< 2.6), gtk2-engines-crux (<< 2.6), gtk2-engines-mist (<< 2.6), gtk2-engines-highcontrast (<< 2.6), gtk2-engines-lighthouseblue (<< 2.6), gnome-themes (<< 2.6), gtk2-engines-industrial (<< 0.2.32-5), gtk2-engines-pixbuf (<< 2.2.0-2.1), gtk2-engines-redmond95 (<< 2.2.0-2.1), gtk2-engines-metal (<< 2.2.0-2.1), gtk2-engines-magicchicken (<= 1.1.1-4), gtk2-engines-qtpixmap (<= 0.28-1), gtk2-engines-smooth (<< 0.5.6-3), gtk2-engines-xfce (<= 2.1.8-1), tamil-gtk2im (<= 2.2-4), imhangul (<< 0.9.9-3), librsvg2-common (<< 2.6.3-1) Replaces: libgtk2.0-0png3 -Recommends: hicolor-icon-theme +Recommends: hicolor-icon-theme, libgtk2.0-bin Description: The GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -25,7 +25,7 @@ Description: The GTK+ graphical user interface library Package: libgtk+2.0-directfb@SONAME@ Section: libs Architecture: any -Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), ${shlibs:Depends} +Depends: libgtk2.0-@SONAME@ (= ${binary:Version}), ${shlibs:Depends} Description: The GTK+ graphical user interface library - DirectFB runtime The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -53,7 +53,8 @@ Description: The GTK+ graphical user interface library - minimal runtime Package: libgtk2.0-common Section: misc Architecture: all -Depends: libgtk2.0-@SONAME@, ${misc:Depends} +Depends: ${misc:Depends} +Recommends: libgtk2.0-@SONAME@ Replaces: libgtk1.3-common, libgtk2.0-data Conflicts: libgtk1.3-common, libgtk2.0-data Description: Common files for the GTK+ graphical user interface library @@ -66,8 +67,8 @@ Description: Common files for the GTK+ graphical user interface library Package: libgtk2.0-bin Section: misc -Architecture: any -Depends: ${shlibs:Depends} +Architecture: all +Depends: ${misc:Depends}, libgtk2.0-@SONAME@ (>= ${source:Version}) Replaces: libgtk2.0-common (<= 2.4.0-3), libgtk2.0-dev (<= 2.4.3-1) Conflicts: libgtk2.0-dev (<= 2.4.3-1) Description: The programs for the GTK+ graphical user interface library @@ -82,7 +83,7 @@ Description: The programs for the GTK+ graphical user interface library Package: libgtk2.0-dev Section: libdevel Architecture: any -Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev (>= 2:1.0.0-6), libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config +Depends: libgtk2.0-@SONAME@ (= ${binary:Version}), libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev (>= 2:1.0.0-6), libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config Suggests: libgtk2.0-doc Replaces: libgtk1.3-dev Conflicts: libgtk1.3-dev @@ -98,7 +99,7 @@ Description: Development files for the GTK+ library Package: libgtk+2.0-directfb-dev Section: libdevel Architecture: any -Depends: libgtk+2.0-directfb@SONAME@ (= ${Source-Version}), libgtk2.0-dev (= ${Source-Version}), libcairo-directfb2-dev +Depends: libgtk+2.0-directfb@SONAME@ (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev Description: Development files for the GTK+ library - DirectFB version The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -113,7 +114,7 @@ Package: libgtk2.0-@SONAME@-dbg Section: libdevel Priority: extra Architecture: any -Depends: libgtk2.0-@SONAME@ (= ${Source-Version}) +Depends: libgtk2.0-@SONAME@ (= ${binary:Version}) Conflicts: libgtk2.0-dbg Replaces: libgtk2.0-dbg Description: The GTK+ libraries and debugging symbols @@ -149,7 +150,7 @@ Package: gtk2.0-examples Section: x11 Priority: extra Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, libgtk2.0-@SONAME@ (= ${binary:Version}) Replaces: libgtk1.3-dev Description: Examples files for the GTK+ 2.0 The GTK+ is a multi-platform toolkit for creating graphical user @@ -164,7 +165,7 @@ Package: gtk2-engines-pixbuf Section: graphics Priority: optional Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, libgtk2.0-@SONAME@ (= ${binary:Version}) Suggests: gtk-engines-pixmap Conflicts: gtk2.0-engines-pixbuf Replaces: gtk2.0-engines-pixbuf diff --git a/debian/libgtk2.0-0.postinst b/debian/libgtk2.0-0.postinst new file mode 100644 index 0000000000..5654a47b68 --- /dev/null +++ b/debian/libgtk2.0-0.postinst @@ -0,0 +1,19 @@ +#! /bin/sh +set -e + +if [ -d /usr/share/doc/libgtk2.0-0 -a ! -L /usr/share/doc/libgtk2.0-0 ]; then + if rmdir /usr/share/doc/libgtk2.0-0; then + ln -sf libgtk2.0-common /usr/share/doc/libgtk2.0-0 + else + echo "Warning: could not remove /usr/share/doc/libgtk2.0-0." + fi +fi + +case "$1" in + configure) + /usr/lib/libgtk2.0-0/update-gtk-immodules + /usr/lib/libgtk2.0-0/update-gdkpixbuf-loaders + ;; +esac + +#DEBHELPER# diff --git a/debian/libgtk2.0-0.postrm b/debian/libgtk2.0-0.postrm new file mode 100644 index 0000000000..d730667557 --- /dev/null +++ b/debian/libgtk2.0-0.postrm @@ -0,0 +1,10 @@ +#! /bin/sh +set -e + +case "$1" in + purge) + rm -rf /etc/gtk-2.0 + ;; +esac + +#DEBHELPER# diff --git a/debian/libgtk2.0-bin.files b/debian/libgtk2.0-bin.files index 12ab549759..b787eb7183 100644 --- a/debian/libgtk2.0-bin.files +++ b/debian/libgtk2.0-bin.files @@ -1,7 +1,4 @@ -usr/bin/gtk-query-immodules-2.0 usr/share/man/man1/gtk-query-immodules-2.0.1* -usr/bin/gdk-pixbuf-query-loaders usr/share/man/man1/gdk-pixbuf-query-loaders.1* etc/gtk-2.0/* -usr/bin/gtk-update-icon-cache usr/share/man/man1/gtk-update-icon-cache.1* diff --git a/debian/libgtk2.0-bin.postrm b/debian/libgtk2.0-bin.postrm deleted file mode 100644 index 26e3f19b4a..0000000000 --- a/debian/libgtk2.0-bin.postrm +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/sh -# postrm script for gtk+ -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' overwrit>r> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge) - rm -rf /etc/gtk-2.0 - ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/libgtk2.0-common.preinst b/debian/libgtk2.0-common.preinst new file mode 100644 index 0000000000..90136c64f5 --- /dev/null +++ b/debian/libgtk2.0-common.preinst @@ -0,0 +1,8 @@ +#! /bin/sh +set -e + +if [ -L /usr/share/doc/libgtk2.0-common ]; then + rm -f /usr/share/doc/libgtk2.0-common +fi + +#DEBHELPER# diff --git a/debian/rules b/debian/rules index 8baf6c242e..a031f81d4e 100644 --- a/debian/rules +++ b/debian/rules @@ -264,11 +264,19 @@ install: install-static install-shared install-dfb cp -ar $(BUILD_SHARED_DIR)/docs/tutorial/images debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-tutorial/ cp $(BUILD_SHARED_DIR)/docs/*.txt debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc - # debian files - install -m 755 $(CURDIR)/debian/update-gtk-immodules \ - $(CURDIR)/debian/libgtk$(apiver)-bin/usr/sbin/ - install -m 755 $(CURDIR)/debian/update-gdkpixbuf-loaders \ - $(CURDIR)/debian/libgtk$(apiver)-bin/usr/sbin/ + # scripts and support binaries + for file in `ls debian/libgtk$(apiver)-$(soname)$(suffix)/usr/bin`; do \ + ln -sf ../lib/libgtk$(apiver)-$(soname)/$$file \ + debian/libgtk$(apiver)-bin/usr/bin/$$file ; \ + done + mv debian/libgtk$(apiver)-$(soname)$(suffix)/usr/bin \ + debian/libgtk$(apiver)-$(soname)$(suffix)/usr/lib/libgtk$(apiver)-$(soname) + for file in update-gtk-immodules update-gdkpixbuf-loaders; do \ + install -m 755 $(CURDIR)/debian/$$file \ + $(CURDIR)/debian/libgtk$(apiver)-$(soname)/usr/lib/libgtk$(apiver)-$(soname) ; \ + ln -sf ../lib/libgtk$(apiver)-$(soname)/$$file \ + debian/libgtk$(apiver)-bin/usr/sbin/$$file ; \ + done # don't need executable attribute for f in `find $(CURDIR)/debian/libgtk$(apiver)-$(soname)$(suffix)/usr/share/themes -type f`; do \ @@ -298,8 +306,6 @@ binary-indep: build install dh_installdocs -i - rm -rf $(CURDIR)/debian/libgtk$(apiver)-common/usr/share/doc/libgtk$(apiver)-common - dh_link -plibgtk$(apiver)-doc \ usr/share/doc/libglib$(glibver)-doc/glib \ usr/share/doc/libgtk$(apiver)-doc/glib @@ -341,12 +347,16 @@ binary-arch: build install # dh_installdebconf dh_installdocs -a + rm -rf $(CURDIR)/debian/libgtk$(apiver)-$(soname)/usr/share/doc/libgtk$(apiver)-$(soname) rm -rf $(CURDIR)/debian/libgtk$(apiver)-$(soname)-dbg/usr/share/doc/libgtk$(apiver)-$(soname)-dbg rm -rf $(CURDIR)/debian/libgtk$(apiver)-dev/usr/share/doc/libgtk$(apiver)-dev rm -rf $(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)/usr/share/doc/libgtk+$(apiver)-directfb$(soname) rm -rf $(CURDIR)/debian/libgtk+$(apiver)-directfb-dev/usr/share/doc/libgtk+$(apiver)-directfb-dev rm -rf $(CURDIR)/debian/libgtk$(apiver)-bin/usr/share/doc/libgtk$(apiver)-bin + dh_link -plibgtk$(apiver)-$(soname) \ + usr/share/doc/libgtk$(apiver)-common \ + usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) dh_link -plibgtk$(apiver)-$(soname)-dbg \ usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ usr/share/doc/libgtk$(apiver)-$(soname)-dbg diff --git a/debian/update-gdkpixbuf-loaders b/debian/update-gdkpixbuf-loaders index fbdfcf859c..fd2b0c4e0d 100644 --- a/debian/update-gdkpixbuf-loaders +++ b/debian/update-gdkpixbuf-loaders @@ -22,7 +22,7 @@ if ! test -d /usr/lib/gtk-$apiver/$VERSION/loaders; then fi echo -n "Updating the gdk-pixbuf loaders list for GTK+-$VERSION..." -/usr/bin/gdk-pixbuf-query-loaders > $TMPFILE +/usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders > $TMPFILE if [ "x`cat $TMPFILE | grep -v '^#'`" = "x" ]; then echo "the gdk-pixbuf loaders was not found." else diff --git a/debian/update-gtk-immodules.in b/debian/update-gtk-immodules.in index f016d0c4b1..12dfb5433b 100644 --- a/debian/update-gtk-immodules.in +++ b/debian/update-gtk-immodules.in @@ -19,7 +19,7 @@ if ! test -d /usr/lib/gtk-$apiver/$VERSION/immodules; then fi echo -n "Updating the IM modules list for GTK+-$VERSION..." -/usr/bin/gtk-query-immodules-$apiver `find /usr/lib/gtk-$apiver/2.4.0/immodules -name '*.so'` > $TMPFILE +/usr/lib/libgtk2.0-0/gtk-query-immodules-$apiver `find /usr/lib/gtk-$apiver/2.4.0/immodules -name '*.so'` > $TMPFILE if [ "x`cat $TMPFILE | grep -v '^#'`" = "x" ]; then echo "the GTK+ IM modules was not found." else From b95ffd114f782b0c234cb4594050b2bf37a0ddc1 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 16:11:55 +0000 Subject: [PATCH 10/18] Remove extraneous postinst Move libgtk2.0-bin handling to binary-indep target + update-*: call binaries at their new location. --- debian/changelog | 3 +- debian/libgtk2.0-bin.postinst | 49 ------------------------------ debian/rules | 9 +++--- debian/update-gdkpixbuf-loaders.in | 2 +- debian/update-gtk-immodules | 2 +- 5 files changed, 9 insertions(+), 56 deletions(-) delete mode 100644 debian/libgtk2.0-bin.postinst diff --git a/debian/changelog b/debian/changelog index e525680f02..e4c6621ee2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,8 +26,9 @@ gtk+2.0 (2.8.18-3) experimental; urgency=low + Move support binaries and scripts to libgtk2.0-0 and make libgtk2.0-bin a binary-all package containing only scripts. + Move /usr/sbin/update-* calls to libgtk2.0-0. + + update-*: call binaries at their new location. - -- Josselin Mouette Mon, 26 Jun 2006 18:05:21 +0200 + -- Josselin Mouette Mon, 26 Jun 2006 18:09:33 +0200 gtk+2.0 (2.8.18-2) UNRELEASED; urgency=low diff --git a/debian/libgtk2.0-bin.postinst b/debian/libgtk2.0-bin.postinst deleted file mode 100644 index 067faad364..0000000000 --- a/debian/libgtk2.0-bin.postinst +++ /dev/null @@ -1,49 +0,0 @@ -#! /bin/sh -# postinst script for gtk+ -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - /usr/sbin/update-gtk-immodules - /usr/sbin/update-gdkpixbuf-loaders - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/rules b/debian/rules index a031f81d4e..6524557f34 100644 --- a/debian/rules +++ b/debian/rules @@ -306,6 +306,8 @@ binary-indep: build install dh_installdocs -i + rm -rf $(CURDIR)/debian/libgtk$(apiver)-bin/usr/share/doc/libgtk$(apiver)-bin + dh_link -plibgtk$(apiver)-doc \ usr/share/doc/libglib$(glibver)-doc/glib \ usr/share/doc/libgtk$(apiver)-doc/glib @@ -321,6 +323,9 @@ binary-indep: build install dh_link -plibgtk$(apiver)-common \ usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ usr/share/doc/libgtk$(apiver)-common + dh_link -plibgtk$(apiver)-bin \ + usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ + usr/share/doc/libgtk$(apiver)-bin # create symlinks in /usr/share/gtk-doc/html for i in gdk gdk-pixbuf gtk gtk-faq gtk-tutorial; do \ @@ -352,7 +357,6 @@ binary-arch: build install rm -rf $(CURDIR)/debian/libgtk$(apiver)-dev/usr/share/doc/libgtk$(apiver)-dev rm -rf $(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)/usr/share/doc/libgtk+$(apiver)-directfb$(soname) rm -rf $(CURDIR)/debian/libgtk+$(apiver)-directfb-dev/usr/share/doc/libgtk+$(apiver)-directfb-dev - rm -rf $(CURDIR)/debian/libgtk$(apiver)-bin/usr/share/doc/libgtk$(apiver)-bin dh_link -plibgtk$(apiver)-$(soname) \ usr/share/doc/libgtk$(apiver)-common \ @@ -369,9 +373,6 @@ binary-arch: build install dh_link -plibgtk+$(apiver)-directfb-dev \ usr/share/doc/libgtk+$(apiver)-directfb$(soname)$(suffix) \ usr/share/doc/libgtk+$(apiver)-directfb-dev - dh_link -plibgtk$(apiver)-bin \ - usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ - usr/share/doc/libgtk$(apiver)-bin dh_installexamples -a diff --git a/debian/update-gdkpixbuf-loaders.in b/debian/update-gdkpixbuf-loaders.in index 912ae3ba7c..f46b0d4a49 100644 --- a/debian/update-gdkpixbuf-loaders.in +++ b/debian/update-gdkpixbuf-loaders.in @@ -22,7 +22,7 @@ if ! test -d /usr/lib/gtk-$apiver/$VERSION/loaders; then fi echo -n "Updating the gdk-pixbuf loaders list for GTK+-$VERSION..." -/usr/bin/gdk-pixbuf-query-loaders > $TMPFILE +/usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders > $TMPFILE if [ "x`cat $TMPFILE | grep -v '^#'`" = "x" ]; then echo "the gdk-pixbuf loaders was not found." else diff --git a/debian/update-gtk-immodules b/debian/update-gtk-immodules index b48064df89..1b85b15f3f 100644 --- a/debian/update-gtk-immodules +++ b/debian/update-gtk-immodules @@ -19,7 +19,7 @@ if ! test -d /usr/lib/gtk-$apiver/$VERSION/immodules; then fi echo -n "Updating the IM modules list for GTK+-$VERSION..." -/usr/bin/gtk-query-immodules-$apiver `find /usr/lib/gtk-$apiver/2.4.0/immodules -name '*.so'` > $TMPFILE +/usr/lib/libgtk2.0-0/gtk-query-immodules-$apiver `find /usr/lib/gtk-$apiver/2.4.0/immodules -name '*.so'` > $TMPFILE if [ "x`cat $TMPFILE | grep -v '^#'`" = "x" ]; then echo "the GTK+ IM modules was not found." else From c4c4fe8ea17123628239068b03e3c8e074c28bee Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 16:37:28 +0000 Subject: [PATCH 11/18] Reorder file moves correctly. --- debian/rules | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/rules b/debian/rules index 6524557f34..77f5d55860 100644 --- a/debian/rules +++ b/debian/rules @@ -264,6 +264,16 @@ install: install-static install-shared install-dfb cp -ar $(BUILD_SHARED_DIR)/docs/tutorial/images debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-tutorial/ cp $(BUILD_SHARED_DIR)/docs/*.txt debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc + # don't need executable attribute + for f in `find $(CURDIR)/debian/libgtk$(apiver)-$(soname)$(suffix)/usr/share/themes -type f`; do \ + chmod a-x $$f; \ + done + + # clean the unnecessary files up + rm -rf debian/libgtk$(apiver)-$(soname)$(suffix)/usr/share/gtk-doc + + dh_movefiles --sourcedir=debian/libgtk$(apiver)-$(soname)$(suffix) + # scripts and support binaries for file in `ls debian/libgtk$(apiver)-$(soname)$(suffix)/usr/bin`; do \ ln -sf ../lib/libgtk$(apiver)-$(soname)/$$file \ @@ -278,16 +288,6 @@ install: install-static install-shared install-dfb debian/libgtk$(apiver)-bin/usr/sbin/$$file ; \ done - # don't need executable attribute - for f in `find $(CURDIR)/debian/libgtk$(apiver)-$(soname)$(suffix)/usr/share/themes -type f`; do \ - chmod a-x $$f; \ - done - - # clean the unnecessary files up - rm -rf debian/libgtk$(apiver)-$(soname)$(suffix)/usr/share/gtk-doc - - dh_movefiles --sourcedir=debian/libgtk$(apiver)-$(soname)$(suffix) - mkdir -p debian/libgtk+$(apiver)-directfb-dev/usr/lib mv debian/libgtk+$(apiver)-directfb$(soname)$(suffix)/usr/lib/{pkgconfig,*.so} \ debian/libgtk+$(apiver)-directfb-dev/usr/lib/ From e5b159a2834ff47c35a21abed584f0b398608114 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 16:54:58 +0000 Subject: [PATCH 12/18] Remove dumb circular link generation. --- debian/rules | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/rules b/debian/rules index 77f5d55860..5656a65cce 100644 --- a/debian/rules +++ b/debian/rules @@ -320,9 +320,6 @@ binary-indep: build install dh_link -plibgtk$(apiver)-doc \ usr/share/doc/libpango$(pangover)-doc/pango \ usr/share/doc/libgtk$(apiver)-doc/pango - dh_link -plibgtk$(apiver)-common \ - usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ - usr/share/doc/libgtk$(apiver)-common dh_link -plibgtk$(apiver)-bin \ usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ usr/share/doc/libgtk$(apiver)-bin From 8439aac2c5f15b005f37ef976ee28627cc8d3945 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 17:31:10 +0000 Subject: [PATCH 13/18] Add dh_installman -i --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 5656a65cce..54ef7b24fb 100644 --- a/debian/rules +++ b/debian/rules @@ -332,6 +332,7 @@ binary-indep: build install done dh_installexamples -i + dh_installman -i dh_installinfo -i dh_installchangelogs -i $(BUILD_DIR)/ChangeLog dh_compress -i From 7dad5202987e1ede5295b1308a9e5fe6e7b60917 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 20:32:36 +0000 Subject: [PATCH 14/18] * Bump libcairo build dependencies. * Only install the PNG loader in the udeb. --- debian/changelog | 4 +++- debian/control | 4 ++-- debian/control.in | 4 ++-- debian/rules | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4c6621ee2..8febed700c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ gtk+2.0 (2.8.18-3) experimental; urgency=low * Use chrpath to remove the rpath in the udeb. * Generate a fake shlibs.local to handle all intra-gtk dependencies by hand. + * Bump libcairo build dependencies. + * Only install the PNG loader in the udeb. * Switch to debhelper compatibility mode 5 and require 5.0.22. * Standards-version is 3.7.2. * Break the circular dependency between libgtk2.0-0, libgtk2.0-bin and @@ -28,7 +30,7 @@ gtk+2.0 (2.8.18-3) experimental; urgency=low + Move /usr/sbin/update-* calls to libgtk2.0-0. + update-*: call binaries at their new location. - -- Josselin Mouette Mon, 26 Jun 2006 18:09:33 +0200 + -- Josselin Mouette Mon, 26 Jun 2006 22:31:14 +0200 gtk+2.0 (2.8.18-2) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index ffbb0f2b6d..dec627be90 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc HE Brockschmidt , Marco Cabizza , Ondřej Surý , Ross Burton , Sjoerd Simons , Takuo KITAME -Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) +Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.1.10-1), libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.7.2 @@ -99,7 +99,7 @@ Description: Development files for the GTK+ library Package: libgtk+2.0-directfb-dev Section: libdevel Architecture: any -Depends: libgtk+2.0-directfb0 (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev +Depends: libgtk+2.0-directfb0 (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo-dev (>= 1.1.10-1) Description: Development files for the GTK+ library - DirectFB version The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable diff --git a/debian/control.in b/debian/control.in index bff19c69aa..d363b9bf29 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) +Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.1.10-1), libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.7.2 @@ -99,7 +99,7 @@ Description: Development files for the GTK+ library Package: libgtk+2.0-directfb-dev Section: libdevel Architecture: any -Depends: libgtk+2.0-directfb@SONAME@ (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev +Depends: libgtk+2.0-directfb@SONAME@ (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo-dev (>= 1.1.10-1) Description: Development files for the GTK+ library - DirectFB version The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable diff --git a/debian/rules b/debian/rules index 54ef7b24fb..4e19c82a01 100644 --- a/debian/rules +++ b/debian/rules @@ -228,6 +228,7 @@ install-dfb: build-shared install-test $(MAKE) -C $(BUILD_DFB_DIR) install \ DESTDIR=$(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix) find $(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix) -name \*.la -exec rm -f \{\} \; + find $(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix) -name libpixbufloader\* \! -name \*png\* -exec rm -f \{\} \; mkdir -p debian/libgtk+$(apiver)-directfb$(soname)$(suffix)-udeb/etc/gtk-2.0 $(BUILD_SHARED_DIR)/gdk-pixbuf/gdk-pixbuf-query-loaders \ $(CURDIR)/debian/libgtk+$(apiver)-directfb$(soname)$(suffix)/usr/lib/gtk-2.0/*/loaders/*.so | \ From 89fa29f460919cd106f02708cb810f87e82569dc Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 20:38:15 +0000 Subject: [PATCH 15/18] gtk+2.0 (2.8.18-4) experimental; urgency=low * Bump libcairo build dependencies. * Rebuild against a fixed glib. --- debian/changelog | 10 ++++++++-- debian/control | 4 ++-- debian/control.in | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8febed700c..555e095881 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gtk+2.0 (2.8.18-4) experimental; urgency=low + + * Bump libcairo build dependencies. + * Only install the PNG loader in the udeb. + * Rebuild against a fixed glib. + + -- Josselin Mouette Mon, 26 Jun 2006 22:34:27 +0200 + gtk+2.0 (2.8.18-3) experimental; urgency=low * 003_gtk+-2.8.17-directfb.patch: new patch, bringing a new directfb @@ -11,8 +19,6 @@ gtk+2.0 (2.8.18-3) experimental; urgency=low * Use chrpath to remove the rpath in the udeb. * Generate a fake shlibs.local to handle all intra-gtk dependencies by hand. - * Bump libcairo build dependencies. - * Only install the PNG loader in the udeb. * Switch to debhelper compatibility mode 5 and require 5.0.22. * Standards-version is 3.7.2. * Break the circular dependency between libgtk2.0-0, libgtk2.0-bin and diff --git a/debian/control b/debian/control index dec627be90..d65159ab2b 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc HE Brockschmidt , Marco Cabizza , Ondřej Surý , Ross Burton , Sjoerd Simons , Takuo KITAME -Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.1.10-1), libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) +Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.1.10-2), libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.7.2 @@ -99,7 +99,7 @@ Description: Development files for the GTK+ library Package: libgtk+2.0-directfb-dev Section: libdevel Architecture: any -Depends: libgtk+2.0-directfb0 (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo-dev (>= 1.1.10-1) +Depends: libgtk+2.0-directfb0 (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo-dev (>= 1.1.10-2) Description: Development files for the GTK+ library - DirectFB version The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable diff --git a/debian/control.in b/debian/control.in index d363b9bf29..7df11ca710 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.1.10-1), libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) +Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.1.10-2), libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.7.2 @@ -99,7 +99,7 @@ Description: Development files for the GTK+ library Package: libgtk+2.0-directfb-dev Section: libdevel Architecture: any -Depends: libgtk+2.0-directfb@SONAME@ (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo-dev (>= 1.1.10-1) +Depends: libgtk+2.0-directfb@SONAME@ (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo-dev (>= 1.1.10-2) Description: Development files for the GTK+ library - DirectFB version The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable From 8b46af7491e5c17893e498eee1ec9ea0cbc38b15 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 26 Jun 2006 21:06:57 +0000 Subject: [PATCH 16/18] This is libcairo2-dev, not libcairo-dev. --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index d65159ab2b..f403b6fa1f 100644 --- a/debian/control +++ b/debian/control @@ -99,7 +99,7 @@ Description: Development files for the GTK+ library Package: libgtk+2.0-directfb-dev Section: libdevel Architecture: any -Depends: libgtk+2.0-directfb0 (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo-dev (>= 1.1.10-2) +Depends: libgtk+2.0-directfb0 (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo2-dev (>= 1.1.10-2) Description: Development files for the GTK+ library - DirectFB version The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable diff --git a/debian/control.in b/debian/control.in index 7df11ca710..07ae38bb23 100644 --- a/debian/control.in +++ b/debian/control.in @@ -99,7 +99,7 @@ Description: Development files for the GTK+ library Package: libgtk+2.0-directfb-dev Section: libdevel Architecture: any -Depends: libgtk+2.0-directfb@SONAME@ (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo-dev (>= 1.1.10-2) +Depends: libgtk+2.0-directfb@SONAME@ (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo2-dev (>= 1.1.10-2) Description: Development files for the GTK+ library - DirectFB version The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable From f5494bcae9e61feae57afb37dcc5faf0ceb0729b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Fri, 30 Jun 2006 19:23:51 +0000 Subject: [PATCH 17/18] * Set Priority to extra to sync with overrides. --- debian/changelog | 6 ++++++ debian/control | 1 + debian/control.in | 1 + 3 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 555e095881..6d3dacfa51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gtk+2.0 (2.8.18-5) UNRELEASED; urgency=low + + * Set Priority to extra to sync with overrides. + + -- Loic Minier Fri, 30 Jun 2006 21:23:03 +0200 + gtk+2.0 (2.8.18-4) experimental; urgency=low * Bump libcairo build dependencies. diff --git a/debian/control b/debian/control index f403b6fa1f..246cc90fa5 100644 --- a/debian/control +++ b/debian/control @@ -24,6 +24,7 @@ Description: The GTK+ graphical user interface library Package: libgtk+2.0-directfb0 Section: libs +Priority: extra Architecture: any Depends: libgtk2.0-0 (= ${binary:Version}), ${shlibs:Depends} Description: The GTK+ graphical user interface library - DirectFB runtime diff --git a/debian/control.in b/debian/control.in index 07ae38bb23..77af920344 100644 --- a/debian/control.in +++ b/debian/control.in @@ -24,6 +24,7 @@ Description: The GTK+ graphical user interface library Package: libgtk+2.0-directfb@SONAME@ Section: libs +Priority: extra Architecture: any Depends: libgtk2.0-@SONAME@ (= ${binary:Version}), ${shlibs:Depends} Description: The GTK+ graphical user interface library - DirectFB runtime From a87e458c915f6c82f3af6983e72412e8118aefd6 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sun, 2 Jul 2006 21:14:08 +0000 Subject: [PATCH 18/18] * Set priority to extra for the udeb. * Bump build dependencies for libcairo to the stable version. --- debian/changelog | 7 ++++++- debian/control | 6 +++--- debian/control.in | 6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6d3dacfa51..8910faee6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ gtk+2.0 (2.8.18-5) UNRELEASED; urgency=low + [ Loic Minier ] * Set Priority to extra to sync with overrides. - -- Loic Minier Fri, 30 Jun 2006 21:23:03 +0200 + [ Josselin Mouette ] + * Set priority to extra for the udeb. + * Bump build dependencies for libcairo to the stable version. + + -- Josselin Mouette Sun, 2 Jul 2006 23:13:29 +0200 gtk+2.0 (2.8.18-4) experimental; urgency=low diff --git a/debian/control b/debian/control index 246cc90fa5..4438c577bf 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc HE Brockschmidt , Marco Cabizza , Ondřej Surý , Ross Burton , Sjoerd Simons , Takuo KITAME -Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.1.10-2), libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) +Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.2.0), libcairo-directfb2-dev (>= 1.2.0), libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.7.2 @@ -24,7 +24,6 @@ Description: The GTK+ graphical user interface library Package: libgtk+2.0-directfb0 Section: libs -Priority: extra Architecture: any Depends: libgtk2.0-0 (= ${binary:Version}), ${shlibs:Depends} Description: The GTK+ graphical user interface library - DirectFB runtime @@ -40,6 +39,7 @@ Description: The GTK+ graphical user interface library - DirectFB runtime Package: libgtk+2.0-directfb0-udeb XC-Package-Type: udeb Section: debian-installer +Priority: extra Architecture: any Depends: ${shlibs:Depends} Description: The GTK+ graphical user interface library - minimal runtime @@ -100,7 +100,7 @@ Description: Development files for the GTK+ library Package: libgtk+2.0-directfb-dev Section: libdevel Architecture: any -Depends: libgtk+2.0-directfb0 (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo2-dev (>= 1.1.10-2) +Depends: libgtk+2.0-directfb0 (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo2-dev (>= 1.2.0) Description: Development files for the GTK+ library - DirectFB version The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable diff --git a/debian/control.in b/debian/control.in index 77af920344..29aafd3412 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.1.10-2), libcairo-directfb2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) +Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.6.1-2), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.2.0), libcairo-directfb2-dev (>= 1.2.0), libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19) Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.7.2 @@ -24,7 +24,6 @@ Description: The GTK+ graphical user interface library Package: libgtk+2.0-directfb@SONAME@ Section: libs -Priority: extra Architecture: any Depends: libgtk2.0-@SONAME@ (= ${binary:Version}), ${shlibs:Depends} Description: The GTK+ graphical user interface library - DirectFB runtime @@ -40,6 +39,7 @@ Description: The GTK+ graphical user interface library - DirectFB runtime Package: libgtk+2.0-directfb@SONAME@-udeb XC-Package-Type: udeb Section: debian-installer +Priority: extra Architecture: any Depends: ${shlibs:Depends} Description: The GTK+ graphical user interface library - minimal runtime @@ -100,7 +100,7 @@ Description: Development files for the GTK+ library Package: libgtk+2.0-directfb-dev Section: libdevel Architecture: any -Depends: libgtk+2.0-directfb@SONAME@ (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo2-dev (>= 1.1.10-2) +Depends: libgtk+2.0-directfb@SONAME@ (= ${binary:Version}), libgtk2.0-dev (= ${binary:Version}), libcairo-directfb2-dev, libcairo2-dev (>= 1.2.0) Description: Development files for the GTK+ library - DirectFB version The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable