[Pkg-irc-commits] r278 - in /packages/ngircd/trunk/debian: compat control docs rules source/ source/format

[cbiedl-guest at users.alioth.debian.org]

Author: cbiedl-guest
Date: Sun Nov 13 17:01:42 2011
New Revision: 278

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=278
Log:
[ngircd] Rework Debianisation

* Switch to debhelper 7
* Standards-Version 3.9.1
* Make lintian happy

Added:
    packages/ngircd/trunk/debian/source/
    packages/ngircd/trunk/debian/source/format
Removed:
    packages/ngircd/trunk/debian/docs
Modified:
    packages/ngircd/trunk/debian/compat
    packages/ngircd/trunk/debian/control
    packages/ngircd/trunk/debian/rules

Modified: packages/ngircd/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-irc/packages/ngircd/trunk/debian/compat?rev=278&op=diff
==============================================================================
--- packages/ngircd/trunk/debian/compat (original)
+++ packages/ngircd/trunk/debian/compat Sun Nov 13 17:01:42 2011
@@ -1,1 +1,1 @@
-5
+7

Modified: packages/ngircd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-irc/packages/ngircd/trunk/debian/control?rev=278&op=diff
==============================================================================
--- packages/ngircd/trunk/debian/control (original)
+++ packages/ngircd/trunk/debian/control Sun Nov 13 17:01:42 2011
@@ -3,15 +3,20 @@
 Priority: optional
 Maintainer: Debian IRC Team <pkg-irc-maintainers at lists.alioth.debian.org>
 Uploaders: Mario Iseli <mario at debian.org>, Matt Arnold <mattarnold5 at gmail.com>,
- Christoph Biedl <debian.axhn at manchmal.in-ulm.de>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libgnutls-dev
+    Christoph Biedl <debian.axhn at manchmal.in-ulm.de>
+Build-Depends: debhelper (>= 7.0.50~),
+    autotools-dev,
+    expect,
+    libgnutls-dev,
+    telnet,
 Vcs-Svn: svn://svn.debian.org/pkg-irc/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-irc
-Standards-Version: 3.8.0
+Standards-Version: 3.9.1
 
 Package: ngircd
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+    lsb-base (>= 3.0-6),
 Replaces: ircd
 Conflicts: dancer-ircd, ircd-hybrid, ircd-irc2, ircd-ircu, rageircd
 Homepage: http://ngircd.barton.de

Modified: packages/ngircd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/ngircd/trunk/debian/rules?rev=278&op=diff
==============================================================================
--- packages/ngircd/trunk/debian/rules (original)
+++ packages/ngircd/trunk/debian/rules Sun Nov 13 17:01:42 2011
@@ -1,70 +1,27 @@
 #!/usr/bin/make -f
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	    --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	    --prefix=/usr \
+	    --mandir=\$${prefix}/share/man \
+	    --infodir=\$${prefix}/share/info \
+	    --sysconfdir=/etc/ngircd \
+	    --with-gnutls \
+	    --enable-ipv6
 
-CFLAGS = -Wall -g
+override_dh_auto_install:
+	dh_auto_install
+	# install config and sample motd file
+	install -m 640 -D debian/ngircd.conf \
+	    debian/ngircd/etc/ngircd/ngircd.conf
+	install -m 640 -D debian/ngircd.motd \
+	    debian/ngircd/etc/ngircd/ngircd.motd
+	# make lintian happy
+	rm debian/ngircd/usr/share/doc/ngircd/INSTALL
+	rm debian/ngircd/usr/share/doc/ngircd/COPYING
+	mv debian/ngircd/usr/share/doc/ngircd/ChangeLog \
+	    debian/ngircd/usr/share/doc/ngircd/changelog
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc/ngircd --without-epoll --with-gnutls --enable-ipv6
-
-
-build: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-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/ngircd
-	rm -rf $(CURDIR)/debian/ngircd/etc
-	install -m 640 -D $(CURDIR)/debian/ngircd.conf $(CURDIR)/debian/ngircd/etc/ngircd/ngircd.conf
-	install -m 640 -D $(CURDIR)/debian/ngircd.motd $(CURDIR)/debian/ngircd/etc/ngircd/ngircd.motd
-	rm -rf $(CURDIR)/debian/ngircd/usr/share
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installexamples doc/sample-ngircd.conf
-	dh_installdocs
-	dh_installinit
-	dh_installman man/ngircd.8 man/ngircd.conf.5
-	dh_compress
-	dh_strip
-	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 
+%:
+	dh $@

Added: packages/ngircd/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-irc/packages/ngircd/trunk/debian/source/format?rev=278&op=file
==============================================================================
--- packages/ngircd/trunk/debian/source/format (added)
+++ packages/ngircd/trunk/debian/source/format Sun Nov 13 17:01:42 2011
@@ -1,0 +1,1 @@
+1.0