Hello,
Attached is the diff for the NMU. Without comments from your side,
I'll upload that within a few hours.
Cheers !
Vincent
--
Vincent Fourmond, Debian Developer
http://vince-debian.blogspot.com/
The moon was high now, in a sky as black as a cup of coffee that
wasn't very black at all.
-- Terry Pratchet, Men at arms
Vincent, listening to Water Of Love (Dire Straits)
diff -u wordtrans-1.1pre15/debian/changelog wordtrans-1.1pre15/debian/changelog
--- wordtrans-1.1pre15/debian/changelog
+++ wordtrans-1.1pre15/debian/changelog
@@ -1,3 +1,25 @@
+wordtrans (1.1pre15-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [Evgeni Golov]
+ * Make package binNMU-able by depending on >= ${source:Version} instead
+ of = ${Source-Version} or = ${source:Version}.
+ * Rebuild to correctly compress the manpages. (Closes: #512486, #475642)
+ * Don't set DH_COMPAT in debian/rules, thats what debian/compat is for.
+ Fixes lintians "declares-possibly-conflicting-debhelper-compat-versions"
+ error.
+ * Empty wordtrans-{data,dict}.conffiles, that is handled by debhelper.
+ Fixes lintians "duplicate-conffile" errors.
+
+ [ Vincent Fourmond ]
+ * Non-maintainer upload, second take.
+ * Get rid of obsolete Homepage pseudo-headers
+ * Change Apps into Applications in debian/*.menu
+ * Urgency medium to fix a RC bug in testing
+
+ -- Vincent Fourmond <[email protected]> Sat, 31 Jan 2009 21:11:18 +0100
+
wordtrans (1.1pre15-3.1) unstable; urgency=low
* Non-maintainer upload.
diff -u wordtrans-1.1pre15/debian/rules-qt wordtrans-1.1pre15/debian/rules-qt
--- wordtrans-1.1pre15/debian/rules-qt
+++ wordtrans-1.1pre15/debian/rules-qt
@@ -9,9 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=2
-
# This has to be exported to make some magic below work.
export DH_OPTIONS
diff -u wordtrans-1.1pre15/debian/control-qt
wordtrans-1.1pre15/debian/control-qt
--- wordtrans-1.1pre15/debian/control-qt
+++ wordtrans-1.1pre15/debian/control-qt
@@ -23,7 +23,7 @@
Package: wordtrans-qt
Architecture: any
-Depends: ${shlibs:Depends}, wordtrans-data (= ${Source-Version})
+Depends: ${shlibs:Depends}, wordtrans-data (= ${source:Version})
Suggests: dict, dictd
Conflicts: wordtrans-console (<< 1.1pre10)
Replaces: wordtrans-console
@@ -54,7 +54,7 @@
Package: wordtrans-web
Architecture: all
-Depends: zendapi-20010901, wordtrans-qt (= ${Source-Version}) | wordtrans-kde
(= ${Source-Version}) | cwordtrans (= ${Source-Version})
+Depends: zendapi-20010901, wordtrans-qt (>= ${source:Version}) | wordtrans-kde
(>= ${source:Version}) | cwordtrans (>= ${source:Version})
Recommends: www-browser
Description: Multi Language Word Translator for Linux
Wordtrans is a front-end for several dictionaries. It supports
diff -u wordtrans-1.1pre15/debian/wordtrans-kde.menu
wordtrans-1.1pre15/debian/wordtrans-kde.menu
--- wordtrans-1.1pre15/debian/wordtrans-kde.menu
+++ wordtrans-1.1pre15/debian/wordtrans-kde.menu
@@ -1,3 +1,3 @@
-?package(wordtrans-kde):needs="X11" section="Apps/Text" \
+?package(wordtrans-kde):needs="X11" section="Applications/Text" \
title="kWordtrans" command="/usr/bin/kwordtrans"
hints="Beginner,Small,Translation"
diff -u wordtrans-1.1pre15/debian/wordtrans-qt.menu
wordtrans-1.1pre15/debian/wordtrans-qt.menu
--- wordtrans-1.1pre15/debian/wordtrans-qt.menu
+++ wordtrans-1.1pre15/debian/wordtrans-qt.menu
@@ -1,2 +1,2 @@
-?package(wordtrans-qt):needs="X11" section="Apps/Text" \
+?package(wordtrans-qt):needs="X11" section="Applications/Text" \
title="qWordtrans" command="/usr/bin/qwordtrans"
hints="Beginner,Small,Translation"
diff -u wordtrans-1.1pre15/debian/control-kde
wordtrans-1.1pre15/debian/control-kde
--- wordtrans-1.1pre15/debian/control-kde
+++ wordtrans-1.1pre15/debian/control-kde
@@ -5,6 +5,7 @@
Standards-Version: 3.7.2.2
Build-Depends-Indep: gettext, groff
Build-Depends: debhelper, linuxdoc-tools-text, libfribidi-dev, kdelibs4-dev |
kdelibs-dev (>= 2.2.2-13), recode, php5-dev, g++ (>= 4:4.0.2-2) [arm hppa
m68k] | g++-3.4 [arm hppa m68k], dpkg-dev (>= 1.13.2)
+Homepage: http://wordtrans.sourceforge.net/
Package: wordtrans-data
Architecture: all
@@ -17,8 +18,6 @@
.
This package contains some data files needed by wordtrans-qt
and wordtrans-kde.
- .
- Homepage: http://wordtrans.sourceforge.net/
Package: wordtrans-qt
Architecture: any
@@ -35,8 +34,7 @@
application).
.
This package contains the QT version.
- .
- Homepage: http://wordtrans.sourceforge.net/
+
Package: wordtrans-kde
Architecture: any
@@ -51,8 +49,7 @@
application).
.
This package contains the KDE version.
- .
- Homepage: http://wordtrans.sourceforge.net/
+
Package: wordtrans-doc
Section: doc
@@ -66,12 +63,11 @@
.
This package contains the documentation for wordtrans in html and
plain text formats.
- .
- Homepage: http://wordtrans.sourceforge.net/
+
Package: wordtrans-web
Architecture: all
-Depends: php5 | php5-cgi, wordtrans-qt (= ${source:Version}) | wordtrans-kde
(= ${source:Version})
+Depends: php5 | php5-cgi, wordtrans-qt (>= ${source:Version}) | wordtrans-kde
(>= ${source:Version})
Recommends: www-browser | w3m
Description: Multi Language Word Translator for Linux
Wordtrans is a front-end for several dictionaries. It supports
@@ -81,8 +77,7 @@
application).
.
This package contains a web interface made with php.
- .
- Homepage: http://wordtrans.sourceforge.net/
+
Package: wordtrans-dict
Architecture: all
@@ -94,2 +88,0 @@
- .
- Homepage: http://wordtrans.sourceforge.net/
diff -u wordtrans-1.1pre15/debian/rules-kde wordtrans-1.1pre15/debian/rules-kde
--- wordtrans-1.1pre15/debian/rules-kde
+++ wordtrans-1.1pre15/debian/rules-kde
@@ -9,9 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-
# This has to be exported to make some magic below work.
export DH_OPTIONS
only in patch2:
unchanged:
--- wordtrans-1.1pre15.orig/debian/wordtrans-dict.conffiles
+++ wordtrans-1.1pre15/debian/wordtrans-dict.conffiles
@@ -1 +0,0 @@
-/etc/wordtrans/dictd.dconf
only in patch2:
unchanged:
--- wordtrans-1.1pre15.orig/debian/wordtrans-data.conffiles
+++ wordtrans-1.1pre15/debian/wordtrans-data.conffiles
@@ -1,2 +0,0 @@
-/etc/wordtrans/babylon.bconf
-/etc/wordtrans/dict-org.dconf
