Hello,
I'm doing an NMU of kflog to fix #287066, #314008, and #327992; diff
attached.
Thanks,
Matej
diff -u kflog-2.1.1/debian/changelog kflog-2.1.1/debian/changelog
--- kflog-2.1.1/debian/changelog
+++ kflog-2.1.1/debian/changelog
@@ -1,3 +1,15 @@
+kflog (2.1.1-3.1) unstable; urgency=medium
+
+ * NMU.
+ * Rebuild for the Qt/KDE transition. Closes: #327992.
+ * kflog/dataview.cpp: Don't assume int is wide enough to represent a
+ pointer. Closes: #287066.
+ * po/de.po: Apply corrections from Jens Seidel. Closes: #314008.
+ * debian/kflog.1: Fix groff warnings by using named characters.
+ * Move private libraries to /usr/lib/kflog.
+
+ -- Matej Vela <[EMAIL PROTECTED]> Sun, 19 Feb 2006 22:48:37 +0100
+
kflog (2.1.1-3) unstable; urgency=low
* Move icons from /usr/share/apps/icons to /usr/share/apps/kflog/icons
diff -u kflog-2.1.1/debian/rules kflog-2.1.1/debian/rules
--- kflog-2.1.1/debian/rules
+++ kflog-2.1.1/debian/rules
@@ -15,4 +15,7 @@
+# Move private libraries to /usr/lib/kflog
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/kflog
+
build/kflog::
- cp -p po/*.gmo $(DEB_BUILDDIR)/po/
+ cp -pu po/*.gmo $(DEB_BUILDDIR)/po/
diff -u kflog-2.1.1/debian/kflog.1 kflog-2.1.1/debian/kflog.1
--- kflog-2.1.1/debian/kflog.1
+++ kflog-2.1.1/debian/kflog.1
@@ -84,12 +84,12 @@
.nh
Florian Ehinger <[EMAIL PROTECTED]>,
Heiner Lamprecht <[EMAIL PROTECTED]>,
-Andr� Somers <[EMAIL PROTECTED]>,
+Andr\['e] Somers <[EMAIL PROTECTED]>,
Christof Bodner <[EMAIL PROTECTED]>,
Eggert Ehmke <[EMAIL PROTECTED]>,
Harald Maier <[EMAIL PROTECTED]>,
Thomas Nielsen <[EMAIL PROTECTED]> and
-Jan Kr�ger <[EMAIL PROTECTED]>.
+Jan Kr\[:u]ger <[EMAIL PROTECTED]>.
.hy
.br
For more information about KFLog please take a look at its home page at
only in patch2:
unchanged:
--- kflog-2.1.1.orig/po/de.po
+++ kflog-2.1.1/po/de.po
@@ -1,9 +1,4 @@
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
-# translation of de.po to
# translation of de.po to deutsch
-# translation of de.po to
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# Heiner Lamprecht <[EMAIL PROTECTED]>, 2003
@@ -984,11 +979,11 @@
#: kflogconfig.cpp:292
msgid "Control C"
-msgstr "Kontrolzone C"
+msgstr "Kontrollzone C"
#: kflogconfig.cpp:293
msgid "Control D"
-msgstr "Kontrolzone D"
+msgstr "Kontrollzone D"
#: kflogconfig.cpp:294
msgid "Danger"
@@ -1192,7 +1187,7 @@
#: kflogconfig.cpp:905
msgid "Select default waypoint catalog"
-msgstr "Standart Wendepunktkatalog w�¤hlen"
+msgstr "Standard-Wendepunktkatalog w�¤hlen"
#: main.cpp:55
msgid "export to png graphics file"
@@ -1271,7 +1266,7 @@
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr "Heiner Lamprecht,Eggert Ehmke"
+msgstr "Heiner Lamprecht, Eggert Ehmke"
#: main.cpp:108 _translatorinfo.cpp:3
msgid ""
@@ -1295,7 +1290,7 @@
"<B>Kartenkontrolle</B> um die Karte zu verschieben oder den Maßstab zu "
"�¤ndern ben. Mit Hilfe der rechten Maustaste k�¶nnen Sie die Karte
zentrieren. "
"</P> <P>Um den Maßstab zu ver�¤ndern, benutzen Sie die Buttons in der Toolbar
"
-"oder den Schieber in der Kartenkontrolle.Sie k�¶nnen auch die Tasten \"<"
+"oder den Schieber in der Kartenkontrolle. Sie k�¶nnen auch die Tasten \"<"
"Ctrl><+>\" oder \"+\" (vergrö�ern) und \"<Ctrl><->\" "
"oder \"-\"(verkleinern) benutzen. </P> <P>Mit den Pfeiltasten und den Tasten "
"auf dem numerischen Tastenblock kann die Karte ebenfalls verschoben werden, "
only in patch2:
unchanged:
--- kflog-2.1.1.orig/kflog/dataview.cpp
+++ kflog-2.1.1/kflog/dataview.cpp
@@ -261,7 +261,7 @@
Flight *flight = fl.at(loop);
// store pointer of flight instead of index
// flight list of mapcontents will change
- idString.sprintf("%d", (int)flight);
+ idString.sprintf("%lu", (unsigned long)flight);
fi.setFile(flight->getFileName());
htmlText += "<TR><TD><A HREF=" + idString + ">" +
