rev 6769 - in kde-extras/konversation/branches/experimental/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Tue Jul 17 22:06:44 UTC 2007 

Author: modax-guest
Date: 2007-07-17 22:06:38 +0000 (Tue, 17 Jul 2007)
New Revision: 6769

Modified:
   kde-extras/konversation/branches/experimental/debian/changelog
   kde-extras/konversation/branches/experimental/debian/control
   kde-extras/konversation/branches/experimental/debian/copyright
   kde-extras/konversation/branches/experimental/debian/konversation.install
   kde-extras/konversation/branches/experimental/debian/patches/01_libtool_update.diff
   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/98_buildprep.diff
Log:
Prepared svn snapshot for experimental. Now lets see if it's stable enough.

Modified: kde-extras/konversation/branches/experimental/debian/changelog
===================================================================
--- kde-extras/konversation/branches/experimental/debian/changelog	2007-07-17 21:54:14 UTC (rev 6768)
+++ kde-extras/konversation/branches/experimental/debian/changelog	2007-07-17 22:06:38 UTC (rev 6769)
@@ -1,3 +1,36 @@
+konversation (1.0.1+svn688929-1~pre2) UNRELEASED; urgency=low
+
+  [Modestas Vainius]
+  * New upstream development snapshot:
+    - Revision: 688929. Date: Tue, 17 Jul 2007 08:51:13 +0000
+    - The latest translations and documentation are included.
+    - Changes since 1.0.1 are listed in
+      /usr/share/doc/konversation/changelog.gz file.
+  * Patches:
+    - 01_libtool_update.diff - update;
+    - 10_debian_channel.diff - adopt to upstream changes;
+    - 11_dbug_autoreplace.diff - fix offset;
+    - 98_buildprep.diff - relibtoolize again.
+  * Add konversation-dbg to konversation Recommends. This snapshot
+    is untested and possibly crash-prone.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 18 Jul 2007 00:48:07 +0300
+
+konversation (1.0.1-3) unstable; urgency=low
+
+  [Modestas Vainius]
+  * Documentation is provided under the terms of GNU GFDL with no Invariant
+    Sections, no Front-Cover Texts, and no Back-Cover Texts. Mention this
+    in debian/copyright.
+  * Update standards version to 3.7.2.2: point to
+    /usr/share/common-licenses/GFDL in debian/copyright.
+  * Use more strict wildcards in konversation.install mostly to track
+    upstream changes and to eliminate empty apidox directory.
+  * Update patch 10_debian_channel.diff to use port 7000 for irc.debian.org
+    by default to prevent possible DCC exploit.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 17 Jul 2007 23:34:06 +0300
+
 konversation (1.0.1-2) unstable; urgency=low
 
   * Konversation is now maintained by Debian KDE Extras Team.

Modified: kde-extras/konversation/branches/experimental/debian/control
===================================================================
--- kde-extras/konversation/branches/experimental/debian/control	2007-07-17 21:54:14 UTC (rev 6768)
+++ kde-extras/konversation/branches/experimental/debian/control	2007-07-17 22:06:38 UTC (rev 6769)
@@ -4,12 +4,12 @@
 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.2
+Standards-Version: 3.7.2.2
 
 Package: konversation
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: python, ruby
+Recommends: python, ruby, konversation-dbg (= ${binary:Version})
 Suggests: libsoap-lite-perl
 Description: user friendly Internet Relay Chat (IRC) client for KDE
  Konversation is a client for the Internet Relay Chat (IRC) protocol.

Modified: kde-extras/konversation/branches/experimental/debian/copyright
===================================================================
--- kde-extras/konversation/branches/experimental/debian/copyright	2007-07-17 21:54:14 UTC (rev 6768)
+++ kde-extras/konversation/branches/experimental/debian/copyright	2007-07-17 22:06:38 UTC (rev 6769)
@@ -69,6 +69,14 @@
 On Debian systems, the complete text of the GNU General Public License can
 be found in /usr/share/common-licenses/GPL file.
 
+Permission to copy, distribute and/or modify documentation is granted
+under the terms of the GNU Free Documentation License, Version 1.2
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+
+On Debian systems, the complete text of the GNU Free Documentation License
+can be found in /usr/share/common-licenses/GFDL file.
+
 Upstream Source:
 
 * Stable Releases

