[Pkg-doc-linux-devel] r293 - trunk/doc-linux/debian
djpig at alioth.debian.org
djpig at alioth.debian.org
Mon Aug 25 23:51:40 UTC 2008
Author: djpig
Date: 2008-08-25 23:51:40 +0000 (Mon, 25 Aug 2008)
New Revision: 293
Added:
trunk/doc-linux/debian/doc-linux-html.doc-base.linux-faq
trunk/doc-linux/debian/doc-linux-html.doc-base.linux-howtos
trunk/doc-linux/debian/doc-linux-html.lintian-overrides
Removed:
trunk/doc-linux/debian/doc-linux-html.doc-base.faq
trunk/doc-linux/debian/doc-linux-html.doc-base.howtos
trunk/doc-linux/debian/doc-linux-html.overrides
trunk/doc-linux/debian/doc-linux-html.preinst
trunk/doc-linux/debian/doc-linux-text.preinst
Modified:
trunk/doc-linux/debian/compat
trunk/doc-linux/debian/doc-linux-nonfree.control
trunk/doc-linux/debian/doc-linux.changelog
trunk/doc-linux/debian/doc-linux.control
trunk/doc-linux/debian/rules
Log:
* Update to debhelper compat level 7
* Optimize the rules files a bit:
+ Use dh_compress instead of compressing "by hand"
+ Use dh_lintian
+ Install all doc-base files with dh_installdocs
* Remove /usr/doc migration code and some other clean-up
code only effective for upgrades from pre-woody versions.
Modified: trunk/doc-linux/debian/compat
===================================================================
--- trunk/doc-linux/debian/compat 2008-08-25 22:08:01 UTC (rev 292)
+++ trunk/doc-linux/debian/compat 2008-08-25 23:51:40 UTC (rev 293)
@@ -1 +1 @@
-5
+7
Deleted: trunk/doc-linux/debian/doc-linux-html.doc-base.faq
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.doc-base.faq 2008-08-25 22:08:01 UTC (rev 292)
+++ trunk/doc-linux/debian/doc-linux-html.doc-base.faq 2008-08-25 23:51:40 UTC (rev 293)
@@ -1,9 +0,0 @@
-Document: linux-faq
-Title: Linux FAQ
-Author: David C. Merrill <dmerrill at ibiblio.org>
-Abstract: This is a list of Frequently Asked Questions about Linux.
-Section: Help/FAQ
-
-Format: HTML
-Index: /usr/share/doc/FAQ/Linux-FAQ/index.html
-Files: /usr/share/doc/FAQ/Linux-FAQ/*.html
Deleted: trunk/doc-linux/debian/doc-linux-html.doc-base.howtos
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.doc-base.howtos 2008-08-25 22:08:01 UTC (rev 292)
+++ trunk/doc-linux/debian/doc-linux-html.doc-base.howtos 2008-08-25 23:51:40 UTC (rev 293)
@@ -1,10 +0,0 @@
-Document: linux-howtos
-Title: Linux HOWTOs
-Author: Linux Documentation Project
-Abstract: This is a list of installed HOWTOs
-Section: Help/HOWTO
-
-Format: HTML
-Index: /usr/share/doc/HOWTO/en-html/HOWTO-INDEX/howtos.html
-Files: /usr/share/doc/HOWTO/en-html/*.html
- /usr/share/doc/HOWTO/en-html/*/*.html
Copied: trunk/doc-linux/debian/doc-linux-html.doc-base.linux-faq (from rev 291, trunk/doc-linux/debian/doc-linux-html.doc-base.faq)
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.doc-base.linux-faq (rev 0)
+++ trunk/doc-linux/debian/doc-linux-html.doc-base.linux-faq 2008-08-25 23:51:40 UTC (rev 293)
@@ -0,0 +1,9 @@
+Document: linux-faq
+Title: Linux FAQ
+Author: David C. Merrill <dmerrill at ibiblio.org>
+Abstract: This is a list of Frequently Asked Questions about Linux.
+Section: Help/FAQ
+
+Format: HTML
+Index: /usr/share/doc/FAQ/Linux-FAQ/index.html
+Files: /usr/share/doc/FAQ/Linux-FAQ/*.html
Property changes on: trunk/doc-linux/debian/doc-linux-html.doc-base.linux-faq
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/doc-linux/debian/doc-linux-html.doc-base.linux-howtos (from rev 291, trunk/doc-linux/debian/doc-linux-html.doc-base.howtos)
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.doc-base.linux-howtos (rev 0)
+++ trunk/doc-linux/debian/doc-linux-html.doc-base.linux-howtos 2008-08-25 23:51:40 UTC (rev 293)
@@ -0,0 +1,10 @@
+Document: linux-howtos
+Title: Linux HOWTOs
+Author: Linux Documentation Project
+Abstract: This is a list of installed HOWTOs
+Section: Help/HOWTO
+
+Format: HTML
+Index: /usr/share/doc/HOWTO/en-html/HOWTO-INDEX/howtos.html
+Files: /usr/share/doc/HOWTO/en-html/*.html
+ /usr/share/doc/HOWTO/en-html/*/*.html
Property changes on: trunk/doc-linux/debian/doc-linux-html.doc-base.linux-howtos
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/doc-linux/debian/doc-linux-html.lintian-overrides (from rev 291, trunk/doc-linux/debian/doc-linux-html.overrides)
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.lintian-overrides (rev 0)
+++ trunk/doc-linux/debian/doc-linux-html.lintian-overrides 2008-08-25 23:51:40 UTC (rev 293)
@@ -0,0 +1,2 @@
+doc-linux-html: extra-license-file usr/share/doc/HOWTO/en-html/NCURSES-Programming-HOWTO/ncurses_programs/COPYING
+doc-linux-html: extra-license-file usr/share/doc/HOWTO/en-html/NCURSES-Programming-HOWTO/ncurses_programs/perl/COPYING
Property changes on: trunk/doc-linux/debian/doc-linux-html.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/doc-linux/debian/doc-linux-html.overrides
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.overrides 2008-08-25 22:08:01 UTC (rev 292)
+++ trunk/doc-linux/debian/doc-linux-html.overrides 2008-08-25 23:51:40 UTC (rev 293)
@@ -1,2 +0,0 @@
-doc-linux-html: extra-license-file usr/share/doc/HOWTO/en-html/NCURSES-Programming-HOWTO/ncurses_programs/COPYING
-doc-linux-html: extra-license-file usr/share/doc/HOWTO/en-html/NCURSES-Programming-HOWTO/ncurses_programs/perl/COPYING
Deleted: trunk/doc-linux/debian/doc-linux-html.preinst
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.preinst 2008-08-25 22:08:01 UTC (rev 292)
+++ trunk/doc-linux/debian/doc-linux-html.preinst 2008-08-25 23:51:40 UTC (rev 293)
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ -d /usr/doc/doc-linux-html ] && [ ! -h /usr/doc/doc-linux-html ] \
- && [ -f /usr/doc/doc-linux-html/.dhelp ]; then
- rm -f /usr/doc/doc-linux-html/.dhelp
- rmdir /usr/doc/doc-linux-html
-fi
-
-# This version number is later than you might expect, because I missed some
-# cases before 2002.04-2. The postrm only unwinds before 2001.11-1, because
-# the intermediate versions were just mistakes.
-if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl 2002.04-2; then
- # In earlier versions, /usr/share/doc/FAQ was a symlink to
- # /usr/share/doc/doc-linux-html/FAQ. This reverses the sense of the
- # symlink so that dpkg doesn't complain. It also cunningly handles other
- # packages installing into /usr/share/doc/FAQ before this migration
- # happens: they'll install through the symlink and then the whole thing
- # will be moved in one piece.
- if [ ! -h /usr/share/doc/doc-linux-html/FAQ ] \
- && [ -d /usr/share/doc/doc-linux-html/FAQ ]; then
- # This might be in a strange state, depending on when doc-linux-text
- # was installed.
- if [ -h /usr/share/doc/FAQ ] || [ ! -d /usr/share/doc/FAQ ]; then
- rm -f /usr/share/doc/FAQ
- fi
- mkdir -p /usr/share/doc/FAQ
- find /usr/share/doc/doc-linux-html/FAQ -mindepth 1 -maxdepth 1 | \
- xargs -r -iname mv name /usr/share/doc/FAQ/
- rmdir /usr/share/doc/doc-linux-html/FAQ
- ln -s ../FAQ /usr/share/doc/doc-linux-html/FAQ
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/doc-linux/debian/doc-linux-nonfree.control
===================================================================
--- trunk/doc-linux/debian/doc-linux-nonfree.control 2008-08-25 22:08:01 UTC (rev 292)
+++ trunk/doc-linux/debian/doc-linux-nonfree.control 2008-08-25 23:51:40 UTC (rev 293)
@@ -4,7 +4,7 @@
Maintainer: Debian LDP Maintainers <pkg-doc-linux-devel at lists.alioth.debian.org>
Uploaders: Frank Lichtenheld <djpig at debian.org>, Colin Watson <cjwatson at debian.org>
Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7)
Build-Depends-Indep: bzip2
Homepage: http://www.tldp.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-doc-linux/trunk/doc-linux
Deleted: trunk/doc-linux/debian/doc-linux-text.preinst
===================================================================
--- trunk/doc-linux/debian/doc-linux-text.preinst 2008-08-25 22:08:01 UTC (rev 292)
+++ trunk/doc-linux/debian/doc-linux-text.preinst 2008-08-25 23:51:40 UTC (rev 293)
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ -d /usr/doc/doc-linux-text ] && [ ! -h /usr/doc/doc-linux-text ] \
- && [ -f /usr/doc/doc-linux-text/.dhelp ]; then
- rm -f /usr/doc/doc-linux-text/.dhelp
- rmdir /usr/doc/doc-linux-text
-fi
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/doc-linux/debian/doc-linux.changelog
===================================================================
--- trunk/doc-linux/debian/doc-linux.changelog 2008-08-25 22:08:01 UTC (rev 292)
+++ trunk/doc-linux/debian/doc-linux.changelog 2008-08-25 23:51:40 UTC (rev 293)
@@ -1,3 +1,13 @@
+doc-linux (2008.08-2) unstable; urgency=low
+
+ * Update to debhelper compat level 7
+ * Optimize the rules files a bit:
+ + Use dh_compress instead of compressing "by hand"
+ + Use dh_lintian
+ + Install all doc-base files with dh_installdocs
+
+ -- Frank Lichtenheld <djpig at debian.org> Tue, 26 Aug 2008 00:48:23 +0200
+
doc-linux (2008.08-1) unstable; urgency=low
* new upstream release (20080825)
Modified: trunk/doc-linux/debian/doc-linux.control
===================================================================
--- trunk/doc-linux/debian/doc-linux.control 2008-08-25 22:08:01 UTC (rev 292)
+++ trunk/doc-linux/debian/doc-linux.control 2008-08-25 23:51:40 UTC (rev 293)
@@ -4,7 +4,7 @@
Maintainer: Debian LDP Maintainers <pkg-doc-linux-devel at lists.alioth.debian.org>
Uploaders: Frank Lichtenheld <djpig at debian.org>, Colin Watson <cjwatson at debian.org>
Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7)
Build-Depends-Indep: bzip2
Homepage: http://www.tldp.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-doc-linux/trunk/doc-linux
Modified: trunk/doc-linux/debian/rules
===================================================================
--- trunk/doc-linux/debian/rules 2008-08-25 22:08:01 UTC (rev 292)
+++ trunk/doc-linux/debian/rules 2008-08-25 23:51:40 UTC (rev 293)
@@ -98,7 +98,7 @@
rm -rf $(R) $(R2)
# rm -f xml/$(SOURCE).list xml/$(SOURCE).omf
find debian -name '*.doc-base.ldp-en-*' -print0 | xargs -r0 rm -v
- dh_clean build-stamp debian/$(SOURCE)-html.menu \
+ dh_clean debian/$(SOURCE)-html.menu \
debian/$(SOURCE)-html.postinst debian/$(SOURCE)-html.prerm
# Build a new .orig.tar.gz.
@@ -145,21 +145,11 @@
tar -C $(R)/usr/share/doc/FAQ -xzvf FAQ/Linux-FAQ.html.tar.gz
ln -s ../FAQ $(R)/usr/share/doc/$(SOURCE)-html/FAQ
- install -m 644 debian/doc-linux-html.doc-base.faq \
- $(R)/usr/share/doc-base/linux-faq
- install -m 644 debian/doc-linux-html.doc-base.howtos \
- $(R)/usr/share/doc-base/linux-howtos
endif
dh_installdocs -n
dh_installchangelogs
- gzip -9 $(R)/usr/share/doc/$(SOURCE)-html/changelog.Debian
ln -s ../HOWTO/en-html $(R)/usr/share/doc/$(SOURCE)-html/HOWTO
- dh_installmenu
- if test -f debian/$(SOURCE)-html.overrides; then \
- install -m644 debian/$(SOURCE)-html.overrides \
- $(R)/usr/share/lintian/overrides/$(SOURCE)-html; \
- fi
binary-$(SOURCE)-text: DH_OPTIONS=-p$(SOURCE)-text
binary-$(SOURCE)-text: build
@@ -190,15 +180,8 @@
# for some users they also cause problems for others (Bug#324453)
find $(TEXT_BUILD) -type f | xargs grep -l "\[[0-9]\+m" | xargs -r sed -i -e 's/\[[0-9]\+m//g'
-ifeq ($(SOURCE),doc-linux)
- find $(TEXT_BUILD) $(R2)/usr/share/doc/FAQ -type f | xargs gzip -9
-else
- find $(TEXT_BUILD) -type f | xargs gzip -9
-endif
-
dh_installdocs
dh_installchangelogs
- gzip -9 $(R2)/usr/share/doc/$(SOURCE)-text/changelog.Debian
ln -s ../HOWTO/en-txt $(R2)/usr/share/doc/$(SOURCE)-text/HOWTO
binary-arch:
@@ -206,6 +189,10 @@
# Makes a binary package.
binary-indep: DH_OPTIONS=-i
binary-indep: binary-$(SOURCE)-html binary-$(SOURCE)-text
+ dh_installmenu
+ dh_lintian
+ dh_link
+ dh_compress -Xusr/share/doc/HOWTO/en-html
dh_fixperms
dh_installdeb
dh_gencontrol
More information about the Pkg-doc-linux-devel
mailing list