Selaa lähdekoodia

* debian/rules
- fix https install location

Michael Vogt 18 vuotta sitten
vanhempi
commit
7ce6bd6a75
3 muutettua tiedostoa jossa 11 lisäystä ja 4 poistoa
  1. 1 1
      configure.in
  2. 7 2
      debian/changelog
  3. 3 1
      debian/rules

+ 1 - 1
configure.in

@@ -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)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.9")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.10")
 PACKAGE="apt"
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 AC_SUBST(PACKAGE)

+ 7 - 2
debian/changelog

@@ -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
   * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
     apt-mark, closes: #430207.
     apt-mark, closes: #430207.
   * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
   * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
@@ -13,8 +14,12 @@ apt (0.7.10) UNRELEASED; urgency=low
 
 
   [ Program translations ]
   [ Program translations ]
     - Basque updated. Closes: #453088
     - 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
 apt (0.7.9) unstable; urgency=low
 
 

+ 3 - 1
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/ \;
 	find $(BLD)/bin/ -type l -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
 
 
 	cp $(BLD)/bin/methods/* debian/$@/usr/lib/apt/methods/
 	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 $(BLD)/scripts/dselect/* debian/$@/usr/lib/dpkg/methods/apt/
 	cp -r $(BLD)/locale debian/$@/usr/share/
 	cp -r $(BLD)/locale debian/$@/usr/share/
@@ -300,7 +302,7 @@ apt-transport-https: build debian/shlibs.local
 
 
 	# install the method
 	# install the method
 	mkdir -p debian/$@/usr/lib/apt/methods
 	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_installdocs -p$@
 	dh_installexamples -p$@
 	dh_installexamples -p$@