r207: Initial Import

diff --git a/debian/changelog b/debian/changelog
index d019946492d241608ec1915025489c1ddeb4a0d0..76596df03f5c03a315037eea4e6c1986b0c09a65 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+debhelper (1.2.68) unstable; urgency=low
+
+  * doc/README: updated example of using #DEBHELPER# in a perl script, with
+    help from Julian Gilbey.
+  * dh_link: generate absolute symlinks where appropriate. The links
+    generated before were wrong simetimes (#37774)
+  * Started writing a regression test suite for debhelper. Currently covers
+    only the above bugfix and a few more dh_link tests.
+  * Tossed Test.pm into the package (for regression tests) until we get perl
+    5.005 which contains that package. That file is licenced the same as perl.
+  * dh_installchangelogs: force all installed files to be owned by root
+    (#37655).
+
+ -- Joey Hess <joeyh@master.debian.org>  Sun, 16 May 1999 17:18:44 -0700
+
 debhelper (1.2.67) unstable; urgency=low
 
   * dh_installmodules: fixed type that made the program not work.

diff --git a/debian/rules b/debian/rules
index 5995460fef82c8cbd790808b388b81591265017c..181375c17f418a0394493e5f2a77a7321b6e8b7a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,19 @@ VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null |grep Version:`" : '.*Ver
 export DH_VERBOSE=1
 
 build:
-# Nothing to do.
+       # Run regression tests.
+       $(MAKE) test
 
 clean:
        ./dh_testdir
        ./dh_testroot
        ./dh_clean
 
+test:
+       ./dh_clean
+       perl -MTest::Harness -e 'runtests @ARGV' t/*
+       -rm -rf debian/tmp
+
 # Build architecture-dependent files here.
 binary-arch: build
 # Nothing to do.

diff --git a/dh_link b/dh_link
index cc1b49545a23d25c3a40d6823e4b3a4a3d72cf11..f99aab73728e375f239789f2d5dd2c35d2aabfe7 100755 (executable)
--- a/dh_link
+++ b/dh_link
@@ -61,6 +61,10 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                        }
                        $src=~s:/$::;
                }
+               else {
+                       # Make sure it's properly absolute.
+                       $src="/$src";
+               }
                
                doit("ln","-sf",$src,"$TMP/$dest");
        }

diff --git a/dh_link.1 b/dh_link.1
index 5a3fbbc2ff15ada385ca07958518156ff3558bb7..eb2cce2139128ee627ffe1129077aa341e2ab4e5 100644 (file)
--- a/dh_link.1
+++ b/dh_link.1
@@ -24,14 +24,12 @@ ackage dh_link is told to act on. By default, this is the first binary
 package in debian/control, but if you use -p, -i, or -a flags, it will be 
 the first package specified by those flags.
 .P
-Be sure to only use file names relative to the package build
-directory. Ie, "/usr/bin/foo" should not be used, use "usr/bin/foo" instead.
-Also, be sure you
+Be sure you
 .B do
 specify the full filename to both the source and destination files (unlike
 you would do if you were using something like
 .BR ln (1)
-)
+).
 .P
 dh_link will generate symlinks that comply with debian policy - absolute
 when policy says they should be absolute, and relative links with as short a

diff --git a/doc/TODO b/doc/TODO
index b926737c387f24794333171f90a22ae1a19344dd..75006f05a6b5a80c4d290a8dc3d449538fe4a857 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -22,6 +22,9 @@ Wishlist items:
   they might have; still it would be nice to check them too, just to make
   debhelper more flexible.) One easy fix is to add umask 022 to dh_lib,
   however, there may be unforeseen ramifications of such a change.
+* All programs should also make sure the files they install are owned by
+  root.root. Situation is currently the same as with permissions above, plus
+  dh_installchangelogs is fixed.
 * something should add ldconfig calls properly to the postinst of packages
   that contain shared libraries. maybe dh_makeshlibs? But it wasn't designed
   to do that originally, and even worse, it is often run after