diff options
| author | egon <egon@debian-vm> | 2008-09-16 21:27:35 +0200 |
|---|---|---|
| committer | egon <egon@debian-vm> | 2008-09-16 21:27:35 +0200 |
| commit | fcdd9cdd14cbf2a1bb7e9ab619e29d6a66d5b908 (patch) | |
| tree | 1e08ae6a55cda36d76057cec13cbe35342fddce9 | |
| parent | ba095f3faf9ca218cb54d18fac81fe74f5ed70d1 (diff) | |
* debian/changelog:
- upload to experimental to give the releases managers something
to check out
* doc/makesfile:
- merged from the apt--mvo branch
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/makefile | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/configure.in b/configure.in index c0c73e1c8..4d3f557d2 100644 --- 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_DEFINE_UNQUOTED(VERSION,"0.7.13") +AC_DEFINE_UNQUOTED(VERSION,"0.7.15") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 0f9321baf..9e8760681 100644 --- 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 @@ -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) + * 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 diff --git a/doc/makefile b/doc/makefile index 8a8a04c03..6ea1c1343 100644 --- a/doc/makefile +++ b/doc/makefile @@ -20,7 +20,7 @@ INCLUDES = apt.ent 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) |