Modified: kde-extras/konversation/branches/experimental/debian/konversation.install
===================================================================
--- kde-extras/konversation/branches/experimental/debian/konversation.install	2007-07-17 21:54:14 UTC (rev 6768)
+++ kde-extras/konversation/branches/experimental/debian/konversation.install	2007-07-17 22:06:38 UTC (rev 6769)
@@ -1,2 +1,26 @@
+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
+debian/tmp/usr/share/apps/konversation/konversationui.rc
+debian/tmp/usr/share/apps/konversation/scripts/*
+debian/tmp/usr/share/apps/konversation/themes/*
+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/et/konversation/*
+debian/tmp/usr/share/doc/kde/HTML/it/konversation/*
+debian/tmp/usr/share/doc/kde/HTML/nl/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/*
+debian/tmp/usr/share/services/konvirc.protocol
+debian/tmp/usr/share/services/konvirc6.protocol
+
+# Debian menu XPM icons
 debian/*.xpm usr/share/pixmaps
-debian/tmp/*
+

Modified: kde-extras/konversation/branches/experimental/debian/patches/01_libtool_update.diff
===================================================================
--- kde-extras/konversation/branches/experimental/debian/patches/01_libtool_update.diff	2007-07-17 21:54:14 UTC (rev 6768)
+++ kde-extras/konversation/branches/experimental/debian/patches/01_libtool_update.diff	2007-07-17 22:06:38 UTC (rev 6769)
@@ -1,6 +1,6 @@
-diff -uNr -x debian -x .pc konversation-1.0.1/admin/libtool.m4.in konversation-1.0.1.n/admin/libtool.m4.in
---- konversation-1.0.1/admin/libtool.m4.in	2006-10-06 19:43:29.000000000 +0300
-+++ konversation-1.0.1.n/admin/libtool.m4.in	2007-07-11 22:52:34.000000000 +0300
+diff -uNr -x debian -x .pc konversation-1.0.1+svn688929/admin/libtool.m4.in konversation-1.0.1+svn688929.n/admin/libtool.m4.in
+--- konversation-1.0.1+svn688929/admin/libtool.m4.in	2007-07-17 20:44:43.000000000 +0300
++++ konversation-1.0.1+svn688929.n/admin/libtool.m4.in	2007-07-17 21:01:23.000000000 +0300
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -844,7 +844,7 @@
 -  libsuff=
 -  if test "x$LINUX_64_MODE" = x64; then
 -    # Some platforms are per default 64-bit, so there's no /lib64
--    if test -d /lib64; then
+-    if test -d /lib64 -a ! -h /lib64; then
 -      libsuff=64
 -    fi
 -  fi
@@ -4345,9 +4345,9 @@
 +AC_SUBST([SED])
  AC_MSG_RESULT([$SED])
  ])
-diff -uNr -x debian -x .pc konversation-1.0.1/admin/ltmain.sh konversation-1.0.1.n/admin/ltmain.sh
---- konversation-1.0.1/admin/ltmain.sh	2006-10-06 19:43:29.000000000 +0300
-+++ konversation-1.0.1.n/admin/ltmain.sh	2007-07-11 22:52:34.000000000 +0300
+diff -uNr -x debian -x .pc konversation-1.0.1+svn688929/admin/ltmain.sh konversation-1.0.1+svn688929.n/admin/ltmain.sh
+--- konversation-1.0.1+svn688929/admin/ltmain.sh	2007-07-17 20:44:43.000000000 +0300
++++ konversation-1.0.1+svn688929.n/admin/ltmain.sh	2007-07-11 22:52:34.000000000 +0300
 @@ -1,8 +1,8 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.

Modified: kde-extras/konversation/branches/experimental/debian/patches/10_debian_channel.diff
===================================================================
--- kde-extras/konversation/branches/experimental/debian/patches/10_debian_channel.diff	2007-07-17 21:54:14 UTC (rev 6768)
+++ kde-extras/konversation/branches/experimental/debian/patches/10_debian_channel.diff	2007-07-17 22:06:38 UTC (rev 6769)
@@ -1,7 +1,7 @@
-diff -Nur konversation-1.0/konversation/src/config/preferences.cpp konversation-1.0.new/konversation/src/config/preferences.cpp
---- konversation-1.0/konversation/src/config/preferences.cpp	2006-09-09 10:48:46.000000000 +0200
-+++ konversation-1.0.new/konversation/src/config/preferences.cpp	2006-09-09 10:49:56.000000000 +0200
-@@ -73,13 +73,13 @@
+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.");
      Konversation::ServerGroupSettingsPtr serverGroup = new Konversation::ServerGroupSettings;
@@ -9,7 +9,9 @@
 +    serverGroup->setName("Debian IRC");
      Konversation::ServerSettings server;
 -    server.setServer("irc.freenode.org");
+-    server.setPort(8001);
 +    server.setServer("irc.debian.org");
++    server.setPort(7000);
      serverGroup->addServer(server);
      serverGroup->setIdentityId(mIdentity->id());
      Konversation::ChannelSettings channel;

Modified: kde-extras/konversation/branches/experimental/debian/patches/11_dbug_autoreplace.diff
===================================================================
--- kde-extras/konversation/branches/experimental/debian/patches/11_dbug_autoreplace.diff	2007-07-17 21:54:14 UTC (rev 6768)
+++ kde-extras/konversation/branches/experimental/debian/patches/11_dbug_autoreplace.diff	2007-07-17 22:06:38 UTC (rev 6769)
@@ -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
-@@ -131,6 +131,7 @@
+@@ -133,6 +133,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/98_buildprep.diff
===================================================================

More information about the pkg-kde-commits mailing list