r225: Initial Import

diff --git a/debhelper.1 b/debhelper.1
index 6834594a62366d5ba2effce2ff8d8140f7f0b3cd..438c95054f4b26738f6eaebfe694faf3f81890ae 100644 (file)
--- a/debhelper.1
+++ b/debhelper.1
@@ -94,7 +94,8 @@ for an example of how to use this.
 By default, all debhelper programs assume that the temporary directory used
 for assembling the tree of files in a package is debian/tmp for the first
 package listed in debian/control, and debian/<packagename> for each
-additional package.
+additional package. If DH_COMPAT=2, debian/<packagename> is always used,
+even for the first package.
 .P
 Sometimes, you might want to use some other temporary directory. This is
 supported by the
@@ -109,9 +110,9 @@ binary package the debhelper program will act on.
 .B Other notes
 In general, if any debhelper program needs a directory to exist under
 debian/, it will create it. I haven't bothered to document this in all the
-man pages, but for example, dh_installdeb knows to make debian/tmp/DEBIAN/
+man pages, but for example, dh_installdeb knows to make debian/<foo>/DEBIAN/
 before trying to put files there, dh_installmenu knows you need a
-debian/tmp/usr/lib/menu/ before installing the menu files, etc.
+debian/<foo>/usr/lib/menu/ before installing the menu files, etc.
 .SH "DEBHELPER COMMANDS"
 Here is the complete list of available debhelper commands.
 #LIST#

diff --git a/debian/changelog b/debian/changelog
index 212c1ee5b44b60fb63b49fc703225856631b245c..fb1a04f07e334bef5febeb7d698e99a9926df0f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+debhelper (2.0.00) unstable; urgency=low
+
+  * Don't let the version number fool you. Debhelper v2 is here, but just
+    barely. That's what all the zero's mean. :-)
+  * If DH_COMPAT=2, then debian/<package> will be used for the temporary
+    build directory for all packages. debian/tmp is no more! (Well, except
+    dh_movefiles still uses it.)
+  * debhelper.1: documented this. 
+  * Dh_lib.pm: added compat(), pass in a number, it returns true if the
+    current compatability level is equal to that number.
+  * doc/PROGRAMMING: documented that.
+  * debhelper itself now builds using DH_COMPAT=2.
+  * dh_debstd forces DH_COMPAT=1, because it needs to stay compatable with
+    debstd after all.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu,  1 Jul 1999 13:37:58 -0700
+
 debhelper (1.9.00) unstable; urgency=low
 
   * This is a release of debhelper in preparation for debhelper v2.

diff --git a/debian/rules b/debian/rules
index 8a4ee355f7800cc81ebb6abeb9f1a1a13d483a37..d0d8ed05035b65a61cdb0c4526d29c0efb79e791 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,9 @@
 # be sure to use the new templates from this package.
 export DH_AUTOSCRIPTDIR=autoscripts
 
