rev 3248 - kde-extras/kvpnc/trunk/debian

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-03-05 17:27:03 +0000 (Sun, 05 Mar 2006)
New Revision: 3248

Removed:
   kde-extras/kvpnc/trunk/debian/source.lintian-overrides
Modified:
   kde-extras/kvpnc/trunk/debian/changelog
   kde-extras/kvpnc/trunk/debian/control
   kde-extras/kvpnc/trunk/debian/dirs
   kde-extras/kvpnc/trunk/debian/docs
   kde-extras/kvpnc/trunk/debian/kvpnc.links
   kde-extras/kvpnc/trunk/debian/rules
Log:
new upstream release, converted to CDBS

Modified: kde-extras/kvpnc/trunk/debian/changelog
===================================================================
--- kde-extras/kvpnc/trunk/debian/changelog	2006-03-05 14:40:27 UTC (rev 3247)
+++ kde-extras/kvpnc/trunk/debian/changelog	2006-03-05 17:27:03 UTC (rev 3248)
@@ -1,3 +1,16 @@
+kvpnc (0.8.3-1) unstable; urgency=low
+
+  * New upstream release
+  * pptp connection fails with "unrecognized option 'mppe'"
+    fixed by upstream release (Closes: #354857)
+  * kvpnc writes new entries in chap-secrets rather than overwiting
+    fixed by upstream release (Closes: #354860)
+  * Removed README.NONROOT from docs
+  * Added swedish (sv) language to links
+  * Convert package to CDBS
+
+ -- Fathi Boudra <fboudra at free.fr>  Wed,  1 Mar 2006 20:02:15 +0100
+
 kvpnc (0.8.2.1-1) unstable; urgency=low
 
   * Initial release Closes: #316558

Modified: kde-extras/kvpnc/trunk/debian/control
===================================================================
--- kde-extras/kvpnc/trunk/debian/control	2006-03-05 14:40:27 UTC (rev 3247)
+++ kde-extras/kvpnc/trunk/debian/control	2006-03-05 17:27:03 UTC (rev 3248)
@@ -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.22), autoconf, autotools-dev, kdelibs4-dev, libcrypto++-dev
+Build-Depends: cdbs, debhelper (>= 5.0.24), autoconf, autotools-dev, kdelibs4-dev, libcrypto++-dev
 Standards-Version: 3.6.2
 
 Package: kvpnc

Modified: kde-extras/kvpnc/trunk/debian/dirs
===================================================================
--- kde-extras/kvpnc/trunk/debian/dirs	2006-03-05 14:40:27 UTC (rev 3247)
+++ kde-extras/kvpnc/trunk/debian/dirs	2006-03-05 17:27:03 UTC (rev 3248)
@@ -1,2 +1,3 @@
 usr/bin
+usr/share/applications/kde
 usr/share/lintian/overrides

Modified: kde-extras/kvpnc/trunk/debian/docs
===================================================================
--- kde-extras/kvpnc/trunk/debian/docs	2006-03-05 14:40:27 UTC (rev 3247)
+++ kde-extras/kvpnc/trunk/debian/docs	2006-03-05 17:27:03 UTC (rev 3248)
@@ -1,4 +1,3 @@
 NEWS
 README
-README.NONROOT
 TODO

Modified: kde-extras/kvpnc/trunk/debian/kvpnc.links
===================================================================
--- kde-extras/kvpnc/trunk/debian/kvpnc.links	2006-03-05 14:40:27 UTC (rev 3247)
+++ kde-extras/kvpnc/trunk/debian/kvpnc.links	2006-03-05 17:27:03 UTC (rev 3248)
@@ -1,3 +1,4 @@
+usr/share/doc/kde/HTML/de/common usr/share/doc/kde/HTML/de/kvpnc/common
 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
+usr/share/doc/kde/HTML/fr/common usr/share/doc/kde/HTML/fr/kvpnc/common
+usr/share/doc/kde/HTML/sv/common usr/share/doc/kde/HTML/sv/kvpnc/common

Modified: kde-extras/kvpnc/trunk/debian/rules
===================================================================
--- kde-extras/kvpnc/trunk/debian/rules	2006-03-05 14:40:27 UTC (rev 3247)
+++ kde-extras/kvpnc/trunk/debian/rules	2006-03-05 17:27:03 UTC (rev 3248)
@@ -1,102 +1,13 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/kde.mk
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
--include debian/debiandirs
-
-# To be used with kde-style admin subdirectories if desired.
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
-config.status: configure
-	dh_testdir
-	
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde)
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	-$(MAKE) clean
-	-$(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)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kvpnc
-
+install/kvpnc::
 	# fix script-not-executable
 	chmod 0755 debian/kvpnc/usr/share/apps/kvpnc/ping_check.sh
 
 	# fix menu-command-not-in-package
 	install -p -m644 debian/kvpnc.lintian-overrides debian/kvpnc/usr/share/lintian/overrides/kvpnc
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

Deleted: kde-extras/kvpnc/trunk/debian/source.lintian-overrides