tags 638087 + pending tags thanks Hi,
I've just uploaded an NMU to DELAYED/2, where I disabled the GNOME 2
panel applet. The changelog reads:
hspell-gui (0.2.6-5.1) unstable; urgency=low
.
* Non-maintainer upload, for the GNOME 3 transition.
* Stop building the GNOME 2 panel applet and only install the
standalone application. (Closes: #638087)
- Add patch no-applet to stop building and installing the panel
applet.
- Drop Build-Depends on libpanel-applet2-dev and libgnomeui-dev.
- Remove autoconf-gnomeui and applet patch, obsolete.
- Use dh-autoreconf to update the build system.
The full debdiff is attached.
Please let me know, if I should delay the NMU further or if you want to
have it cancelled for other reasons.
Cheers,
Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff -Nru hspell-gui-0.2.6/debian/changelog hspell-gui-0.2.6/debian/changelog --- hspell-gui-0.2.6/debian/changelog 2011-04-07 00:57:54.000000000 +0200 +++ hspell-gui-0.2.6/debian/changelog 2011-10-28 12:47:24.000000000 +0200 @@ -1,3 +1,15 @@ +hspell-gui (0.2.6-5.1) unstable; urgency=low + + * Non-maintainer upload, for the GNOME 3 transition. + * Stop building the GNOME 2 panel applet and only install the standalone + application. (Closes: #638087) + - Add patch no-applet to stop building and installing the panel applet. + - Drop Build-Depends on libpanel-applet2-dev and libgnomeui-dev. + - Remove autoconf-gnomeui and applet patch, obsolete. + - Use dh-autoreconf to update the build system. + + -- Michael Biebl <bi...@debian.org> Fri, 28 Oct 2011 12:35:23 +0200 + hspell-gui (0.2.6-5) unstable; urgency=low [ Tzafrir Cohen ] diff -Nru hspell-gui-0.2.6/debian/control hspell-gui-0.2.6/debian/control --- hspell-gui-0.2.6/debian/control 2011-04-07 00:35:24.000000000 +0200 +++ hspell-gui-0.2.6/debian/control 2011-10-28 12:38:53.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Hebrew Packaging Team <debian-hebrew-pack...@lists.alioth.debian.org> Uploaders: Baruch Even <bar...@debian.org>, Lior Kaplan <kap...@debian.org>, Shachar Shemesh <shac...@debian.org>, Tzafrir Cohen <tzaf...@debian.org> -Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, libpanel-applet2-dev, libgnomeui-dev, automake +Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, dh-autoreconf Standards-Version: 3.9.1 Homepage: http://hspell-gui.sourceforge.net/ diff -Nru hspell-gui-0.2.6/debian/patches/applet hspell-gui-0.2.6/debian/patches/applet --- hspell-gui-0.2.6/debian/patches/applet 2011-04-06 23:57:53.000000000 +0200 +++ hspell-gui-0.2.6/debian/patches/applet 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ ---- /dev/null -+++ b/hspell-applet.server -@@ -0,0 +1,33 @@ -+<oaf_info> -+<oaf_server iid="OAFIID:HspellApplet_Factory" type="exe" -+ location="/usr/lib/gnome-panel/hspell-applet"> -+ -+ <oaf_attribute name="repo_ids" type="stringv"> -+ <item value="IDL:Bonobo/GenericFactory:1.0"/> -+ <item value="IDL:Bonobo/Unknown:1.0"/> -+ </oaf_attribute> -+ <oaf_attribute name="name" type="string" value="hspell Applet"/> -+ <oaf_attribute name="description" type="string" value="hebrew speller applet"/> -+</oaf_server> -+ -+<oaf_server iid="OAFIID:HspellApplet" type="factory" -+ location="OAFIID:HspellApplet_Factory"> -+ -+ <oaf_attribute name="repo_ids" type="stringv"> -+ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/> -+ <item value="IDL:Bonobo/Control:1.0"/> -+ <item value="IDL:Bonobo/Unknown:1.0"/> -+ </oaf_attribute> -+ -+ <oaf_attribute name="panel:icon" type="string" value="gnome-calendar.png"/> -+ -+ <oaf_attribute name="name" type="string" value="HSpell"/> -+ <oaf_attribute name="name-he" type="string" value="××××ת"/> -+ <oaf_attribute name="description" type="string" value="Hebrew speller applet"/> -+ <oaf_attribute name="description-he" type="string" value="×ש×××× ×××קת ×××ת"/> -+ -+ <oaf_attribute name="panel:category" type="string" value="Utility"/> -+ <oaf_attribute name="panel:category-he" type="string" value="×¢×ר××"/> -+ -+</oaf_server> -+</oaf_info> diff -Nru hspell-gui-0.2.6/debian/patches/autoconf-gnomeui hspell-gui-0.2.6/debian/patches/autoconf-gnomeui --- hspell-gui-0.2.6/debian/patches/autoconf-gnomeui 2011-04-06 23:57:40.000000000 +0200 +++ hspell-gui-0.2.6/debian/patches/autoconf-gnomeui 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -Description: Also use headers from libgnomeui-2.0 -Bug-Debian: http://bugs.debian.org/537033 -Author: Stefano Zacchiroli <z...@debian.org> -Last-Changed: 2009-09-06 - -Note that after applying this patch you'll still need to re-run autoconf. - ---- a/configure.in -+++ b/configure.in -@@ -10,7 +10,7 @@ - AM_PROG_CC_STDC - AC_HEADER_STDC - --pkg_modules="gtk+-2.0 >= 2.0.0 libpanelapplet-2.0" -+pkg_modules="gtk+-2.0 >= 2.0.0 libpanelapplet-2.0 libgnomeui-2.0" - PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) - AC_SUBST(PACKAGE_CFLAGS) - AC_SUBST(PACKAGE_LIBS) diff -Nru hspell-gui-0.2.6/debian/patches/no-applet hspell-gui-0.2.6/debian/patches/no-applet --- hspell-gui-0.2.6/debian/patches/no-applet 1970-01-01 01:00:00.000000000 +0100 +++ hspell-gui-0.2.6/debian/patches/no-applet 2011-10-28 12:49:53.000000000 +0200 @@ -0,0 +1,61 @@ +Index: hspell-gui-0.2.6/configure.in +=================================================================== +--- hspell-gui-0.2.6.orig/configure.in 2011-10-28 12:46:13.000000000 +0200 ++++ hspell-gui-0.2.6/configure.in 2011-10-28 12:49:16.605787610 +0200 +@@ -10,7 +10,7 @@ + AM_PROG_CC_STDC + AC_HEADER_STDC + +-pkg_modules="gtk+-2.0 >= 2.0.0 libpanelapplet-2.0" ++pkg_modules="gtk+-2.0 >= 2.0.0" + PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) + AC_SUBST(PACKAGE_CFLAGS) + AC_SUBST(PACKAGE_LIBS) +Index: hspell-gui-0.2.6/src/Makefile.am +=================================================================== +--- hspell-gui-0.2.6.orig/src/Makefile.am 2011-10-28 12:46:13.000000000 +0200 ++++ hspell-gui-0.2.6/src/Makefile.am 2011-10-28 12:49:16.605787610 +0200 +@@ -9,17 +9,12 @@ + + bin_PROGRAMS = hspell-gui + +-libexec_PROGRAMS = hspell-applet +- + hspell_gui_SOURCES = \ + main.c \ + support.c support.h \ + interface.c interface.h \ + callbacks.c callbacks.h + +-hspell_applet_SOURCES = hspell-applet.c +- + hspell_gui_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) +-hspell_applet_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) + + man_MANS = hspell-gui.1 hspell-gui-heb.1 +Index: hspell-gui-0.2.6/Makefile.am +=================================================================== +--- hspell-gui-0.2.6.orig/Makefile.am 2011-10-28 12:46:13.000000000 +0200 ++++ hspell-gui-0.2.6/Makefile.am 2011-10-28 12:49:50.073366866 +0200 +@@ -10,11 +10,8 @@ + hspell_gui.gladep \ + hspell-gui-heb + +-install-data-local: hspell-applet.server ++install-data-local: + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libdir)/bonobo/servers; \ +- $(INSTALL_DATA) hspell-applet.server $(DESTDIR)$(libdir)/bonobo/servers; \ +- chmod ugo+wr hspell-applet.server; \ + $(INSTALL_DATA) hspell-gui-heb $(DESTDIR)$(bindir); + chmod ugo+rx $(DESTDIR)$(bindir)/hspell-gui-heb; + if test -d $(srcdir)/pixmaps; then \ +@@ -36,8 +33,4 @@ + done \ + fi + +-serverdir = $(libdir)/bonobo/servers + server_in_files = hspell-applet.server.in.in +- +-hspell-applet.server: +- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" hspell-applet.server.in.in > hspell-applet.server diff -Nru hspell-gui-0.2.6/debian/patches/series hspell-gui-0.2.6/debian/patches/series --- hspell-gui-0.2.6/debian/patches/series 2010-05-21 13:37:39.000000000 +0200 +++ hspell-gui-0.2.6/debian/patches/series 2011-10-28 12:39:17.000000000 +0200 @@ -1,3 +1,2 @@ -applet -autoconf-gnomeui he_po +no-applet diff -Nru hspell-gui-0.2.6/debian/rules hspell-gui-0.2.6/debian/rules --- hspell-gui-0.2.6/debian/rules 2011-04-07 00:13:28.000000000 +0200 +++ hspell-gui-0.2.6/debian/rules 2011-10-28 12:34:50.000000000 +0200 @@ -2,13 +2,12 @@ # -*- mode: makefile; coding: utf-8 -*- %: - dh $@ + dh $@ --with autoreconf #DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=\$${prefix}/lib/gnome-panel override_dh_auto_configure: - autoreconf -i dh_auto_configure -- --libexecdir='$${prefix}/lib/gnome-panel' makebuilddir/hspell-gui:: configure
signature.asc
Description: OpenPGP digital signature
