Hi Attached the patch for the version I intend to upload. Please respond if you don't want this NMU to happen, if you are working yourself on a patch or if you think that the attached patch won't work.
Cheers Luk -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u kbarcode-1.8.0/debian/changelog kbarcode-1.8.0/debian/changelog
--- kbarcode-1.8.0/debian/changelog
+++ kbarcode-1.8.0/debian/changelog
@@ -1,3 +1,13 @@
+kbarcode (1.8.0-3.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Split xlibs-dev build-dep (Closes: #346743).
+ * Remove explicit build-dep on g++-3.4 (Closes: #342975).
+ * German PO file corrections (Closes: #314013).
+ * Support GNU/kFreeBSD (Closes: #303338).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Wed, 11 Jan 2006 16:05:43 +0100
+
kbarcode (1.8.0-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u kbarcode-1.8.0/debian/control kbarcode-1.8.0/debian/control
--- kbarcode-1.8.0/debian/control
+++ kbarcode-1.8.0/debian/control
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Theodore Karkoulis <[EMAIL PROTECTED]>
-Build-Depends: g++-3.4 [arm hppa m68k], debhelper (>> 4.0.0), xlibs-dev (>=
4.2.1), libqt3-mt-dev (>= 3.2.1), kdelibs4-dev (>= 3.1.3)
+Build-Depends: debhelper (>> 4.0.0), libx11-dev, libxext-dev, libxpm-dev,
libqt3-mt-dev (>= 3.2.1), kdelibs4-dev (>= 3.1.3)
Standards-Version: 3.6.1
Package: kbarcode
diff -u kbarcode-1.8.0/debian/rules kbarcode-1.8.0/debian/rules
--- kbarcode-1.8.0/debian/rules
+++ kbarcode-1.8.0/debian/rules
@@ -23,19 +23,6 @@
INSTALL_PROGRAM += -s
endif
-###
-
-GCC4_ICES_HERE := arm m68k hppa
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
- export CC=gcc-3.4
- export CPP=cpp-3.4
- export CXX=g++-3.4
-endif
-
-###
-
config.status: configure
dh_testdir
# Add here commands to configure the package.
only in patch2:
unchanged:
--- kbarcode-1.8.0.orig/po/de.po
+++ kbarcode-1.8.0/po/de.po
@@ -1,6 +1,4 @@
# translation of de.po to Deutsch
-# translation of de.po to
-# translation of de.po to
# German Translation of KBarcode
# Copyright (C) 2003 Free Software Foundation, Inc.
# DOMINIK SEICHTER <[EMAIL PROTECTED]>, 2002,2003.
@@ -671,7 +669,7 @@
#: sqltables.cpp:492
msgid "<b>You have to test your database settings before you can procede.</b>"
msgstr ""
-"<b>Sie müssen die Datenbank Einstellungen testen, bevor Sie fortfahren "
+"<b>Sie müssen die Datenbank-Einstellungen testen, bevor Sie fortfahren "
"können.</b>"
#: labelprinter.cpp:92
@@ -1852,7 +1850,7 @@
#: kbarcode.cpp:48
msgid "&Batch Printing..."
-msgstr "&Massen Druck..."
+msgstr "&Massen-Druck..."
#: kbarcode.cpp:49
msgid "Edit SQL &Tables..."
@@ -2119,7 +2117,7 @@
#~ msgstr "Text:"
#~ msgid "Position X:"
-#~ msgstr "X Postion:"
+#~ msgstr "X Position:"
#~ msgid "Position Y:"
#~ msgstr "Y Position:"
signature.asc
Description: OpenPGP digital signature
