[dutch-svn] r106 - doc-linux-nl/trunk/debian
thijs at alioth.debian.org
thijs at alioth.debian.org
Wed Jul 25 20:28:53 UTC 2007
Author: thijs
Date: 2007-07-25 20:28:53 +0000 (Wed, 25 Jul 2007)
New Revision: 106
Added:
doc-linux-nl/trunk/debian/doc-linux-nl-html.dirs
doc-linux-nl/trunk/debian/doc-linux-nl-text.dirs
doc-linux-nl/trunk/debian/manpages-nl.dirs
Modified:
doc-linux-nl/trunk/debian/changelog
doc-linux-nl/trunk/debian/compat
doc-linux-nl/trunk/debian/control
doc-linux-nl/trunk/debian/rules
Log:
do some packaging modernisation
Modified: doc-linux-nl/trunk/debian/changelog
===================================================================
--- doc-linux-nl/trunk/debian/changelog 2007-06-24 11:46:57 UTC (rev 105)
+++ doc-linux-nl/trunk/debian/changelog 2007-07-25 20:28:53 UTC (rev 106)
@@ -1,8 +1,8 @@
doc-linux-nl (20051127-3) UNRELEASED; urgency=low
- *
+ *
- -- Thijs Kinkhorst <thijs at debian.org> Mon, 16 Oct 2006 14:35:46 +0200
+ -- Thijs Kinkhorst <thijs at debian.org> Wed, 25 Jul 2007 21:58:18 +0200
doc-linux-nl (20051127-2) unstable; urgency=low
Modified: doc-linux-nl/trunk/debian/compat
===================================================================
--- doc-linux-nl/trunk/debian/compat 2007-06-24 11:46:57 UTC (rev 105)
+++ doc-linux-nl/trunk/debian/compat 2007-07-25 20:28:53 UTC (rev 106)
@@ -1 +1 @@
-4
+5
Modified: doc-linux-nl/trunk/debian/control
===================================================================
--- doc-linux-nl/trunk/debian/control 2007-06-24 11:46:57 UTC (rev 105)
+++ doc-linux-nl/trunk/debian/control 2007-07-25 20:28:53 UTC (rev 106)
@@ -4,7 +4,7 @@
Maintainer: Thijs Kinkhorst <thijs at debian.org>
Uploaders: Debian l10 Dutch <debian-l10n-dutch at lists.debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper, linuxdoc-tools, sgmltools-2, groff, w3m
+Build-Depends: debhelper (>= 5), linuxdoc-tools, sgmltools-2, groff, w3m
XS-Vcs-Svn: svn://svn.debian.org/pkg-dutch/doc-linux-nl
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-dutch/doc-linux-nl
Added: doc-linux-nl/trunk/debian/doc-linux-nl-html.dirs
===================================================================
--- doc-linux-nl/trunk/debian/doc-linux-nl-html.dirs (rev 0)
+++ doc-linux-nl/trunk/debian/doc-linux-nl-html.dirs 2007-07-25 20:28:53 UTC (rev 106)
@@ -0,0 +1,5 @@
+usr/share/doc
+usr/share/doc/doc-linux-html
+usr/share/doc/doc-linux-html/FAQ
+usr/share/doc/HOWTO
+usr/share/doc/HOWTO/nl-html
Added: doc-linux-nl/trunk/debian/doc-linux-nl-text.dirs
===================================================================
--- doc-linux-nl/trunk/debian/doc-linux-nl-text.dirs (rev 0)
+++ doc-linux-nl/trunk/debian/doc-linux-nl-text.dirs 2007-07-25 20:28:53 UTC (rev 106)
@@ -0,0 +1,3 @@
+usr/share/doc/doc-linux-nl/text
+usr/share/doc/HOWTO
+usr/share/doc/HOWTO/nl-txt
Added: doc-linux-nl/trunk/debian/manpages-nl.dirs
===================================================================
--- doc-linux-nl/trunk/debian/manpages-nl.dirs (rev 0)
+++ doc-linux-nl/trunk/debian/manpages-nl.dirs 2007-07-25 20:28:53 UTC (rev 106)
@@ -0,0 +1,7 @@
+usr/share/man/nl/man1
+usr/share/man/nl/man2
+usr/share/man/nl/man3
+usr/share/man/nl/man4
+usr/share/man/nl/man5
+usr/share/man/nl/man6
+usr/share/man/nl/man8
Modified: doc-linux-nl/trunk/debian/rules
===================================================================
--- doc-linux-nl/trunk/debian/rules 2007-06-24 11:46:57 UTC (rev 105)
+++ doc-linux-nl/trunk/debian/rules 2007-07-25 20:28:53 UTC (rev 106)
@@ -1,74 +1,43 @@
#!/usr/bin/make -f
-#
-# Invoke each target with `./debian/rules <target>'. All targets should be
-# invoked with the package root as the current directory.
-#
-# Marco Budde (Budde at tu-harburg.de)
-# The name of the package
R = debian/doc-linux-nl-html
R2 = debian/doc-linux-nl-text
R3 = debian/manpages-nl
-DIRECTORIES = \
- $(R) \
- $(R)/DEBIAN \
- $(R)/usr \
- $(R)/usr/share/doc \
- $(R)/usr/share/doc/doc-linux-nl-html/FAQ \
- $(R)/usr/share/doc/HOWTO/nl-html \
- $(R)/usr/share/doc/HOWTO \
- $(R2) \
- $(R2)/DEBIAN \
- $(R2)/usr \
- $(R2)/usr/share/doc \
- $(R2)/usr/share/doc/doc-linux-nl-text \
- $(R2)/usr/share/doc/HOWTO/nl-txt \
- $(R2)/usr/share/doc/HOWTO \
- $(R3) \
- $(R3)/DEBIAN \
- $(R3)/usr/share/man/nl/man1 \
- $(R3)/usr/share/man/nl/man2 \
- $(R3)/usr/share/man/nl/man3 \
- $(R3)/usr/share/man/nl/man4 \
- $(R3)/usr/share/man/nl/man5 \
- $(R3)/usr/share/man/nl/man6 \
- $(R3)/usr/share/man/nl/man8
-
MANVER = 1.45
-$(DIRECTORIES):
- install -d -g root -o root -m 755 $@
- chmod g-s $@
-
# Builds the binary package.
build:
- $(checkdir)
+ dh_testdir
touch build
# Clean $(DIRECTORIES)
clean-dir:
- $(checkdir)
+ dh_testdir
rm -rf $(R)
rm -rf $(R2)
rm -rf $(R3)
# Undoes the effect of `make -f rules build'.
clean: clean-dir
- $(checkdir)
+ dh_testdir
dh_clean
rm -f debian/files* debian/substvars core debian/*~ HOWTO/*~
rm -f build *~ debian/*.debhelper
rm -rf debian/manpage-build
# Makes a binary package.
-binary-indep: $(DIRECTORIES) checkroot build
- $(checkdir)
+binary-indep: build
+ dh_testdir
+ dh_testroot
-binary-arch: $(DIRECTORIES) checkroot build
- $(checkdir)
+binary-arch: build
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+
####################### html ##############################
(cd $(R)/usr/share/doc/HOWTO/nl-html && \
@@ -110,39 +79,18 @@
dh_compress -pdoc-linux-nl-html -P$(R)
dh_compress -pdoc-linux-nl-text -P$(R2)
dh_compress -pmanpages-nl -P$(R3)
- dh_md5sums -pdoc-linux-nl-html -P$(R)
- dh_md5sums -pdoc-linux-nl-text -P$(R2)
- dh_md5sums -pmanpages-nl -P$(R3)
- dh_gencontrol -pdoc-linux-nl-html -P$(R)
- dh_gencontrol -pdoc-linux-nl-text -P$(R2)
- dh_gencontrol -pmanpages-nl -P$(R3)
dh_installdeb -pdoc-linux-nl-html -P$(R)
dh_installdeb -pdoc-linux-nl-text -P$(R2)
dh_installdeb -pmanpages-nl -P$(R3)
+ dh_gencontrol -pdoc-linux-nl-html -P$(R)
+ dh_gencontrol -pdoc-linux-nl-text -P$(R2)
+ dh_gencontrol -pmanpages-nl -P$(R3)
dh_md5sums -pdoc-linux-nl-text -P$(R)
dh_md5sums -pdoc-linux-nl-text -P$(R2)
dh_md5sums -pmanpages-nl -P$(R3)
- dpkg --build debian/doc-linux-nl-html ..
- dpkg --build debian/doc-linux-nl-text ..
- dpkg --build debian/manpages-nl ..
+ dh_builddeb
-define checkdir
- test -f debian/rules
-endef
-
binary: binary-indep binary-arch
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-checkroot:
- $(checkdir)
- test root = "`whoami`"
-
-cvs-build:
- dpkg-buildpackage -rfakeroot -Iconfig -I.svn -Ien -IINDEX -Iintern -Iwork -IWORK -IDATABASE -uc -us
-
-cvs-build-signed:
- debuild -Iconfig -I.svn -Ien -IINDEX -Iintern -Iwork -IWORK -IDATABASE
-
-.PHONY: binary binary-arch binary-indep clean checkroot cvs-build cvs-build-signed
+.PHONY: binary binary-arch binary-indep clean
More information about the pkg-dutch-commit
mailing list