summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debhelper.13
-rw-r--r--debian/changelog14
-rwxr-xr-xdebian/rules22
-rwxr-xr-xdh_compress2
-rw-r--r--doc/README2
-rw-r--r--doc/TODO7
6 files changed, 41 insertions, 9 deletions
diff --git a/debhelper.1 b/debhelper.1
index f3296666..e37085aa 100644
--- a/debhelper.1
+++ b/debhelper.1
@@ -100,5 +100,8 @@ An introduction to debhelper.
.TP
.BR /usr/doc/debhelper/examples/
A set of example debian/rules files that use debhelper.
+.TP
+.BR http://kitenet.net/programs/debhelper/
+Debhelper web site.
.SH AUTHOR
Joey Hess <joeyh@master.debian.org>
diff --git a/debian/changelog b/debian/changelog
index 3ee30048..651c20a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+debhelper (1.1.14) unstable; urgency=low
+
+ * Debhelper now has a web page at http://kitenet.net/programs/debhelper/
+
+ * Added code to debian/rules to update the web page when I release new
+ debhelpers.
+ * dh_compress: since version 0.88 or so, dh_compress has bombed out if
+ a debian/compress file returned an error code. This was actually
+ unintentional - in fact, the debian/compress example in the man page
+ will fail this way if usr/info or usr/X11R6 is not present. Corrected
+ the program to not fail. (#26214)
+
+ -- Joey Hess <joeyh@master.debian.org> Sun, 30 Aug 1998 22:15:44 -0700
+
debhelper (1.1.13) unstable; urgency=low
* dh_installmanpages: rewritten in perl. Allows me to fix bug #26221 (long
diff --git a/debian/rules b/debian/rules
index 94af8686..20ba1a70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,5 +51,25 @@ binary-indep: build
./dh_md5sums
./dh_builddeb
+# Install in the proper location on my ftp server and web server. Not intended
+# for use by anyone except the author.
+OLD_VER=$(shell perl -e '<>;<>;while(<>){last if /^ --/};<>;$$_=<>;print m/\((.*?)\)/'<debian/changelog)
+localdist:
+ dpkg-buildpackage -rfakeroot -tc
+ if [ `hostname` = 'kite' ] ; then \
+ cp ../debhelper_$(VERSION).tar.gz ../../public; \
+ rm /home/ftp/pub/code/debhelper/* || true; \
+ cp debian/changelog /home/pub/programs/debhelper/CHANGES; \
+ echo $(VERSION) > /home/pub/programs/debhelper/LATEST-VERSION-IS; \
+ cd ..; rm -rf debhelper-$(OLD_VER); \
+ [ -f ../public/debhelper_$(OLD_VER).tar.gz ] && \
+ tar zxf ../public/debhelper_$(OLD_VER).tar.gz || \
+ tar zxf ../outdated/debhelper_$(OLD_VER).tar.gz; \
+ diff -r -u --new-file debhelper-$(OLD_VER) debhelper-$(VERSION) > \
+ /home/ftp/pub/code/debhelper/diffs/debhelper-$(VERSION).diff; \
+ gzip -9f /home/ftp/pub/code/debhelper/diffs/debhelper-$(VERSION).diff; \
+ cd /tmp; rm -f debhelper-$(OLD-VER); \
+ fi
+
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary localdist
diff --git a/dh_compress b/dh_compress
index b94cfcfe..76f7614d 100755
--- a/dh_compress
+++ b/dh_compress
@@ -21,7 +21,7 @@ filelist () {
if [ "$compress" ]; then
# The config file is a sh script that outputs the files to be compressed
# (typically using find).
- sh $olddir/$compress 2>/dev/null
+ sh $olddir/$compress 2>/dev/null || true
else
# By default fall back on what the policy manual says to compress.
find usr/info usr/man usr/X11*/man -type f ! -name "*.gz" 2>/dev/null || true
diff --git a/doc/README b/doc/README
index 76b2263e..2aa9175d 100644
--- a/doc/README
+++ b/doc/README
@@ -51,4 +51,6 @@ does this even if only the arch-dependant package is being built (for ports
to other architectures). I handle this in debian/rules.multi by calling
dh_movefiles in the install target.
+Debhelper's home page is at http://kitenet.net/programs/debhelper/
+
-- Joey Hess <joeyh@master.debian.org>
diff --git a/doc/TODO b/doc/TODO
index c36b1dc6..df9e3c48 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -68,10 +68,3 @@ Long term goals:
* Convert selected debhelper commands to be perl programs, for speed, ease
of maintainence, and 8-bit cleanness.
-
-Fixes to backport to 1.0 tree:
-
-* dh_installdocs used -m 655 for a TODO file. (minor, dh_fixperms cleans up
- after it)
-* dh_fixperms had a problem with removing x bits on examples files -
- backport fix.