diff -Nru revelation-0.4.11/debian/changelog revelation-0.4.11/debian/changelog --- revelation-0.4.11/debian/changelog 2011-08-19 02:05:37.000000000 +0000 +++ revelation-0.4.11/debian/changelog 2012-03-05 01:00:14.000000000 +0000 @@ -1,3 +1,49 @@ +revelation (0.4.11-10ubuntu1) precise; urgency=low + + * Merge from Debian testing, remaining changes: + - debian/patches/091_panel_category.dpatch: + + Change GNOME panel category from "Utility" to the correct "Utilities". + - debian/rules: Include dh_icons. + - debian/patches/series: Include 040_xhtml.dpatch + * Dropped changes, included in Debian: + - Build with python 2.7 + - debian/patches/230-optional-gnomeapplet.patch: Make gnome-applet optional + - Note that md5sums between Debian and Ubuntu are different. + - debian/control: + - Drop libbonoboui2-0, libbonoboui2-dev, libpanel-applet2-dev, + python-gnome2-extras-dev build-dependencies + - Drop python-gnomeapplet dependency + + -- Steve Langasek Sun, 04 Mar 2012 17:00:13 -0800 + +revelation (0.4.11-10) unstable; urgency=low + + * Acknowledge NMUs + * debian/patches/240-password-length.patch: + - Tell user that we only use the first 36 characters of a file encryption + password (Closes: #633088) + + -- Stefan Völkel Sun, 30 Oct 2011 15:59:19 +0100 + +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 Fri, 21 Oct 2011 14:35:26 +0200 + +revelation (0.4.11-9.1) unstable; urgency=low + + * Non-maintainer upload. + * Do not hardcode Python default versions (Closes: #628852). + + -- Luca Falavigna Sun, 18 Sep 2011 01:02:23 +0200 + revelation (0.4.11-9ubuntu1) oneiric; urgency=low * Merge from debian unstable. Remaining changes: diff -Nru revelation-0.4.11/debian/control revelation-0.4.11/debian/control --- revelation-0.4.11/debian/control 2011-08-19 01:51:06.000000000 +0000 +++ revelation-0.4.11/debian/control 2012-03-05 00:05:29.000000000 +0000 @@ -8,7 +8,7 @@ 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 -X-Python-Version: 2.7 +X-Python-Version: >= 2.5 Package: revelation Architecture: any 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_ 2011-08-19 01:39:49.000000000 +0000 +++ revelation-0.4.11/debian/patches/230-optional-gnomeapplet.patch_ 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -# HG changeset patch -# User Mikel Olasagasti Uranga -# Date 1312306322 -7200 -# Node ID 33c06edf4875b3abf44c8fd406c32f21a7821e79 -# Parent e8fc6e4fcf0043fcf5a433bcb86ff1492a260b6f -gnome-python-extras is needed for applet so don't check for it when applet is not built - -diff -r e8fc6e4fcf0043fcf5a433bcb86ff1492a260b6f -r 33c06edf4875b3abf44c8fd406c32f21a7821e79 acinclude.m4 ---- a/acinclude.m4 Tue Aug 02 19:18:52 2011 +0200 -+++ b/acinclude.m4 Tue Aug 02 19:32:02 2011 +0200 -@@ -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 -r e8fc6e4fcf0043fcf5a433bcb86ff1492a260b6f -r 33c06edf4875b3abf44c8fd406c32f21a7821e79 configure.ac ---- a/configure.ac Tue Aug 02 19:18:52 2011 +0200 -+++ b/configure.ac Tue Aug 02 19:32:02 2011 +0200 -@@ -37,6 +37,7 @@ - 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"]) - diff -Nru revelation-0.4.11/debian/patches/240-password-length.patch revelation-0.4.11/debian/patches/240-password-length.patch --- revelation-0.4.11/debian/patches/240-password-length.patch 1970-01-01 00:00:00.000000000 +0000 +++ revelation-0.4.11/debian/patches/240-password-length.patch 2012-03-05 00:02:24.000000000 +0000 @@ -0,0 +1,20 @@ +--- a/src/lib/dialog.py ++++ b/src/lib/dialog.py +@@ -757,7 +757,7 @@ + def __init__(self, parent, filename): + Password.__init__( + self, parent, _('Enter file password'), +- _('The file \'%s\' is encrypted. Please enter the file password to open it.') % filename, ++ _('The file \'%s\' is encrypted. Please enter the file password to open it.\n\nAlso note, that only the first 36 characters are used as your password.') % filename, + gtk.STOCK_OPEN + ) + +@@ -785,7 +785,7 @@ + def __init__(self, parent, filename): + Password.__init__( + self, parent, _('Enter password for file'), +- _('Please enter a password for the file \'%s\'. You will need this password to open the file at a later time.') % filename, ++ _('Please enter a password for the file \'%s\'. You will need this password to open the file at a later time.\n\nPlease note that only the first 36 characters will be used as your password.') % filename, + gtk.STOCK_SAVE + ) + diff -Nru revelation-0.4.11/debian/patches/series revelation-0.4.11/debian/patches/series --- revelation-0.4.11/debian/patches/series 2011-08-19 01:41:26.000000000 +0000 +++ revelation-0.4.11/debian/patches/series 2012-03-05 00:33:54.000000000 +0000 @@ -20,3 +20,4 @@ 210-625040-fix-export-dynamic.dpatch 220-603572-display-icon-on-start.patch 230-optional-gnomeapplet.patch +240-password-length.patch diff -Nru revelation-0.4.11/debian/rules revelation-0.4.11/debian/rules --- revelation-0.4.11/debian/rules 2011-08-19 01:27:03.000000000 +0000 +++ revelation-0.4.11/debian/rules 2012-03-05 00:04:57.000000000 +0000 @@ -17,7 +17,7 @@ PREFIX=/usr -PYVERS=2.7 +PYVERS=$(shell pyversions -vr debian/control) ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0