[Pkg-voip-commits] r5426 - in /gnugk/trunk/debian: changelog control patches/ rules

[paravoid at alioth.debian.org]

Author: paravoid
Date: Tue Apr  1 06:15:49 2008
New Revision: 5426

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5426
Log:
* Dropped dpatch entirely, since we have zero patches now.
* Do not ship /usr/share/doc/gnugk/manual/.cvsignore.

Removed:
    gnugk/trunk/debian/patches/
Modified:
    gnugk/trunk/debian/changelog
    gnugk/trunk/debian/control
    gnugk/trunk/debian/rules

Modified: gnugk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/changelog?rev=5426&op=diff
==============================================================================
--- gnugk/trunk/debian/changelog (original)
+++ gnugk/trunk/debian/changelog Tue Apr  1 06:15:49 2008
@@ -9,10 +9,12 @@
   * Remove debian/backports/sarge; it's not supported anymore.
   * Depend on libopenh323-1.19.1-dev >= 1.19.1~ instead of >= 1.19.1~dfsg-1,
     fixes lintian warning.
+  * Dropped dpatch entirely, since we have zero patches now.
+  * Do not ship /usr/share/doc/gnugk/manual/.cvsignore.
   * Remove Jose Carlos Garcia Sogo and Santiago Garcia Mantinan from
     Uploaders and add myself.
 
- -- Faidon Liambotis <paravoid at debian.org>  Tue, 01 Apr 2008 08:39:47 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Tue, 01 Apr 2008 09:14:48 +0300
 
 gnugk (2:2.2.6-7) unstable; urgency=high
 

Modified: gnugk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/control?rev=5426&op=diff
==============================================================================
--- gnugk/trunk/debian/control (original)
+++ gnugk/trunk/debian/control Tue Apr  1 06:15:49 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libopenh323-1.19.1-dev (>= 1.19.1~), libspeex-dev, libsdl1.2-dev, libldap2-dev, libpq-dev, libmysql++-dev, dpatch, help2man, linuxdoc-tools, firebird2.0-dev [amd64 i386 powerpc sparc kfreebsd-amd64 kfreebsd-i386]
+Build-Depends: debhelper (>> 4.0.0), libopenh323-1.19.1-dev (>= 1.19.1~), libspeex-dev, libsdl1.2-dev, libldap2-dev, libpq-dev, libmysql++-dev, help2man, linuxdoc-tools, firebird2.0-dev [amd64 i386 powerpc sparc kfreebsd-amd64 kfreebsd-i386]
 Standards-Version: 3.7.3
 Homepage: http://www.gnugk.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/gnugk/trunk/

Modified: gnugk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/rules?rev=5426&op=diff
==============================================================================
--- gnugk/trunk/debian/rules (original)
+++ gnugk/trunk/debian/rules Tue Apr  1 06:15:49 2008
@@ -21,7 +21,6 @@
         INSTALL_PROGRAM += -s
 endif
 
-include /usr/share/dpatch/dpatch.make
 PACKAGE=gnugk
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
@@ -32,7 +31,7 @@
 URL := http://qa.debian.org/watch/sf.php/openh323gk/gnugk-$(UPVERSION).tar.gz
 
 
-config.status: patch-stamp 
+config.status:
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
@@ -45,7 +44,7 @@
 	$(MAKE) opt addpasswd doc
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ]||$(MAKE) clean
@@ -62,13 +61,12 @@
 		INSTALL_DIR=$(CURDIR)/debian/gnugk/usr \
 		INSTALLBIN_DIR=$(CURDIR)/debian/gnugk/usr/sbin
 	cp obj*/addpasswd $(CURDIR)/debian/gnugk/usr/sbin
-	# HACK: workaround broken install till next release.
-	rm -f $(CURDIR)/debian/gnugk/usr/share/doc/gnugk/manual/.cvsignore
 	
 	/usr/bin/help2man -N -n 'OpenH323 Gatekeeper' -s 1 \
 		-S 'Debian GNU/Linux' obj*/addpasswd -o addpasswd.1
 	
-	install --mode=640 --owner=root --group=root etc/complete.ini debian/gnugk/etc/gatekeeper.ini
+	install --mode=640 --owner=root --group=root \
+		etc/complete.ini $(CURDIR)/debian/gnugk/etc/gatekeeper.ini
 
 
 # Build architecture-independent files here.
@@ -79,7 +77,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs -Xcopying docs/*
+	dh_installdocs -Xcopying -X.cvsignore docs/*
 	dh_installexamples etc/*
 	dh_installmenu
 	dh_installinit -- defaults 90 10