tags 638083 + pending patch thanks Hi,
as the GNOME 3 transition is now ongoing, I've prepared an NMU where I
disabled the panel applet. The changelog reads:
gnubiff (2.2.13-4.1) unstable; urgency=low
* Non-maintainer upload, for the GNOME 3 transition.
* Disable the GNOME panel applet. Drop build dependency on
libpanel-applet2-dev, libgnomeui-dev and libgnome-dev. (Closes: #638083)
* Add build dependency on libpopt-dev.
* Update 04-fix-POTFILES-in.patch to not process
src/GNOME_gnubiffApplet.server.in.
* debian/patches/06-dont-create-empty-dirs.patch: Don't create empty
install
directories for /usr/share/gnome-2.0/ and /usr/lib/bonobo/ if gnome
support is disabled.
The full debdiff is attached.
I've uploaded to DELAYED/2. Please let me know if I should delay it
further or if the patch is not acceptable for other reasons and I should
cancel the NMU.
Cheers,
Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff -Nru gnubiff-2.2.13/debian/changelog gnubiff-2.2.13/debian/changelog --- gnubiff-2.2.13/debian/changelog 2011-08-07 11:18:16.000000000 +0200 +++ gnubiff-2.2.13/debian/changelog 2011-10-21 10:51:54.000000000 +0200 @@ -1,3 +1,17 @@ +gnubiff (2.2.13-4.1) unstable; urgency=low + + * Non-maintainer upload, for the GNOME 3 transition. + * Disable the GNOME panel applet. Drop build dependency on + libpanel-applet2-dev, libgnomeui-dev and libgnome-dev. (Closes: #638083) + * Add build dependency on libpopt-dev. + * Update 04-fix-POTFILES-in.patch to not process + src/GNOME_gnubiffApplet.server.in. + * debian/patches/06-dont-create-empty-dirs.patch: Don't create empty install + directories for /usr/share/gnome-2.0/ and /usr/lib/bonobo/ if gnome + support is disabled. + + -- Michael Biebl <[email protected]> Thu, 20 Oct 2011 16:30:45 +0200 + gnubiff (2.2.13-4) unstable; urgency=low * Included patch by david <[email protected]> to fix incorrect error diff -Nru gnubiff-2.2.13/debian/control gnubiff-2.2.13/debian/control --- gnubiff-2.2.13/debian/control 2011-08-07 13:39:25.000000000 +0200 +++ gnubiff-2.2.13/debian/control 2011-10-20 17:16:38.000000000 +0200 @@ -2,7 +2,7 @@ Section: mail Priority: optional Maintainer: Roland Stigge <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), libaudiofile-dev, libglade2-dev, libpanel-applet2-dev, libgtk2.0-dev, libgnome2-dev, libssl-dev, libxml-parser-perl, libfam-dev, libgnomeui-dev, intltool, automake, autoconf +Build-Depends: debhelper (>= 7.0.50~), libaudiofile-dev, libglade2-dev, libgtk2.0-dev, libssl-dev, libxml-parser-perl, libfam-dev, libpopt-dev, intltool, automake, autoconf Standards-Version: 3.9.2 Homepage: http://gnubiff.sourceforge.net/ diff -Nru gnubiff-2.2.13/debian/patches/04-fix-POTFILES-in.patch gnubiff-2.2.13/debian/patches/04-fix-POTFILES-in.patch --- gnubiff-2.2.13/debian/patches/04-fix-POTFILES-in.patch 2011-08-07 13:19:17.000000000 +0200 +++ gnubiff-2.2.13/debian/patches/04-fix-POTFILES-in.patch 2011-10-20 17:05:42.000000000 +0200 @@ -3,9 +3,11 @@ tests (make check) Author: Roland Stigge <[email protected]> ---- gnubiff-2.2.13.orig/po/POTFILES.in -+++ gnubiff-2.2.13/po/POTFILES.in -@@ -16,7 +16,7 @@ src/option.cc +Index: gnubiff-2.2.13/po/POTFILES.in +=================================================================== +--- gnubiff-2.2.13.orig/po/POTFILES.in 2011-10-20 16:26:44.929458053 +0200 ++++ gnubiff-2.2.13/po/POTFILES.in 2011-10-20 17:05:37.788130048 +0200 +@@ -16,7 +16,7 @@ src/options.cc src/gnubiff_options.cc src/gui.cc @@ -14,12 +16,12 @@ src/ui-applet-gtk.cc src/ui-preferences.cc src/ui-authentication.cc -@@ -26,13 +26,16 @@ src/gtk_image_animation.cc +@@ -26,13 +26,15 @@ src/ui-popup.cc src/support.cc src/GNOME_gnubiffApplet.xml -src/GNOME_gnubiffApplet.xml.h - src/GNOME_gnubiffApplet.server.in +-src/GNOME_gnubiffApplet.server.in -src/GNOME_gnubiffApplet.server.in.h +src/GNOME_gnubiffApplet.server.in.in ui/applet-gtk.glade diff -Nru gnubiff-2.2.13/debian/patches/06-dont-create-empty-dirs.patch gnubiff-2.2.13/debian/patches/06-dont-create-empty-dirs.patch --- gnubiff-2.2.13/debian/patches/06-dont-create-empty-dirs.patch 1970-01-01 01:00:00.000000000 +0100 +++ gnubiff-2.2.13/debian/patches/06-dont-create-empty-dirs.patch 2011-10-21 10:48:56.000000000 +0200 @@ -0,0 +1,32 @@ +Index: gnubiff-2.2.13/src/Makefile.am +=================================================================== +--- gnubiff-2.2.13.orig/src/Makefile.am 2011-10-20 16:26:44.921458153 +0200 ++++ gnubiff-2.2.13/src/Makefile.am 2011-10-21 10:48:51.853992772 +0200 +@@ -82,21 +82,18 @@ + + gnubiff_LDADD = $(INTLLIBS) $(GNUBIFF_DEP_LIBS) $(FAM_LIBS) + +-serverdir = $(libdir)/bonobo/servers +-server_in_files = +-server_DATA = +-uidir = $(datadir)/gnome-2.0/ui +-ui_DATA = +- + ## + ## Additional files and directories for the gnome panel frontend + ## + if USE_GNOME ++serverdir = $(libdir)/bonobo/servers ++uidir = $(datadir)/gnome-2.0/ui ++ + gnubiff_SOURCES += $(gnome_sources) + gnubiff_LDADD += $(GNOME_DEP_LIBS) +-server_in_files += GNOME_gnubiffApplet.server.in +-server_DATA += $(server_in_files:.server.in=.server) +-ui_DATA += GNOME_gnubiffApplet.xml ++server_in_files = GNOME_gnubiffApplet.server.in ++server_DATA = $(server_in_files:.server.in=.server) ++ui_DATA = GNOME_gnubiffApplet.xml + endif + + # xxx.server.in.in -> xxx.server (for the gnome panel) diff -Nru gnubiff-2.2.13/debian/patches/series gnubiff-2.2.13/debian/patches/series --- gnubiff-2.2.13/debian/patches/series 2011-08-07 13:41:55.000000000 +0200 +++ gnubiff-2.2.13/debian/patches/series 2011-10-21 10:47:37.000000000 +0200 @@ -3,3 +3,4 @@ 03-fix-long-error-messages.patch 04-fix-POTFILES-in.patch 05-ignore-pc-dir-for-intltool.patch +06-dont-create-empty-dirs.patch diff -Nru gnubiff-2.2.13/debian/rules gnubiff-2.2.13/debian/rules --- gnubiff-2.2.13/debian/rules 2011-08-07 11:21:38.000000000 +0200 +++ gnubiff-2.2.13/debian/rules 2011-10-21 10:44:37.000000000 +0200 @@ -8,7 +8,7 @@ override_dh_auto_configure: autoreconf -f - dh_auto_configure -- --with-password + dh_auto_configure -- --with-password --disable-gnome override_dh_auto_clean: dh_auto_clean
signature.asc
Description: OpenPGP digital signature
