* debian/rules

  - fix https install location

diff --git a/debian/changelog b/debian/changelog
index bb21c6faa79b41afdce1a73074b569237bfa2010..6bed39d1bdd918724455a10866c58662abe4dbca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ apt (0.7.10ubuntu1) hardy; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Nov 2007 15:57:18 +0100
 
-apt (0.7.10) UNRELEASED; urgency=low
+apt (0.7.10) unstable; urgency=low
 
+  [ Otavio Salvador ]
   * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
     apt-mark, closes: #430207.
   * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
@@ -20,8 +21,12 @@ apt (0.7.10) UNRELEASED; urgency=low
 
   [ Program translations ]
     - Basque updated. Closes: #453088
+  
+  [ Michael Vogt ]
+  * debian/rules
+    - fix https install location
 
- -- Otavio Salvador <otavio@ossystems.com.br>  Mon, 26 Nov 2007 15:46:33 -0200
+ -- Michael Vogt <mvo@debian.org>  Wed, 28 Nov 2007 17:10:49 +0100
 
 apt (0.7.9) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 411311effa4f553606dda1440619e7fe55803686..b64efa92536b607cf7b116cb130eb13cd31327fe 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -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/
+       # 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/
@@ -305,7 +307,7 @@ apt-transport-https: build debian/shlibs.local
 
        # 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$@