rev 11152 - in kde-extras/konversation: branches/experimental/debian branches/experimental/debian/patches trunk

Modestas Vainius modax-guest at alioth.debian.org
Sat Jun 28 10:16:56 UTC 2008 

Author: modax-guest
Date: 2008-06-28 10:16:55 +0000 (Sat, 28 Jun 2008)
New Revision: 11152

Added:
   kde-extras/konversation/branches/experimental/debian/README.source
   kde-extras/konversation/branches/experimental/debian/patches/17_add_extra_version_string.diff
   kde-extras/konversation/branches/experimental/debian/patches/18_debian_package_version_to_about.diff
Removed:
   kde-extras/konversation/trunk/debian/
Modified:
   kde-extras/konversation/branches/experimental/debian/changelog
   kde-extras/konversation/branches/experimental/debian/control
   kde-extras/konversation/branches/experimental/debian/konversation.install
   kde-extras/konversation/branches/experimental/debian/patches/10_debian_channel.diff
   kde-extras/konversation/branches/experimental/debian/patches/11_dbug_autoreplace.diff
   kde-extras/konversation/branches/experimental/debian/patches/16_konversation_desktop.diff
   kde-extras/konversation/branches/experimental/debian/patches/98_buildprep.diff
   kde-extras/konversation/branches/experimental/debian/patches/series
   kde-extras/konversation/branches/experimental/debian/rules
Log:
New snapshot. Preparing experimental -> trunk merge

Added: kde-extras/konversation/branches/experimental/debian/README.source
===================================================================
--- kde-extras/konversation/branches/experimental/debian/README.source	                        (rev 0)
+++ kde-extras/konversation/branches/experimental/debian/README.source	2008-06-28 10:16:55 UTC (rev 11152)
@@ -0,0 +1,18 @@
+This package uses CDBS (Common Debian Build System) for building.
+
+This package uses quilt to manage patches to the upstream source. Please read
+/usr/share/doc/quilt/README.source for more information how to either
+add, modify or remove patches being applied.
+
+All patches should be prefixed with the two digit decimal sequence number.
+Sequence numbers up to 09 are reserved for generic build system patches
+(autotools cleanups and libtool update), patches from 10 to 97 are real changes
+to the upstream source code and 98_buildprep.diff patch is a diff of what you
+get by running:
+
+$ make -f admin/Makefile.common dist; rm -rf autom4te.cache
+
+when all patches up to and including 97th are applied. You usually don't need
+to regenerate the 98_buildprep.diff patch unless you package a new upstream
+release or add/alter/remove a patch which modifies the build system (if you
+don't regenerate it, build system changes might not take effect).

Modified: kde-extras/konversation/branches/experimental/debian/changelog
===================================================================
--- kde-extras/konversation/branches/experimental/debian/changelog	2008-06-28 09:42:33 UTC (rev 11151)
+++ kde-extras/konversation/branches/experimental/debian/changelog	2008-06-28 10:16:55 UTC (rev 11152)
@@ -1,3 +1,56 @@
+konversation (1.1~svn824769-1) unstable; urgency=low
+
+  * New upstream development snapshot for KDE 3 (1.0.1+ #3234)
+    - Revision: 824769; Date: Thu Jun 26 16:19:37 2008 UTC by hein
+    - The latest translation and documentation are included (as of
+      Tue, 24 Jun 2008 12:10:15 +0300)
+  * New patches:
+    - 17_add_extra_version_string.diff patch which allows to append extra
+      version string to the konversation About dialog.
+    - 18_debian_package_version_to_about.diff which sets debian package
+      version as extra version.
+  * Enable final.
+  * Add Vcs fields.
+  * Upgrade Standards-Version to 3.8.0:
+    - Add README.source.
+    - Build depend on quilt 0.46-4.1 which is the earliest that includes
+      /usr/share/doc/quilt/README.source.
+  * Upload to unstable.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Sat, 28 Jun 2008 12:33:14 +0300
+
+konversation (1.0.1+svn806280-1) experimental; urgency=low
+
+  [ Modestas Vainius ]
+  * New upstream development snapshot for KDE 3 (1.0.1+ #3224)
+    - 1.1 is very near. This can be considered Beta or RC.
+    - Revision: 806280; Date: Sat May 10 20:42:12 2008 UTC by hein
+    - The latest translation and documentation are included (as of
+      Sun, 11 May 2008 05:30:06 +0300)
+  * Resync patches:
+    - 10_debian_channel.diff - adopt to upstream changes.
+    - 16_konversation_desktop.diff - fix offsets.
+    - 98_buildprep.diff - rebuild.
+  * konversation.install - do not install es doc and remove
+    usr/bin/konversationircprotocolhandler.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 11 May 2008 06:33:10 +0300
+
+konversation (1.0.1+svn794418-1) experimental; urgency=low
+
+  [ Modestas Vainius ]
+  * New upstream development snapshot for KDE 3 (1.0.1+ #3219)
+    - Revision: 794418; Date: Mon Apr 7 12:46:03 2008 UTC  by hein
+    - The latest translation and documentation are included (as of
+      Tue, 08 Apr 2008 00:49:32 +0300)
+    - One big change since the previous snapshot is new Queue Tuner. See
+      /queuetuner
+  * Resync patches:
+    - 10_debian_channel.diff - unfuzz.
+    - 11_dbug_autoreplace.diff - adjust offsets.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 04 Apr 2008 00:05:04 +0300
+
 konversation (1.0.1+svn780882-1) experimental; urgency=low
 
   [ Modestas Vainius ]

Modified: kde-extras/konversation/branches/experimental/debian/control
===================================================================
--- kde-extras/konversation/branches/experimental/debian/control	2008-06-28 09:42:33 UTC (rev 11151)
+++ kde-extras/konversation/branches/experimental/debian/control	2008-06-28 10:16:55 UTC (rev 11152)
@@ -3,10 +3,12 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modestas at vainius.eu>
-Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), kdelibs4-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), autotools-dev
-Standards-Version: 3.7.3.0
+Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), kdelibs4-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.46-4.1), autotools-dev
+Standards-Version: 3.8.0
 DM-Upload-Allowed: yes
 Homepage: http://konversation.kde.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/konversation/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/konversation/trunk
 
 Package: konversation
 Architecture: any

