tags 638124 + 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:
revelation (0.4.11-9.2) unstable; urgency=low
* Non-maintainer upload, for the GNOME 3 transition.
* debian/patches/230-optional-gnomeapplet.patch:
- Make the panel applet optional, patch taken from Ubuntu.
* debian/control:
- Drop libbonoboui2-0, libbonoboui2-dev, libpanel-applet2-dev,
python-gnome2-extras-dev build-dependencies
- Drop python-gnomeapplet dependency (Closes: #638124)
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 revelation-0.4.11/debian/changelog revelation-0.4.11/debian/changelog --- revelation-0.4.11/debian/changelog 2011-09-18 01:03:30.000000000 +0200 +++ revelation-0.4.11/debian/changelog 2011-10-21 14:41:39.000000000 +0200 @@ -1,3 +1,15 @@ +revelation (0.4.11-9.2) unstable; urgency=low + + * Non-maintainer upload, for the GNOME 3 transition. + * debian/patches/230-optional-gnomeapplet.patch: + - Make the panel applet optional, patch taken from Ubuntu. + * debian/control: + - Drop libbonoboui2-0, libbonoboui2-dev, libpanel-applet2-dev, + python-gnome2-extras-dev build-dependencies + - Drop python-gnomeapplet dependency (Closes: #638124) + + -- Michael Biebl <[email protected]> Fri, 21 Oct 2011 14:35:26 +0200 + revelation (0.4.11-9.1) unstable; urgency=low * Non-maintainer upload. diff -Nru revelation-0.4.11/debian/control revelation-0.4.11/debian/control --- revelation-0.4.11/debian/control 2011-09-18 01:02:02.000000000 +0200 +++ revelation-0.4.11/debian/control 2011-10-21 14:35:08.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Stefan Völkel <[email protected]> DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 5.0.37.2), xsltproc, docbook-xsl, python-all-dev (>= 2.6.6-3), imagemagick, python-crypto, python-gtk2-dev, libglib2.0-dev, pkg-config, gconf2, python-gnome2-dev, libgtk2.0-dev, libgnomeui-dev, libcrack2-dev (>= 2.8.12), cracklib-runtime (>= 2.8.12), python-gnome2, libbonoboui2-0, libbonoboui2-dev, libpanel-applet2-dev, python-gnome2-extras-dev, python-gnome2-desktop-dev, libxml-parser-perl, autoconf, intltool, automake +Build-Depends: debhelper (>= 5.0.37.2), xsltproc, docbook-xsl, python-all-dev (>= 2.6.6-3), imagemagick, python-crypto, python-gtk2-dev, libglib2.0-dev, pkg-config, gconf2, python-gnome2-dev, libgtk2.0-dev, libgnomeui-dev, libcrack2-dev (>= 2.8.12), cracklib-runtime (>= 2.8.12), python-gnome2, python-gnome2-desktop-dev, libxml-parser-perl, autoconf, intltool, automake Standards-Version: 3.9.2 Vcs-Git: git://bc-bd.org/git/revelation.git Vcs-Browser: https://bc-bd.org/cgi-bin/gitweb.cgi?p=revelation.git @@ -11,7 +11,7 @@ Package: revelation Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-gtk2, python-gnome2, python-crypto, gnome-icon-theme, shared-mime-info, python-gnomeapplet, python-gobject (>= 2.21.1-2), gnome-extra-icons +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-gtk2, python-gnome2, python-crypto, gnome-icon-theme, shared-mime-info, python-gobject (>= 2.21.1-2), gnome-extra-icons Description: GNOME2 Password manager Revelation is a password manager for the GNOME 2 desktop. It organizes accounts in a tree structure, and stores them as AES-encrypted XML. diff -Nru revelation-0.4.11/debian/patches/230-optional-gnomeapplet.patch revelation-0.4.11/debian/patches/230-optional-gnomeapplet.patch --- revelation-0.4.11/debian/patches/230-optional-gnomeapplet.patch 1970-01-01 01:00:00.000000000 +0100 +++ revelation-0.4.11/debian/patches/230-optional-gnomeapplet.patch 2011-10-21 14:34:24.000000000 +0200 @@ -0,0 +1,107 @@ +# HG changeset patch +# User Mikel Olasagasti Uranga <[email protected]> +# Date 1311655106 -7200 +# Node ID ecd61aca9f0bc14a64930223177f2c8092af40f3 +# Parent 2472ae86578d64f881955e0e82122ca9be9b0a4d +Make applet building conditional and disabled by default so it works on clean GNOME3 installations. + +--- a/configure.ac ++++ b/configure.ac +@@ -22,15 +22,23 @@ + RVL_FDO_MIME() + + RVL_PYTHON_MODULE(Crypto, yes) +-RVL_PYTHON_MODULE(bonobo, yes) + RVL_PYTHON_MODULE(gconf, yes) + RVL_PYTHON_MODULE(gtk, yes) + RVL_PYTHON_MODULE(gnome, yes) +-RVL_PYTHON_MODULE(gnomeapplet, yes) + RVL_PYTHON_MODULE(gnomevfs, yes) + RVL_PYTHON_MODULE(gobject, yes) + RVL_PYTHON_MODULE(pango, yes) + ++dnl Enable applet installation ++AC_ARG_WITH(applet, ++ AS_HELP_STRING([--with-applet],[Build with applet (default=no)]), ++ ,with_applet=no) ++if test "x$with_applet" = "xyes" ; then ++ RVL_PYTHON_MODULE(bonobo, yes) ++ RVL_PYTHON_MODULE(gnomeapplet, yes) ++ PKG_CHECK_MODULES(GNOME_PYTHON_EXTRAS, [gnome-python-extras-2.0 >= 2.10.0]) ++fi ++AM_CONDITIONAL([WITH_APPLET], [test "x$with_applet" = "xyes"]) + + dnl output files + AC_OUTPUT([ +@@ -55,3 +63,13 @@ + src/wrap/crack/Makefile + ]) + ++echo " ++ ++------------------------------------------------------------------ ++-- revelation compilation options ++ ++revelation version: ${PACKAGE_VERSION} ++With applet: $with_applet ++------------------------------------------------------------------ ++" ++ +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -5,5 +5,8 @@ + # $Id: Makefile.am 377 2005-07-26 19:42:31Z erikg $ + # + +-SUBDIRS = bonobo cracklib gconf icons mime ui ++SUBDIRS = cracklib gconf icons mime ui + ++if WITH_APPLET ++SUBDIRS +=bonobo ++endif +--- a/data/gconf/Makefile.am ++++ b/data/gconf/Makefile.am +@@ -6,8 +6,11 @@ + # + + schemadir = @GCONF_SCHEMA_FILE_DIR@ +-dist_schema_DATA = revelation.schemas revelation-applet.schemas ++dist_schema_DATA = revelation.schemas + ++if WITH_APPLET ++dist_schema_DATA += revelation-applet.schemas ++endif + + install-data-hook: + if GCONF_SCHEMAS_INSTALL +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -7,10 +7,15 @@ + + SUBDIRS = bundle lib wrap + bin_SCRIPTS = revelation +-libexec_SCRIPTS = revelation-applet +-EXTRA_DIST = revelation.in revelation-applet.in +-CLEANFILES = revelation revelation-applet ++EXTRA_DIST = revelation.in ++CLEANFILES = revelation ++ + ++if WITH_APPLET ++libexec_SCRIPTS = revelation-applet ++EXTRA_DIST += revelation.in revelation-applet.in ++CLEANFILES += revelation revelation-applet ++endif + + revelation: revelation.in + sed \ +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -83,7 +83,6 @@ + AC_DEFUN([RVL_PYGTK], [ + PKG_CHECK_MODULES(PYGTK, [pygtk-2.0 >= 2.8.0]) + PKG_CHECK_MODULES(GNOME_PYTHON, [gnome-python-2.0 >= 2.10.0]) +- PKG_CHECK_MODULES(GNOME_PYTHON_EXTRAS, [gnome-python-extras-2.0 >= 2.10.0]) + + AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no) + diff -Nru revelation-0.4.11/debian/patches/series revelation-0.4.11/debian/patches/series --- revelation-0.4.11/debian/patches/series 2011-06-29 15:12:52.000000000 +0200 +++ revelation-0.4.11/debian/patches/series 2011-10-21 14:33:21.000000000 +0200 @@ -17,3 +17,4 @@ 200-icons.dpatch 210-625040-fix-export-dynamic.dpatch 220-603572-display-icon-on-start.patch +230-optional-gnomeapplet.patch
signature.asc
Description: OpenPGP digital signature
