* debian/rules
authorMichael Vogt <egon@bottom>
Wed, 28 Nov 2007 17:27:56 +0000 (18:27 +0100)
committerMichael Vogt <egon@bottom>
Wed, 28 Nov 2007 17:27:56 +0000 (18:27 +0100)
  - fix https install location

configure.in
debian/changelog
debian/rules

index f56a9a7c651c66c24b912a9389f7da79f0c9453e..5f19c98a6f36b3b69d743eabf9009a9c3f2779cd 100644 (file)
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.9")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.10")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
index fdf4a03e53fc28c91624c58574154050f5d5f421..832ee11d43f764be769b721c6d30616ff8bded45 100644 (file)
@@ -1,5 +1,6 @@
-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
@@ -13,8 +14,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
 
index 33cd59fd19b5adfd4850ca548fc3e31858b243b6..5989934b4811403592d079cbd192c85f7395a8bc 100755 (executable)
@@ -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/
@@ -300,7 +302,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$@