rev 12217 - in kde-extras/konversation/trunk/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-09-20 12:59:18 +0000 (Sat, 20 Sep 2008)
New Revision: 12217

Modified:
   kde-extras/konversation/trunk/debian/changelog
   kde-extras/konversation/trunk/debian/konversation.install
   kde-extras/konversation/trunk/debian/patches/17_add_extra_version_string.diff
   kde-extras/konversation/trunk/debian/patches/98_buildprep.diff
   kde-extras/konversation/trunk/debian/patches/series
Log:
Looks like I forgot to commit konversation 1.1-1

Modified: kde-extras/konversation/trunk/debian/changelog
===================================================================
--- kde-extras/konversation/trunk/debian/changelog	2008-09-20 11:15:34 UTC (rev 12216)
+++ kde-extras/konversation/trunk/debian/changelog	2008-09-20 12:59:18 UTC (rev 12217)
@@ -1,3 +1,40 @@
+konversation (1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Minor updates to konversation.install file (translations).
+  * Refresh 17_add_extra_version_string.diff patch (STRHACK was removed from
+    the final 1.1 release, readd).
+  * Regenerate 98_buildprep.diff.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 11 Aug 2008 13:08:48 +0300
+
+konversation (1.1~-rc1+svn837068-1) unstable; urgency=medium
+
+  * New upstream development snapshot (1.1rc1+ #3235):
+    - Revision: 837068; Date: 2008-07-23 20:59:29 +0300 UTC by hein.
+    - The latest translation and documentation are included (as of
+      Thu, 23 Jul 2008 22:38:12 +0300).
+    - 3 or more crash fixes since 1.1rc1 which is in testing. Hence urgency
+      medium.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Wed, 23 Jul 2008 22:41:39 +0300
+
+konversation (1.1~-rc1+svn834660-1) unstable; urgency=high
+
+  * New upstream development snapshot (1.1rc1+ #3230):
+    - Revision: 834660; Date: Sat Jul 19 12:23:39 2008 UTC by scripty.
+    - The latest translation and documentation are included (as of
+      Thu, 21 Jul 2008 09:49:20 +0300).
+    - Fixes another crash on close (DCOP quit) (Closes: #491332).
+  * Remove 16_konversation_desktop.diff - merged upstream.
+  * Remove konversationircprotocolhandler.1 manual page. Excess since some
+    time now.
+  * Update konversation.install file.
+  * Urgency high to reach testing in time before freeze. Fixes regression
+    (crash).
+
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 21 Jul 2008 10:18:13 +0300
+
 konversation (1.1~-rc1-1) unstable; urgency=medium
   
   * New upstream development milestone (1.1 RC1):

Modified: kde-extras/konversation/trunk/debian/konversation.install
===================================================================
--- kde-extras/konversation/trunk/debian/konversation.install	2008-09-20 11:15:34 UTC (rev 12216)
+++ kde-extras/konversation/trunk/debian/konversation.install	2008-09-20 12:59:18 UTC (rev 12217)
@@ -12,6 +12,7 @@
 debian/tmp/usr/share/doc/kde/HTML/et/konversation/*
 debian/tmp/usr/share/doc/kde/HTML/it/konversation/*
 debian/tmp/usr/share/doc/kde/HTML/pt/konversation/*
+debian/tmp/usr/share/doc/kde/HTML/ru/konversation/*
 debian/tmp/usr/share/doc/kde/HTML/sv/konversation/*
 debian/tmp/usr/share/icons/*
 debian/tmp/usr/share/locale/*

Modified: kde-extras/konversation/trunk/debian/patches/17_add_extra_version_string.diff
===================================================================
--- kde-extras/konversation/trunk/debian/patches/17_add_extra_version_string.diff	2008-09-20 11:15:34 UTC (rev 12216)
+++ kde-extras/konversation/trunk/debian/patches/17_add_extra_version_string.diff	2008-09-20 12:59:18 UTC (rev 12217)
@@ -1,27 +1,31 @@
 --- a/konversation/src/main.cpp
 +++ b/konversation/src/main.cpp
-@@ -28,6 +28,15 @@
- #define STRHACK(x) HACKSTR(x)
+@@ -24,6 +24,19 @@
+ #include "version.h"
+ #include "commit.h"
  
- /*
++#define HACKSTR(x) #x
++#define STRHACK(x) HACKSTR(x)
++
++/*
 +  Add extra version string (if any) to the about dialog
 +*/
++
 +#ifdef EXTRA_VERSION_STRING
 +#  define _EXTRA_VERSION_STRING " " STRHACK(EXTRA_VERSION_STRING)
 +#else
 +#  define _EXTRA_VERSION_STRING ""
 +#endif
 +
-+/*
+ /*
    Don't use i18n() here, use I18N_NOOP() instead!
    i18n() will only work as soon as a kapplication object was made.
- */
-@@ -50,7 +59,7 @@
+@@ -47,7 +60,7 @@
  {
      KAboutData aboutData("konversation",
          I18N_NOOP("Konversation"),
--        KONVI_VERSION " #" STRHACK(COMMIT),
-+        KONVI_VERSION " #" STRHACK(COMMIT) _EXTRA_VERSION_STRING,
+-        KONVI_VERSION,
++        KONVI_VERSION _EXTRA_VERSION_STRING,
          shortDescription,
          KAboutData::License_GPL,
          I18N_NOOP("(C) 2002-2008 by the Konversation team"),

Modified: kde-extras/konversation/trunk/debian/patches/98_buildprep.diff
===================================================================

Modified: kde-extras/konversation/trunk/debian/patches/series
===================================================================
--- kde-extras/konversation/trunk/debian/patches/series	2008-09-20 11:15:34 UTC (rev 12216)
+++ kde-extras/konversation/trunk/debian/patches/series	2008-09-20 12:59:18 UTC (rev 12217)
@@ -5,7 +5,6 @@
 kubuntu_01_kdepot.diff
 10_debian_channel.diff
 11_dbug_autoreplace.diff
-16_konversation_desktop.diff
 17_add_extra_version_string.diff
 18_debian_package_version_to_about.diff
 98_buildprep.diff