r354: * Killed the fixlinks stuff, since there are no longer any symlinks in

     the source package.

diff --git a/debian/changelog b/debian/changelog
index 4a806d0590a48b0c2c3886d45bd7d7635e2f0e10..2efc69dfdd9ba1ddf12329db76efb118d0b1322e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (2.0.101) unstable; urgency=low
+
+  * Killed the fixlinks stuff, since there are no longer any symlinks in
+    the source package.
+
+ -- Joey Hess <joeyh@debian.org>  Wed,  5 Jul 2000 19:14:10 -0700
+
 debhelper (2.0.100) unstable; urgency=low
 
   * Modified all postinst script fragments to only run when called with

diff --git a/debian/fixlinks b/debian/fixlinks
deleted file mode 100644 (file)
index 23d4306..0000000
--- a/debian/fixlinks
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-# Clean up after cvs's dreadful symlink handling, by making all the symlinks
-# this package needs.
-ln -sf postinst-menu autoscripts/postrm-menu
-ln -sf postinst-modules autoscripts/postrm-modules
-ln -sf postinst-mime autoscripts/postrm-mime

diff --git a/debian/rules b/debian/rules
index 3f81682c2cfe56fdad9410300ee698df26140ad8..a677cff3781f5bfc5330c7f78f34902f3571c5d6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,25 +18,25 @@ VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null |grep Version:`" : '.*Ver
 
 export DH_VERBOSE=1
 
-build: link-stamp test
+build: test
 # Nothing to do.       
 
-clean: link-stamp
+clean:
        ./dh_testdir
        ./dh_testroot
-       ./dh_clean link-stamp
+       ./dh_clean
 
-test: link-stamp
+test:
        ./dh_clean
        DH_VERSION=10 perl -MTest::Harness -e 'runtests grep { ! /CVS/ } @ARGV' t/*
        ./dh_clean
 
 # Build architecture-dependent files here.
-binary-arch: link-stamp build
+binary-arch: build
 # Nothing to do.
 
 # Build architecture-independent files here.
-binary-indep: link-stamp build
+binary-indep: build
        ./dh_testdir
        ./dh_testroot
        ./dh_clean -k
@@ -58,7 +58,7 @@ binary-indep: link-stamp build
        ./dh_installmanpages
        ./dh_installinfo
        # Fix up all man pages, filling in the modification time for them.
-       # Note this runs beofre the command below so debhelper.1 gets the right
+       # Note this runs before the command below so debhelper.1 gets the right
        # date on it.
        perl -mPOSIX -e ' \
                foreach $$f (@ARGV) { \
@@ -73,7 +73,7 @@ binary-indep: link-stamp build
                close OUT; \
        }' debian/debhelper/usr/share/man/man1/*.1
        # Fix up the debhelper.1 man page, substituting in a list of all
-       # debhelper commands. eek!
+       # debhelper commands. Eek!
        perl -ne ' \
                s/\\- /(1)\n/; \
                $$collect.=".TP\n.BR $$_" if $$. eq 3 && /^dh_/; \
@@ -90,7 +90,6 @@ binary-indep: link-stamp build
                        close O; \
                }' *.1
        ./dh_installchangelogs
-#      ./dh_movefiles
        ./dh_link
        ./dh_compress
        ./dh_fixperms
@@ -100,11 +99,6 @@ binary-indep: link-stamp build
        ./dh_md5sums
        ./dh_builddeb
 
-# Fix links when checking out of cvs by calling this target.
-link-stamp:
-       sh -e debian/fixlinks
-       touch link-stamp
-
 # Update the debhelper web page. Not intended for use by anyone except the
 # author.
 installhook:

diff --git a/debian/subtsvars b/debian/subtsvars
deleted file mode 100644 (file)
index 458d787..0000000
--- a/debian/subtsvars
+++ /dev/null
@@ -1 +0,0 @@
-perl:Depends=perl5