* Apply patch to avoid truncating of arbitrary files. Thanks to Bryan

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index a46169a7b996105bb94aaa1b56bb340e7fe7b458..4f6d72e062fa935424357fd920c4bfa906d9ac1d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -131,7 +131,7 @@ clean:
        rm -rf build
 
        # Add here commands to clean up after the build process.
        rm -rf build
 
        # Add here commands to clean up after the build process.

-       dh_clean debian/copyright debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils
+       dh_clean debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils

 
 binary-indep: apt-doc libapt-pkg-doc
 # Build architecture-independent files here.
 
 binary-indep: apt-doc libapt-pkg-doc
 # Build architecture-independent files here.


@@ -185,7 +185,7 @@ apt-doc: build-doc
 
 # Build architecture-dependent files here.
 
 
 # Build architecture-dependent files here.
 

-binary-arch: apt-transport-https apt libapt-pkg-dev apt-utils
+binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https

 apt: build debian/shlibs.local
        dh_testdir -p$@
        dh_testroot -p$@
 apt: build debian/shlibs.local
        dh_testdir -p$@
        dh_testroot -p$@


@@ -204,6 +204,8 @@ apt: build debian/shlibs.local
        find $(BLD)/bin/ -type l -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
 
        cp $(BLD)/bin/methods/* debian/$@/usr/lib/apt/methods/
        find $(BLD)/bin/ -type l -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
 
        cp $(BLD)/bin/methods/* debian/$@/usr/lib/apt/methods/

+       # https has its own package
+       rm debian/$@/usr/lib/apt/methods/https

 
        cp $(BLD)/scripts/dselect/* debian/$@/usr/lib/dpkg/methods/apt/
        cp -r $(BLD)/locale debian/$@/usr/share/
 
        cp $(BLD)/scripts/dselect/* debian/$@/usr/lib/dpkg/methods/apt/
        cp -r $(BLD)/locale debian/$@/usr/share/


@@ -212,6 +214,7 @@ apt: build debian/shlibs.local
        cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
 
        cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
        cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
 
        cp share/ubuntu-archive.gpg debian/$@/usr/share/$@

+       sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note

        cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
        cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu
 #      head -n 500 ChangeLog > debian/ChangeLog
        cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
        cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu
 #      head -n 500 ChangeLog > debian/ChangeLog


@@ -297,7 +300,7 @@ apt-utils: build debian/shlibs.local
        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-apt-transport-https: build debian/shlibs.local
+apt-transport-https: build debian/shlibs.local libapt-pkg-dev

        dh_testdir -p$@
        dh_testroot -p$@
        dh_clean -p$@ -k
        dh_testdir -p$@
        dh_testroot -p$@
        dh_clean -p$@ -k


@@ -305,7 +308,7 @@ apt-transport-https: build debian/shlibs.local
 
        # install the method
        mkdir -p debian/$@/usr/lib/apt/methods
 
        # install the method
        mkdir -p debian/$@/usr/lib/apt/methods

-       mv $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods
+       cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods

 
        dh_installdocs -p$@
        dh_installexamples -p$@
 
        dh_installdocs -p$@
        dh_installexamples -p$@