rev 17257 - in kde-extras/kvpnc/trunk/debian: . patches source

[Fathi Boudra]

Author: fabo
Date: 2010-03-01 12:59:56 +0000 (Mon, 01 Mar 2010)
New Revision: 17257

Added:
   kde-extras/kvpnc/trunk/debian/source/
   kde-extras/kvpnc/trunk/debian/source/format
Removed:
   kde-extras/kvpnc/trunk/debian/README.source
Modified:
   kde-extras/kvpnc/trunk/debian/changelog
   kde-extras/kvpnc/trunk/debian/control
   kde-extras/kvpnc/trunk/debian/copyright
   kde-extras/kvpnc/trunk/debian/patches/10_su-to-root_usage.diff
   kde-extras/kvpnc/trunk/debian/patches/series
   kde-extras/kvpnc/trunk/debian/rules
Log:
* Switch to dpkg-source 3.0 (quilt) format.
* Update debian/control:
  - Bump build dependencies (debhelper, pkg-kde-tools and kdelibs5-dev).
    (Closes: #550279)
  - Bump Standards-Version to 3.8.4 (no changes needed).
* Update debian/rules:
  - Enable parallel build (add --parallel option to dh).
  - Remove quilt sequence addon, not needed anymore.


Modified: kde-extras/kvpnc/trunk/debian/changelog
===================================================================
--- kde-extras/kvpnc/trunk/debian/changelog	2010-03-01 12:55:27 UTC (rev 17256)
+++ kde-extras/kvpnc/trunk/debian/changelog	2010-03-01 12:59:56 UTC (rev 17257)
@@ -1,14 +1,24 @@
-kvpnc (0.9.4-1) UNRELEASED; urgency=low
+kvpnc (0.9.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    - fix ftbfs with binutils-gold. (Closes: #555071)
+    - fix ftbfs with gcc-4.5. (Closes: #565022)
 
   [ José Manuel Santamaría Lema ]
-  * Add 11_link_against_kpty.diff, it makes the package able to build with
-    binutils-gold (Closes: #555071).
   * Update debian/copyright:
     - Add license and copyright holder for cmake/modules/libgcryptConfig.cmake
       file.
 
+  [ Fathi Boudra ]
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Update debian/control:
+    - Bump build dependencies (debhelper, pkg-kde-tools and kdelibs5-dev).
+      (Closes: #550279)
+    - Bump Standards-Version to 3.8.4 (no changes needed).
+  * Update debian/rules:
+    - Enable parallel build (add --parallel option to dh).
+    - Remove quilt sequence addon, not needed anymore.
+
  -- Fathi Boudra <fabo at debian.org>  Mon, 01 Mar 2010 11:45:17 +0100
 
 kvpnc (0.9.3-1) unstable; urgency=low

Modified: kde-extras/kvpnc/trunk/debian/control
===================================================================
--- kde-extras/kvpnc/trunk/debian/control	2010-03-01 12:55:27 UTC (rev 17256)
+++ kde-extras/kvpnc/trunk/debian/control	2010-03-01 12:59:56 UTC (rev 17257)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7.3), quilt (>= 0.46-7), cmake, pkg-kde-tools (>= 0.4.11),
- kdelibs5-dev (>= 4:4.3.0), libgcrypt11-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.6.5),
+ kdelibs5-dev (>= 4:4.3.4), libgcrypt11-dev
+Standards-Version: 3.8.4
 Homepage: http://home.gna.org/kvpnc
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kvpnc/?op=log
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kvpnc/trunk/

Modified: kde-extras/kvpnc/trunk/debian/copyright
===================================================================
--- kde-extras/kvpnc/trunk/debian/copyright	2010-03-01 12:55:27 UTC (rev 17256)
+++ kde-extras/kvpnc/trunk/debian/copyright	2010-03-01 12:59:56 UTC (rev 17257)
@@ -12,7 +12,7 @@
 
 Copyright:
 
-    © 2004-2009 Christoph Thielecke <crissi99 at gmx.de>
+    © 2004-2010 Christoph Thielecke <crissi99 at gmx.de>
 
 Copyright for ciscopasswddecoder :
 
@@ -92,7 +92,7 @@
 
 The Debian packaging is:
 
-    Copyright (C) 2006-2009 Fathi Boudra <fabo at debian.org>
+    Copyright (C) 2006-2010 Fathi Boudra <fabo at debian.org>
 
-and is licensed under the GPL version 2, 
+and is licensed under the GPL version 2,
 see `/usr/share/common-licenses/GPL-2'.

Modified: kde-extras/kvpnc/trunk/debian/patches/10_su-to-root_usage.diff
===================================================================
--- kde-extras/kvpnc/trunk/debian/patches/10_su-to-root_usage.diff	2010-03-01 12:55:27 UTC (rev 17256)
+++ kde-extras/kvpnc/trunk/debian/patches/10_su-to-root_usage.diff	2010-03-01 12:59:56 UTC (rev 17257)
@@ -1,6 +1,10 @@
+Description: kvpnc for Debian uses su-to-root from menu package to wrap around kdesu.
+Forwarded: not-needed
+Author: Fathi Boudra <fabo at debian.org>
+
 --- a/src/kvpnc.desktop
 +++ b/src/kvpnc.desktop
-@@ -51,7 +51,7 @@ GenericName[uk]=Інтерфейс длÑ
+@@ -76,7 +76,7 @@ GenericName[uk]=Інтерфейс длÑ
  GenericName[x-test]=xxVPN Client GUIxx
  
  Categories=Network;RemoteAccess;KDE;Qt;

Modified: kde-extras/kvpnc/trunk/debian/patches/series
===================================================================
--- kde-extras/kvpnc/trunk/debian/patches/series	2010-03-01 12:55:27 UTC (rev 17256)
+++ kde-extras/kvpnc/trunk/debian/patches/series	2010-03-01 12:59:56 UTC (rev 17257)
@@ -1,2 +1 @@
 10_su-to-root_usage.diff
-11_link_against_kpty.diff

Modified: kde-extras/kvpnc/trunk/debian/rules
===================================================================
--- kde-extras/kvpnc/trunk/debian/rules	2010-03-01 12:55:27 UTC (rev 17256)
+++ kde-extras/kvpnc/trunk/debian/rules	2010-03-01 12:59:56 UTC (rev 17257)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt,kde $@
+	dh --parallel --with kde $@
 
 .PHONY: override_dh_auto_test

Added: kde-extras/kvpnc/trunk/debian/source/format
===================================================================
--- kde-extras/kvpnc/trunk/debian/source/format	                        (rev 0)
+++ kde-extras/kvpnc/trunk/debian/source/format	2010-03-01 12:59:56 UTC (rev 17257)
@@ -0,0 +1 @@
+3.0 (quilt)