* debian/changelog:

  - upload to experimental to give the releases managers something
    to check out
* doc/makesfile:
  - merged from the apt--mvo branch

diff --git a/configure.in b/configure.in
index c0c73e1c8d1ab750db40dfbcfa3dcdcd160cc76c..4d3f557d2325f03f6e04436b393bb4a4bbba89f9 100644 (file)
--- a/configure.in
+++ b/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)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 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.13")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.15")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 0f9321bafea0b0fa6fa5cb0b5118f57e3931de54..9e87606817609de1a8bd9b5e7f573dcbb7b4a785 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.7.15) UNRELEASED; urgency=low
+apt (0.7.15) experimental; urgency=low

 
   [ Christian Perrier ]
   * Fix typo in cron.daily script. Closes: #486179
 
   [ Christian Perrier ]
   * Fix typo in cron.daily script. Closes: #486179


@@ -43,8 +43,10 @@ apt (0.7.15) UNRELEASED; urgency=low
   * add DPkg::NoTriggers option so that applications that call
     apt/aptitude (like the installer) defer trigger processing
     (thanks to Joey Hess)
   * add DPkg::NoTriggers option so that applications that call
     apt/aptitude (like the installer) defer trigger processing
     (thanks to Joey Hess)

+  * doc/makefile:
+    - add examples/apt-https-method-example.conf

   
   

- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Jul 2008 20:31:05 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 16 Sep 2008 21:27:03 +0200

 
 apt (0.7.14) unstable; urgency=low
 
 
 apt (0.7.14) unstable; urgency=low
 

diff --git a/doc/makefile b/doc/makefile
index 8a8a04c03333eb8dc6ff5d62b0396e4e5d60b36d..6ea1c1343b4352a03a6294afaa3b7b0165de6eaf 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -20,7 +20,7 @@ INCLUDES = apt.ent
 include $(XML_MANPAGE_H)
 
 # Examples
 include $(XML_MANPAGE_H)
 
 # Examples

-SOURCE = examples/apt.conf examples/sources.list examples/configure-index 
+SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf

 TO = $(DOC)
 TARGET = binary
 include $(COPY_H)
 TO = $(DOC)
 TARGET = binary
 include $(COPY_H)