rev 3052 - in kde-extras/kvpnc: tags/0.8.2.1-1/debian trunk/debian

Fathi Boudra fboudra-guest at costa.debian.org
Tue Jan 31 08:39:31 UTC 2006


Author: fboudra-guest
Date: 2006-01-31 08:39:28 +0000 (Tue, 31 Jan 2006)
New Revision: 3052

Added:
   kde-extras/kvpnc/tags/0.8.2.1-1/debian/dirs
   kde-extras/kvpnc/tags/0.8.2.1-1/debian/kvpnc.links
   kde-extras/kvpnc/trunk/debian/dirs
   kde-extras/kvpnc/trunk/debian/kvpnc.links
Modified:
   kde-extras/kvpnc/tags/0.8.2.1-1/debian/control
   kde-extras/kvpnc/tags/0.8.2.1-1/debian/copyright
   kde-extras/kvpnc/tags/0.8.2.1-1/debian/rules
   kde-extras/kvpnc/tags/0.8.2.1-1/debian/source.lintian-overrides
   kde-extras/kvpnc/trunk/debian/control
   kde-extras/kvpnc/trunk/debian/copyright
   kde-extras/kvpnc/trunk/debian/rules
   kde-extras/kvpnc/trunk/debian/source.lintian-overrides
Log:
fix copyright and some cleanup

Modified: kde-extras/kvpnc/tags/0.8.2.1-1/debian/control
===================================================================
--- kde-extras/kvpnc/tags/0.8.2.1-1/debian/control	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/tags/0.8.2.1-1/debian/control	2006-01-31 08:39:28 UTC (rev 3052)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 5.0.20), autoconf, autotools-dev, kdelibs4-dev, libcrypto++-dev
+Build-Depends: debhelper (>= 5.0.22), autoconf, autotools-dev, kdelibs4-dev, libcrypto++-dev
 Standards-Version: 3.6.2
 
 Package: kvpnc

Modified: kde-extras/kvpnc/tags/0.8.2.1-1/debian/copyright
===================================================================
--- kde-extras/kvpnc/tags/0.8.2.1-1/debian/copyright	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/tags/0.8.2.1-1/debian/copyright	2006-01-31 08:39:28 UTC (rev 3052)
@@ -5,6 +5,11 @@
 
 Copyright Holder: Christoph Thielecke <crissi99 at gmx.de>
 
+Copyright for ciscopasswddecoder :
+	Copyright (C) 2005 by hal9000 <hal9000 at evilscientists.de>
+        Copyright (C) 2005 by Maurice Massar <vpnc at unix-ag.uni-kl.de>
+        Copyright (C) 2005 by Christoph Thielecke <crissi99 at gmx.de>
+
 License:
 
    This package is free software; you can redistribute it and/or modify
@@ -22,5 +27,5 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 

Added: kde-extras/kvpnc/tags/0.8.2.1-1/debian/dirs
===================================================================
--- kde-extras/kvpnc/tags/0.8.2.1-1/debian/dirs	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/tags/0.8.2.1-1/debian/dirs	2006-01-31 08:39:28 UTC (rev 3052)
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/lintian/overrides

Added: kde-extras/kvpnc/tags/0.8.2.1-1/debian/kvpnc.links
===================================================================
--- kde-extras/kvpnc/tags/0.8.2.1-1/debian/kvpnc.links	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/tags/0.8.2.1-1/debian/kvpnc.links	2006-01-31 08:39:28 UTC (rev 3052)
@@ -0,0 +1,3 @@
+usr/share/doc/kde/HTML/en/common usr/share/doc/kde/HTML/en/kvpnc/common
+usr/share/doc/kde/HTML/de/common usr/share/doc/kde/HTML/de/kvpnc/common
+usr/share/doc/kde/HTML/fr/common usr/share/doc/kde/HTML/de/kvpnc/common

Modified: kde-extras/kvpnc/tags/0.8.2.1-1/debian/rules
===================================================================
--- kde-extras/kvpnc/tags/0.8.2.1-1/debian/rules	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/tags/0.8.2.1-1/debian/rules	2006-01-31 08:39:28 UTC (rev 3052)
@@ -49,6 +49,8 @@
 	-$(MAKE) distclean
 
 	# fix configure-generated-file-in-source
+	# added source override for doc/fr/config.log
+	# fixed in next upstream release
 	rm -f config.sub* config.guess*
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -58,12 +60,12 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
-	dh_clean --exclude ./src/utils.cpp.orig --exclude ./src/utils.cpp~.orig --exclude ./src/utils.h.orig --exclude ./src/utils.h~.orig --exclude ./src/utils.o.orig 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k --exclude ./src/utils.cpp.orig --exclude ./src/utils.cpp~.orig --exclude ./src/utils.h.orig --exclude ./src/utils.h~.orig --exclude ./src/utils.o.orig
+	dh_clean -k
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kvpnc
@@ -72,7 +74,6 @@
 	chmod 0755 debian/kvpnc/usr/share/apps/kvpnc/ping_check.sh
 
 	# fix menu-command-not-in-package
-	mkdir -p debian/kvpnc/usr/share/lintian/overrides/kvpnc
 	install -p -m644 debian/kvpnc.lintian-overrides debian/kvpnc/usr/share/lintian/overrides/kvpnc
 
 # Build architecture-independent files here.
