rev 17513 - in kde-extras/kmess/trunk/debian: . patches source

Fathi Boudra fabo at alioth.debian.org
Wed Mar 24 13:07:18 UTC 2010 

Author: fabo
Date: 2010-03-24 13:07:17 +0000 (Wed, 24 Mar 2010)
New Revision: 17513

Added:
   kde-extras/kmess/trunk/debian/patches/01_no_debugfull_build.diff
   kde-extras/kmess/trunk/debian/patches/02_no_desktop_encoding_key.diff
   kde-extras/kmess/trunk/debian/patches/03_comments_cleanup.diff
   kde-extras/kmess/trunk/debian/patches/series
   kde-extras/kmess/trunk/debian/source/
   kde-extras/kmess/trunk/debian/source/format
Removed:
   kde-extras/kmess/trunk/debian/patches/01_dont-build-depend-on-libqca2-plugin-ossl.diff
Modified:
   kde-extras/kmess/trunk/debian/changelog
   kde-extras/kmess/trunk/debian/control
   kde-extras/kmess/trunk/debian/copyright
   kde-extras/kmess/trunk/debian/kmess.menu
   kde-extras/kmess/trunk/debian/rules
Log:
  * Switch to dpkg-source 3.0 (quilt) format.
  * Add patches:
    - 01_no_debugfull_build.diff
      default build should not bet set to debugfull
    - 02_no_desktop_encoding_key.diff
      remove deprecated encoding key from desktop file
    - 03_comments_cleanup.diff
      fix comments related to Debian package names
  * Drop 01_dont-build-depend-on-libqca2-plugin-ossl.diff - not needed anymore.
  * Cleanup build dependencies:
    - Remove libqca2-dev, libphonon-dev, libqt4-phonon-dev and patchutils.
    - Add libgcrypt11-dev.
  * Bump to Standars-Version 3.8.4 (no changes needed).


