Merge with Michael

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index b756b3b323c93ae39d9d3ffec3003c1a59975a3a..cd026b4a4ad34e439930a5b157b45537d5c86beb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -171,7 +171,7 @@ apt-doc: build-doc
 #
        # Copy the guides
        dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \
 #
        # Copy the guides
        dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \

-                      $(BLD)/docs/offline.text $(BLD)/docs/offline.html
+                      $(BLD)/docs/offline*.text $(BLD)/docs/offline*.html

        dh_installchangelogs -p$@
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installchangelogs -p$@
        dh_compress -p$@
        dh_fixperms -p$@


@@ -209,7 +209,7 @@ apt: build debian/shlibs.local
 
        cp debian/bugscript debian/$@/usr/share/bug/apt/script
 
 
        cp debian/bugscript debian/$@/usr/share/bug/apt/script
 

-       cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
+       cp share/debian-archive.gpg debian/$@/usr/share/$@

 
 #      head -n 500 ChangeLog > debian/ChangeLog
 
 
 #      head -n 500 ChangeLog > debian/ChangeLog
 


@@ -269,6 +269,7 @@ apt-utils: build debian/shlibs.local
 
        cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
        dh_installdocs -p$@
 
        cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
        dh_installdocs -p$@

+       dh_installexamples -p$@

 
        # Install the man pages..
        dh_installman -p$@
 
        # Install the man pages..
        dh_installman -p$@