Modified: kde-extras/konversation/branches/experimental/debian/konversation.install
===================================================================
--- kde-extras/konversation/branches/experimental/debian/konversation.install	2008-06-28 09:42:33 UTC (rev 11151)
+++ kde-extras/konversation/branches/experimental/debian/konversation.install	2008-06-28 10:16:55 UTC (rev 11152)
@@ -1,5 +1,4 @@
 debian/tmp/usr/bin/konversation
-debian/tmp/usr/bin/konversationircprotocolhandler
 debian/tmp/usr/share/applications/kde/konversation.desktop
 debian/tmp/usr/share/apps/kconf_update/*
 debian/tmp/usr/share/apps/konversation/eventsrc
@@ -9,7 +8,7 @@
 debian/tmp/usr/share/config.kcfg/konversation.kcfg
 debian/tmp/usr/share/doc/kde/HTML/da/konversation/*
 debian/tmp/usr/share/doc/kde/HTML/en/konversation/*
-debian/tmp/usr/share/doc/kde/HTML/es/konversation/*
+#debian/tmp/usr/share/doc/kde/HTML/es/konversation/*
 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/nl/konversation/*

Modified: kde-extras/konversation/branches/experimental/debian/patches/10_debian_channel.diff
===================================================================
--- kde-extras/konversation/branches/experimental/debian/patches/10_debian_channel.diff	2008-06-28 09:42:33 UTC (rev 11151)
+++ kde-extras/konversation/branches/experimental/debian/patches/10_debian_channel.diff	2008-06-28 10:16:55 UTC (rev 11152)
@@ -1,16 +1,15 @@
-diff -uNr -x debian -x .pc konversation-1.0.1+svn688929/konversation/src/config/preferences.cpp konversation-1.0.1+svn688929.n/konversation/src/config/preferences.cpp
---- konversation-1.0.1+svn688929/konversation/src/config/preferences.cpp	2007-07-17 20:45:01.000000000 +0300
-+++ konversation-1.0.1+svn688929.n/konversation/src/config/preferences.cpp	2007-07-17 21:06:23.000000000 +0300
-@@ -74,14 +74,14 @@
-     setAwayMessage("/me is away: %s");
-     setUnAwayMessage("/me is back.");
+--- a/konversation/src/config/preferences.cpp	2007-07-17 20:45:01.000000000 +0300
++++ b/konversation/src/config/preferences.cpp	2007-07-17 21:06:23.000000000 +0300
+@@ -68,14 +68,14 @@
+     mIdentity->setNicknameList(nickList);
+ 
      Konversation::ServerGroupSettingsPtr serverGroup = new Konversation::ServerGroupSettings;
 -    serverGroup->setName("Freenode");
 +    serverGroup->setName("Debian IRC");
      Konversation::ServerSettings server;
--    server.setServer("irc.freenode.org");
+-    server.setHost("irc.freenode.org");
 -    server.setPort(8001);
-+    server.setServer("irc.debian.org");
++    server.setHost("irc.debian.org");
 +    server.setPort(7000);
      serverGroup->addServer(server);
      serverGroup->setIdentityId(mIdentity->id());
@@ -19,4 +18,4 @@
 +    channel.setName("#debian");
      serverGroup->addChannel(channel);
      serverGroup->setExpanded(false);
-     mServerGroupList.append(serverGroup);
+     addServerGroup(serverGroup);

Modified: kde-extras/konversation/branches/experimental/debian/patches/11_dbug_autoreplace.diff
===================================================================
--- kde-extras/konversation/branches/experimental/debian/patches/11_dbug_autoreplace.diff	2008-06-28 09:42:33 UTC (rev 11151)
+++ kde-extras/konversation/branches/experimental/debian/patches/11_dbug_autoreplace.diff	2008-06-28 10:16:55 UTC (rev 11152)
@@ -1,7 +1,7 @@
 diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/config/preferences.cpp konversation-1.0.1.n/konversation/src/config/preferences.cpp
 --- konversation-1.0.1/konversation/src/config/preferences.cpp	2007-07-16 23:18:38.000000000 +0300
 +++ konversation-1.0.1.n/konversation/src/config/preferences.cpp	2007-07-17 02:38:09.000000000 +0300
-@@ -133,6 +133,7 @@
+@@ -127,6 +127,7 @@
  const QStringList Preferences::defaultAutoreplaceList()
  {
      return QStringList() << "1,o,\\[\\[([^\\s]+)\\]\\],http://en.wikipedia.org/wiki/Special:Search?go=Go&search=%1"

Modified: kde-extras/konversation/branches/experimental/debian/patches/16_konversation_desktop.diff
===================================================================
--- kde-extras/konversation/branches/experimental/debian/patches/16_konversation_desktop.diff	2008-06-28 09:42:33 UTC (rev 11151)
+++ kde-extras/konversation/branches/experimental/debian/patches/16_konversation_desktop.diff	2008-06-28 10:16:55 UTC (rev 11152)
@@ -1,6 +1,6 @@
 --- konversation-1.0.1/konversation/src/konversation.desktop	2007-08-30 12:10:11.000000000 +0300
 +++ konversation-1.0.1/konversation/src/konversation.desktop	2008-03-04 18:38:21.000000000 +0200
-@@ -36,5 +36,4 @@
+@@ -44,5 +44,4 @@
 -Categories=Qt;KDE;Network;IRCClient;X-SuSE-IRCClient;
 +Categories=Qt;KDE;Network;IRCClient;
  ServiceTypes=DCOP/InstantMessenger;DCOP/Unique

Added: kde-extras/konversation/branches/experimental/debian/patches/17_add_extra_version_string.diff
===================================================================
--- kde-extras/konversation/branches/experimental/debian/patches/17_add_extra_version_string.diff	                        (rev 0)
+++ kde-extras/konversation/branches/experimental/debian/patches/17_add_extra_version_string.diff	2008-06-28 10:16:55 UTC (rev 11152)
@@ -0,0 +1,27 @@
+--- a/konversation/src/main.cpp
++++ b/konversation/src/main.cpp
+@@ -28,6 +28,15 @@
+ #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 @@
+ {
+     KAboutData aboutData("konversation",
+         I18N_NOOP("Konversation"),
+-        KONVI_VERSION " #" STRHACK(COMMIT),
++        KONVI_VERSION " #" STRHACK(COMMIT) _EXTRA_VERSION_STRING,
+         shortDescription,
+         KAboutData::License_GPL,
+         I18N_NOOP("(C) 2002-2008 by the Konversation team"),

Added: kde-extras/konversation/branches/experimental/debian/patches/18_debian_package_version_to_about.diff
===================================================================
--- kde-extras/konversation/branches/experimental/debian/patches/18_debian_package_version_to_about.diff	                        (rev 0)
+++ kde-extras/konversation/branches/experimental/debian/patches/18_debian_package_version_to_about.diff	2008-06-28 10:16:55 UTC (rev 11152)
@@ -0,0 +1,24 @@
+--- a/configure.in.in
++++ b/configure.in.in
+@@ -9,3 +9,11 @@
+ 
+ KDE_INIT_DOXYGEN([KEG Network API Reference], [Version $VERSION])
+ 
++# Debian version
++AC_CHECK_PROG(DPKG_PARSECHANGELOG, "dpkg-parsechangelog", "yes")
++AC_CHECK_FILE("${srcdir}/debian/changelog", [debian_changelog="yes"], [debian_changelog="no"])
++if test x"$DPKG_PARSECHANGELOG" = "xyes" && test x"$debian_changelog" = "xyes"; then
++    debian_version=`dpkg-parsechangelog -l"${srcdir}/debian/changelog" | grep '^Version: ' | sed 's/^Version: *//'`
++    AC_DEFINE_UNQUOTED(EXTRA_VERSION_STRING, [(Debian $debian_version)], [Debian package version in the About dialog])
++fi
++
+--- a/konversation/src/main.cpp
++++ b/konversation/src/main.cpp
+@@ -23,6 +23,7 @@
+ #include "konversationapplication.h"
+ #include "version.h"
+ #include "commit.h"
++#include "config.h"
+ 
+ #define HACKSTR(x) #x
+ #define STRHACK(x) HACKSTR(x)

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

Modified: kde-extras/konversation/branches/experimental/debian/patches/series
===================================================================
--- kde-extras/konversation/branches/experimental/debian/patches/series	2008-06-28 09:42:33 UTC (rev 11151)
+++ kde-extras/konversation/branches/experimental/debian/patches/series	2008-06-28 10:16:55 UTC (rev 11152)
@@ -6,4 +6,6 @@
 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

Modified: kde-extras/konversation/branches/experimental/debian/rules
===================================================================
--- kde-extras/konversation/branches/experimental/debian/rules	2008-06-28 09:42:33 UTC (rev 11151)
+++ kde-extras/konversation/branches/experimental/debian/rules	2008-06-28 10:16:55 UTC (rev 11152)
@@ -6,6 +6,7 @@
 
 DEB_DH_STRIP_ARGS := --dbg-package=konversation-dbg
 DEB_INSTALL_DOCS_ALL = 
+DEB_KDE_ENABLE_FINAL := yes
 
 ### Manpages
 XP = xsltproc --nonet --output debian/man/

More information about the pkg-kde-commits mailing list