On Tue, Nov 28, 2006 at 06:34:59AM +0100, Ana Guerrero wrote:
> Hi,
>
> Besides fix this RC bug, this package needs to be updated correctly
> to the last python policy. I'm working in a NMU that covers this too.
>
I sent this patch directly to the maintainer some days ago, i'm sending
it via the BTS again in case there was problems with the mail.
Tomas, if you do not have time to upload it, ping me and i'll NMU it.
Ana
diff -Nrua xxdiff-3.2.orig/debian/changelog xxdiff-3.2/debian/changelog
--- xxdiff-3.2.orig/debian/changelog 2006-11-28 13:02:32.000000000 +0100
+++ xxdiff-3.2/debian/changelog 2006-11-28 12:47:31.000000000 +0100
@@ -1,3 +1,15 @@
+xxdiff (1:3.2-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Removed directory /usr/man. Patch by Andreas Henriksson.
+ (Closes: #399764).
+ * Python Policy: using dh_pysupport instead of dh_python.
+ Added Build-Depends on python-support.
+ * Updated Standars-versions to 3.7.2, no changes required.
+ * Updated FSF address in copyright file.
+
+ -- Ana Beatriz Guerrero Lopez <[EMAIL PROTECTED]> Tue, 28 Nov 2006 06:06:06
+0100
+
xxdiff (1:3.2-0) unstable; urgency=low
* new upstream:
diff -Nrua xxdiff-3.2.orig/debian/control xxdiff-3.2/debian/control
--- xxdiff-3.2.orig/debian/control 2006-11-28 13:02:32.000000000 +0100
+++ xxdiff-3.2/debian/control 2006-11-28 12:35:23.000000000 +0100
@@ -1,9 +1,9 @@
Source: xxdiff
-Build-Depends: qt3-dev-tools, flex, bison, libqt3-mt-dev, debhelper, python
+Build-Depends: qt3-dev-tools, flex, bison, libqt3-mt-dev, debhelper (>= 5),
python, python-support (>= 0.4)
Section: text
Priority: optional
Maintainer: Tomas Pospisek <[EMAIL PROTECTED]>
-Standards-Version: 3.2.1
+Standards-Version: 3.7.2
Package: xxdiff
Architecture: any
@@ -16,10 +16,13 @@
differences highlighted with colors for easy identification. Among its
features are:
.
- * can compare two files, three files, or two directories (shallow and
recursive);
+ * can compare two files, three files, or two directories (shallow and
+ recursive);
* horizontal diffs highlighting;
- * files can be merged interactively and resulting output visualized and
saved;
- * can unmerge CVS conflicts in automatically merged files and display themi
as two files, to help resolve conflicts;
+ * files can be merged interactively and resulting output visualized and
+ saved;
+ * can unmerge CVS conflicts in automatically merged files and display
+ themi as two files, to help resolve conflicts;
* fully customizable with a resource file;
.
The scripts that accompany xxdiff can be found in the xxdiff-tools
@@ -35,6 +38,8 @@
* xx-cvs-diff: preview changes made in a CVS checkout
* xx-svn-diff: preview changes made in a SVN checkout and commit them
* xx-svn-resolve: resolve conflicts
- * svn-foreign: traverse a checkout and ask user whether he wants to check in
new files etc.
- * xx-diff-proxy: act like the diff tool - useful for tools that feed stuff
to diff
+ * svn-foreign: traverse a checkout and ask user whether he wants to check
+ in new files etc.
+ * xx-diff-proxy: act like the diff tool - useful for tools that feed stuff
+ to diff
diff -Nrua xxdiff-3.2.orig/debian/copyright xxdiff-3.2/debian/copyright
--- xxdiff-3.2.orig/debian/copyright 2006-11-28 13:02:32.000000000 +0100
+++ xxdiff-3.2/debian/copyright 2006-11-28 12:35:23.000000000 +0100
@@ -22,7 +22,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
diff -Nrua xxdiff-3.2.orig/debian/rules xxdiff-3.2/debian/rules
--- xxdiff-3.2.orig/debian/rules 2006-11-28 13:02:32.000000000 +0100
+++ xxdiff-3.2/debian/rules 2006-11-28 13:33:30.000000000 +0100
@@ -59,9 +59,7 @@
usr/share/doc/xxdiff-scripts/changelog.gz \
usr/share/doc/xxdiff/changelog.Debian.gz \
usr/share/doc/xxdiff-scripts/changelog.Debian.gz
-# dh_pysupport -v --package=xxdiff-scripts \
-# /usr/share/python-support/xxdiff
- dh_python --package=xxdiff-scripts
+ dh_pysupport --package=xxdiff-scripts
dh_strip --package=xxdiff
dh_compress
dh_installdeb --package=xxdiff-scripts
diff -Nrua xxdiff-3.2.orig/debian/xxdiff.dirs xxdiff-3.2/debian/xxdiff.dirs
--- xxdiff-3.2.orig/debian/xxdiff.dirs 2006-11-28 13:02:32.000000000 +0100
+++ xxdiff-3.2/debian/xxdiff.dirs 2006-11-28 12:35:23.000000000 +0100
@@ -1,4 +1,3 @@
usr/share/doc/xxdiff/manual.html
usr/share/doc/xxdiff/manual.txt
usr/bin
-usr/man/man1
