diff options
author | Michael Vogt <mvo@debian.org> | 2014-03-12 20:40:01 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-03-12 20:40:01 +0100 |
commit | 32120cde98308448fbcd31cf7841f13a86d3e0a8 (patch) | |
tree | 102ec9f093480109c14d7f0450bc4a584d42a4c0 /configure.ac | |
parent | c1409d1be88557529c62883be3174793481233de (diff) | |
parent | 9e3142e16c2ccb4b51f5a8122f5a8e8c0fab9f9a (diff) |
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-download-file
Conflicts:
cmdline/apt-helper.cc
test/integration/framework
test/integration/test-apt-https-no-redirect
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a697597b5..40556ee54 100644 --- a/configure.ac +++ b/configure.ac @@ -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) PACKAGE="apt" -PACKAGE_VERSION="0.9.15.4" +PACKAGE_VERSION="0.9.15.5" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") |