Hi, On Fri, 23 Jan 2009 02:43:32 +0100 Javier Fernandez-Sanguino wrote:
> 2009/1/22 Evgeni Golov <[email protected]>: > > I'll prepare an NMU, making the package binNMU-able, and hoping the new > > build will have correctly gziped manpages. > > Go ahead an NMU but please forward first a proposed patch to this bug > report. If time permits I might be able to make the upload myself. It's attached. Besides of making the package binNMU-able I added fixes for two lintian errors, there are still other errors and warnings, but those are for the maintainers as I don't want to change too much :) Regards Evgeni, still wondering why the manpages weren't compressed in the last upload... -- Bruce Schneier Fact Number 459: Bruce Schneier stole my bike.
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,17 @@
+wordtrans (1.1pre15-3.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * 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.
+
+ -- Evgeni Golov <[email protected]> Thu, 22 Jan 2009 10:46:35 +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/control-kde wordtrans-1.1pre15/debian/control-kde
--- wordtrans-1.1pre15/debian/control-kde
+++ wordtrans-1.1pre15/debian/control-kde
@@ -71,7 +71,7 @@
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
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-data.conffiles
+++ wordtrans-1.1pre15/debian/wordtrans-data.conffiles
@@ -1,2 +0,0 @@
-/etc/wordtrans/babylon.bconf
-/etc/wordtrans/dict-org.dconf
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
pgpfD3Lvsd2ju.pgp
Description: PGP signature