@@ -85,7 +86,6 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installexamples
 	dh_installmenu
 	dh_installman
 	dh_link

Modified: kde-extras/kvpnc/tags/0.8.2.1-1/debian/source.lintian-overrides
===================================================================
--- kde-extras/kvpnc/tags/0.8.2.1-1/debian/source.lintian-overrides	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/tags/0.8.2.1-1/debian/source.lintian-overrides	2006-01-31 08:39:28 UTC (rev 3052)
@@ -1,2 +1,2 @@
-# Upstream distributes it like this
+# Upstream distributes it like this ATM but removes it in next release
 kvpnc source: configure-generated-file-in-source doc/fr/config.log

Modified: kde-extras/kvpnc/trunk/debian/control
===================================================================
--- kde-extras/kvpnc/trunk/debian/control	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/trunk/debian/control	2006-01-31 08:39:28 UTC (rev 3052)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 5.0.20), autoconf, autotools-dev, kdelibs4-dev, libcrypto++-dev
+Build-Depends: debhelper (>= 5.0.22), autoconf, autotools-dev, kdelibs4-dev, libcrypto++-dev
 Standards-Version: 3.6.2
 
 Package: kvpnc

Modified: kde-extras/kvpnc/trunk/debian/copyright
===================================================================
--- kde-extras/kvpnc/trunk/debian/copyright	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/trunk/debian/copyright	2006-01-31 08:39:28 UTC (rev 3052)
@@ -5,6 +5,11 @@
 
 Copyright Holder: Christoph Thielecke <crissi99 at gmx.de>
 
+Copyright for ciscopasswddecoder :
+	Copyright (C) 2005 by hal9000 <hal9000 at evilscientists.de>
+        Copyright (C) 2005 by Maurice Massar <vpnc at unix-ag.uni-kl.de>
+        Copyright (C) 2005 by Christoph Thielecke <crissi99 at gmx.de>
+
 License:
 
    This package is free software; you can redistribute it and/or modify
@@ -22,5 +27,5 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 

Added: kde-extras/kvpnc/trunk/debian/dirs
===================================================================
--- kde-extras/kvpnc/trunk/debian/dirs	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/trunk/debian/dirs	2006-01-31 08:39:28 UTC (rev 3052)
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/lintian/overrides

Added: kde-extras/kvpnc/trunk/debian/kvpnc.links
===================================================================
--- kde-extras/kvpnc/trunk/debian/kvpnc.links	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/trunk/debian/kvpnc.links	2006-01-31 08:39:28 UTC (rev 3052)
@@ -0,0 +1,3 @@
+usr/share/doc/kde/HTML/en/common usr/share/doc/kde/HTML/en/kvpnc/common
+usr/share/doc/kde/HTML/de/common usr/share/doc/kde/HTML/de/kvpnc/common
+usr/share/doc/kde/HTML/fr/common usr/share/doc/kde/HTML/de/kvpnc/common

Modified: kde-extras/kvpnc/trunk/debian/rules
===================================================================
--- kde-extras/kvpnc/trunk/debian/rules	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/trunk/debian/rules	2006-01-31 08:39:28 UTC (rev 3052)
@@ -49,6 +49,8 @@
 	-$(MAKE) distclean
 
 	# fix configure-generated-file-in-source
+	# added source override for doc/fr/config.log
+	# fixed in next upstream release
 	rm -f config.sub* config.guess*
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -58,12 +60,12 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
-	dh_clean --exclude ./src/utils.cpp.orig --exclude ./src/utils.cpp~.orig --exclude ./src/utils.h.orig --exclude ./src/utils.h~.orig --exclude ./src/utils.o.orig 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k --exclude ./src/utils.cpp.orig --exclude ./src/utils.cpp~.orig --exclude ./src/utils.h.orig --exclude ./src/utils.h~.orig --exclude ./src/utils.o.orig
+	dh_clean -k
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kvpnc
@@ -72,7 +74,6 @@
 	chmod 0755 debian/kvpnc/usr/share/apps/kvpnc/ping_check.sh
 
 	# fix menu-command-not-in-package
-	mkdir -p debian/kvpnc/usr/share/lintian/overrides/kvpnc
 	install -p -m644 debian/kvpnc.lintian-overrides debian/kvpnc/usr/share/lintian/overrides/kvpnc
 
 # Build architecture-independent files here.
@@ -85,7 +86,6 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installexamples
 	dh_installmenu
 	dh_installman
 	dh_link

Modified: kde-extras/kvpnc/trunk/debian/source.lintian-overrides
===================================================================
--- kde-extras/kvpnc/trunk/debian/source.lintian-overrides	2006-01-31 07:26:45 UTC (rev 3051)
+++ kde-extras/kvpnc/trunk/debian/source.lintian-overrides	2006-01-31 08:39:28 UTC (rev 3052)
@@ -1,2 +1,2 @@
-# Upstream distributes it like this
+# Upstream distributes it like this ATM but removes it in next release
 kvpnc source: configure-generated-file-in-source doc/fr/config.log




More information about the pkg-kde-commits mailing list