Modified: kde-extras/kmess/trunk/debian/changelog
===================================================================
--- kde-extras/kmess/trunk/debian/changelog	2010-03-24 11:57:49 UTC (rev 17512)
+++ kde-extras/kmess/trunk/debian/changelog	2010-03-24 13:07:17 UTC (rev 17513)
@@ -1,3 +1,24 @@
+kmess (2.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [ Fathi Boudra]
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Add patches:
+    - 01_no_debugfull_build.diff
+      default build should not bet set to debugfull
+    - 02_no_desktop_encoding_key.diff
+      remove deprecated encoding key from desktop file
+    - 03_comments_cleanup.diff
+      fix comments related to Debian package names
+  * Drop 01_dont-build-depend-on-libqca2-plugin-ossl.diff - not needed anymore.
+  * Cleanup build dependencies:
+    - Remove libqca2-dev, libphonon-dev, libqt4-phonon-dev and patchutils.
+    - Add libgcrypt11-dev.
+  * Bump to Standars-Version 3.8.4 (no changes needed).
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 24 Mar 2010 13:11:52 +0100
+
 kmess (2.0.2-1) unstable; urgency=low
 
   * New upstream release 

Modified: kde-extras/kmess/trunk/debian/control
===================================================================
--- kde-extras/kmess/trunk/debian/control	2010-03-24 11:57:49 UTC (rev 17512)
+++ kde-extras/kmess/trunk/debian/control	2010-03-24 13:07:17 UTC (rev 17513)
@@ -3,9 +3,10 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mario Iseli <admin at marioiseli.com>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, zlib1g-dev, patchutils, automoc, libxml2-dev, libxslt1-dev, libqca2-dev,
- pkg-kde-tools, kdelibs5-dev, libkonq5-dev, libphonon-dev | libqt4-phonon-dev, libxss-dev, libgif-dev
-Standards-Version: 3.8.3
+Build-Depends: cdbs, debhelper (>= 7), automoc, pkg-kde-tools (>= 0.6.4),
+ kdelibs5-dev, libgcrypt11-dev, libgif-dev, libkonq5-dev, libxml2-dev,
+ libxslt1-dev, libxss-dev, zlib1g-dev
+Standards-Version: 3.8.4
 Homepage: http://kmess.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kmess/?op=log
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kmess/trunk/

Modified: kde-extras/kmess/trunk/debian/copyright
===================================================================
--- kde-extras/kmess/trunk/debian/copyright	2010-03-24 11:57:49 UTC (rev 17512)
+++ kde-extras/kmess/trunk/debian/copyright	2010-03-24 13:07:17 UTC (rev 17513)
@@ -3,11 +3,11 @@
 
 It was downloaded from <http://kmess.sourceforge.net>.
 
-Copyright Holder(s): Mike K. Bennett <mkb137 at users.sourceforge.net>
-		     Michael Curtis <mdcurtis at users.sourceforge.net>
-		     Jan Toenjes <jan.toenjes at web.de>
-		     Lin Haoxiang <linhaoxiang at hotmail.com>
-		     Diederik van der Boor <vdboor at codingdomain.com>
+Copyright Holders: Mike K. Bennett <mkb137 at users.sourceforge.net>
+		   Michael Curtis <mdcurtis at users.sourceforge.net>
+		   Jan Toenjes <jan.toenjes at web.de>
+		   Lin Haoxiang <linhaoxiang at hotmail.com>
+		   Diederik van der Boor <vdboor at codingdomain.com>
 
 License (crypt/bithelp.h and crypt/sha1.cpp):
 

Modified: kde-extras/kmess/trunk/debian/kmess.menu
===================================================================
--- kde-extras/kmess/trunk/debian/kmess.menu	2010-03-24 11:57:49 UTC (rev 17512)
+++ kde-extras/kmess/trunk/debian/kmess.menu	2010-03-24 13:07:17 UTC (rev 17513)
@@ -1,2 +1,5 @@
-?package(kmess):needs="X11" section="Applications/Network/Communication"\
-  title="kmess" command="/usr/bin/kmess"
+?package(kmess): \
+    needs="X11" \
+    section="Applications/Network/Communication" \
+    title="kmess" \
+    command="/usr/bin/kmess"

Added: kde-extras/kmess/trunk/debian/patches/01_no_debugfull_build.diff
===================================================================
--- kde-extras/kmess/trunk/debian/patches/01_no_debugfull_build.diff	                        (rev 0)
+++ kde-extras/kmess/trunk/debian/patches/01_no_debugfull_build.diff	2010-03-24 13:07:17 UTC (rev 17513)
@@ -0,0 +1,14 @@
+Description: default build should not bet set to debugfull
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -167,7 +167,7 @@ ENDIF( CMAKE_COMPILER_IS_GNUCXX )
+ # - relwithdebinfo  (release with debug info)
+ # - minsizerel      (minsize release)
+ # Uncomment the next line to always force building in full debug mode
+-SET( CMAKE_BUILD_TYPE debugfull )
++#SET( CMAKE_BUILD_TYPE debugfull )
+ 
+ # Enable the KMess debug output when compiling a debug build
+ IF( CMAKE_BUILD_TYPE STREQUAL debugfull OR KMESS_DEBUG_OUTPUT EQUAL 1 )

Added: kde-extras/kmess/trunk/debian/patches/02_no_desktop_encoding_key.diff
===================================================================
--- kde-extras/kmess/trunk/debian/patches/02_no_desktop_encoding_key.diff	                        (rev 0)
+++ kde-extras/kmess/trunk/debian/patches/02_no_desktop_encoding_key.diff	2010-03-24 13:07:17 UTC (rev 17513)
@@ -0,0 +1,11 @@
+Description: remove deprecated encoding key from desktop file
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/data/kmess.desktop
++++ b/data/kmess.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KMess
+ Exec=kmess -caption "%c" %i
+ Icon=kmess

Added: kde-extras/kmess/trunk/debian/patches/03_comments_cleanup.diff
===================================================================
--- kde-extras/kmess/trunk/debian/patches/03_comments_cleanup.diff	                        (rev 0)
+++ kde-extras/kmess/trunk/debian/patches/03_comments_cleanup.diff	2010-03-24 13:07:17 UTC (rev 17513)
@@ -0,0 +1,33 @@
+Description: fix comments related to Debian package names
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,8 +25,7 @@ IF( NOT KDE4_FOUND )
+   "  \n"
+   "  You will need this package and the matching development package.\n"
+   "  Usually the package names for this library are:\n"
+-  "    on Debian:   'kdebase-runtime' and 'kdelibs4-dev'\n"
+-  "    on Ubuntu:   'kdebase-runtime' and 'kdelibs5-dev'\n"
++  "    on Debian and Ubuntu:   'kdebase-runtime' and 'kdelibs5-dev'\n"
+   "    on openSUSE: 'kdebase4-runtime' and 'libkde4-devel'\n"
+   "  \n"
+   "  Please refer to the KMess board for more info,\n"
+@@ -49,7 +48,7 @@ FIND_PACKAGE( LibXslt )
+ MACRO_LOG_FEATURE( LIBXSLT_FOUND "LibXSLT" "A library to transform XML into other formats" "http://www.xmlsoft.org/XSLT" TRUE ""
+     "Required for the chat styles system.
+       * Usually the package names for this library are:
+-        on Debian and Ubuntu: 'libxslt' and 'libxslt-dev'
++        on Debian and Ubuntu: 'libxslt' and 'libxslt1-dev'
+         on openSUSE:         'libxslt' and 'libxslt-devel'
+       * Please refer to the KMess board for more info,
+         and specially to this guide: http://trac.kmess.org/wiki/Compiling%20KMess" )
+@@ -63,7 +62,7 @@ IF( NOT GCRYPT_FOUND )
+   MACRO_LOG_FEATURE( GCRYPT_FOUND "GCrypt" "A library to encrypt messages with various cyphers" "http://www.gnupg.org/" TRUE ""
+     "It is required for the Live Messenger login process.
+       * Usually the package names for this library are:
+-        on Debian and Ubuntu: 'libgcrypt' and 'libgcrypt-dev'
++        on Debian and Ubuntu: 'libgcrypt' and 'libgcrypt11-dev'
+         on openSUSE:          'libgcrypt' and 'libgcrypt-devel'
+         on Fedora:            'gcrypt' and 'gcrypt-devel'
+       * Please refer to the KMess board for more info,

Added: kde-extras/kmess/trunk/debian/patches/series
===================================================================
--- kde-extras/kmess/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kmess/trunk/debian/patches/series	2010-03-24 13:07:17 UTC (rev 17513)
@@ -0,0 +1,3 @@
+01_no_debugfull_build.diff
+02_no_desktop_encoding_key.diff
+03_comments_cleanup.diff

Modified: kde-extras/kmess/trunk/debian/rules
===================================================================
--- kde-extras/kmess/trunk/debian/rules	2010-03-24 11:57:49 UTC (rev 17512)
+++ kde-extras/kmess/trunk/debian/rules	2010-03-24 13:07:17 UTC (rev 17513)
@@ -4,9 +4,8 @@
 UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~//').tar.gz
 URL = http://heanet.dl.sourceforge.net/$(DEB_SOURCE_PACKAGE)/$(UPFILENAME)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_INSTALL_MANPAGES_kmess := debian/kmess.1
 DEB_INSTALL_MENU_ARGS := debian/kmess.menu

Added: kde-extras/kmess/trunk/debian/source/format
===================================================================
--- kde-extras/kmess/trunk/debian/source/format	                        (rev 0)
+++ kde-extras/kmess/trunk/debian/source/format	2010-03-24 13:07:17 UTC (rev 17513)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-kde-commits mailing list