r252: * Fixed makefile commit target.

   * Misc changes to make CVS dirs not be copies into package.

diff --git a/debian/changelog b/debian/changelog
index d3931fab138de4b259f2e3d177750481f50cdf3a..3025894f0cff778163dedf8544510da6d1f366a2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 debhelper (2.0.23) unstable; urgency=low
 
   * Fixed makefile commit target.
+  * Misc changes to make CVS dirs not be copies into package.
 
  -- Joey Hess <joeyh@master.debian.org>  Mon, 16 Aug 1999 22:43:39 -0700
 

diff --git a/debian/rules b/debian/rules
index 8f9976f9f97b8956010c9cdd1f7446c6bf30050f..acd9415fe88568b9076a308bffe085909bc4cf60 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,9 +47,10 @@ binary-indep: link-stamp build
                -exec install -p {} debian/debhelper/usr/bin \;
        cp -a Dh_*.pm debian/debhelper/usr/share/debhelper
        cp -a autoscripts debian/debhelper/usr/share/debhelper
+       rm -rf debian/debhelper/usr/share/debhelper/autoscripts/CVS
 
-       ./dh_installdocs doc/*
-       ./dh_installexamples examples/*
+       ./dh_installdocs `echo doc/* | grep -v CVS`
+       ./dh_installexamples `echo examples/* | grep -v CVS`
        ./dh_installmenu
        ./dh_installmanpages
        ./dh_installinfo
@@ -99,7 +100,7 @@ binary-indep: link-stamp build
 # 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)
-dist: link-stamp
+dist: commit link-stamp
        dpkg-buildpackage -rfakeroot -tc
        if [ `hostname` = 'kite' ] ; then \
                cp ../debhelper_$(VERSION).tar.gz ../../public; \
@@ -127,7 +128,6 @@ commit:
        cvs -Q commit -m "`dpkg-parsechangelog | grep '^  '`"
        cvs -Q tag rel-$(shell dpkg-parsechangelog | grep ^Version: \
                |cut -d " " -f 2 |tr '.' '-')
-       $(MAKE) new
        
 new:
        # Update w/o editing.