+# Living dangerously :-)
+export DH_COMPAT=2
+
 # Figure out the current debhelper version.
 VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null |grep Version:`" : '.*Version: \(.*\)')
 
@@ -23,8 +26,8 @@ clean:
 
 test:
        ./dh_clean
-       perl -MTest::Harness -e 'runtests @ARGV' t/*
-       -rm -rf debian/tmp
+       DH_VERSION=10 perl -MTest::Harness -e 'runtests @ARGV' t/*
+       ./dh_clean
 
 # Build architecture-dependent files here.
 binary-arch: build
@@ -37,11 +40,11 @@ binary-indep: build
        ./dh_clean -k
        ./dh_installdirs usr/bin usr/lib/debhelper
 
-       echo -e "package Dh_Version;\n\$$version='$(VERSION)';" > debian/tmp/usr/lib/debhelper/Dh_Version.pm
+       echo -e "package Dh_Version;\n\$$version='$(VERSION)';" > debian/debhelper/usr/lib/debhelper/Dh_Version.pm
        find . -perm +111 -maxdepth 1 -type f -not -name "*.pl" \
-               -exec install -p {} debian/tmp/usr/bin \;
-       cp -a Dh_*.pm debian/tmp/usr/lib/debhelper
-       cp -a autoscripts debian/tmp/usr/lib/debhelper
+               -exec install -p {} debian/debhelper/usr/bin \;
+       cp -a Dh_*.pm debian/debhelper/usr/lib/debhelper
+       cp -a autoscripts debian/debhelper/usr/lib/debhelper
 
        ./dh_installdocs doc/TODO doc/README doc/PROGRAMMING doc/from-debstd
        ./dh_installexamples examples/*
@@ -61,7 +64,7 @@ binary-indep: build
                open (OUT,">$$f"); \
                print OUT @lines; \
                close OUT; \
-       }' debian/tmp/usr/man/man1/*.1
+       }' debian/debhelper/usr/man/man1/*.1
        # Fix up the debhelper.1 man page, substituting in a list of all
        # debhelper commands. eek!
        perl -ne ' \
@@ -69,10 +72,10 @@ binary-indep: build
                $$collect.=".TP\n.BR $$_" if $$. eq 3 && /^dh_/; \
                close(ARGV) if eof; \
                END { \
-                       open(I,"debian/tmp/usr/man/man1/debhelper.1"); \
+                       open(I,"debian/debhelper/usr/man/man1/debhelper.1"); \
                        @lines=<I>; \
                        close I; \
-                       open(O,">debian/tmp/usr/man/man1/debhelper.1"); \
+                       open(O,">debian/debhelper/usr/man/man1/debhelper.1"); \
                        foreach (@lines) { \
                                s/#LIST#/$$collect/; \
                                print O; \
@@ -80,7 +83,7 @@ binary-indep: build
                        close O; \
                }' *.1
        ./dh_installchangelogs
-       ./dh_movefiles
+#      ./dh_movefiles
        ./dh_link
        ./dh_compress
        ./dh_fixperms

diff --git a/dh_debstd b/dh_debstd
index 2a557ec981cec0ecc8b0512146d75f0412348d39..1c2f1f05c99335175aec064783ebcbac3d4c8fdf 100755 (executable)
--- a/dh_debstd
+++ b/dh_debstd
@@ -10,6 +10,9 @@
 # This has been gutted and extensively rewritten to function as a debhelper
 # command by Joey Hess. And then completly rewritten in perl.
 
+# Need to stay compatable with debstd, so force use of level 1.
+$ENV{DH_COMAPT}=1;
+
 # Pre-parse command line before we load Dh_lib, becuase we use a
 # different style of arguments.
 @argv=();

diff --git a/doc/v2 b/doc/v2
index 4889c39830c1a54b8765ee37ae680f6401a56ff7..4db20d5a149f3261a4f67ea6c929b74c0a617922 100644 (file)
--- a/doc/v2
+++ b/doc/v2
@@ -10,7 +10,7 @@ prior discussion on debian-devel.
 Items marked with a + are done. All others will happen as soon as I can code
 them.
 
-* Standardize on the name used for the temporary build directory of a
++ Standardize on the name used for the temporary build directory of a
   package. Currently it's debian/tmp/ for the first package and 
   debian/<package>/ for other packages of a multi-binary package. I've
   decided after much agonizing to to use debian/<package>. The main thing this

diff --git a/t/dh_link b/t/dh_link
index 8c7bfeee93e20b021af4b742ae04ddf46c42d1b3..1e2105581c938d5c4b8dad6229a496aeb30d53d3 100644 (file)
--- a/t/dh_link
+++ b/t/dh_link
@@ -5,16 +5,16 @@ plan(tests => 4);
 # It used to not make absolute links in this situation, and it should.
 # #37774
 system("./dh_link","etc/foo","usr/lib/bar");
-ok("/etc/foo",readlink("debian/tmp/usr/lib/bar"));
+ok("/etc/foo",readlink("debian/debhelper/usr/lib/bar"));
 
 # let's make sure it makes simple relative links ok.
 system("./dh_link","usr/bin/foo","usr/bin/bar");
-ok("foo",readlink("debian/tmp/usr/bin/bar"));
+ok("foo",readlink("debian/debhelper/usr/bin/bar"));
 
 # ok, more complex relative links.
 system("./dh_link","usr/lib/1","usr/bin/2");
-ok("../lib/1",readlink("debian/tmp/usr/bin/2"));
+ok("../lib/1",readlink("debian/debhelper/usr/bin/2"));
 
 # this was bug #40159. Absolute links passes to dh_link.
 system("./dh_link","/etc/X11/dfm/system.dfmext","usr/share/dfm/dfmext");
-ok("/etc/X11/dfm/system.dfmext",readlink("debian/tmp/usr/share/dfm/dfmext"));
+ok("/etc/X11/dfm/system.dfmext",readlink("debian/debhelper/usr/share/dfm/dfmext"));