diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-09-02 22:40:05 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-09-02 22:40:05 +0200 |
| commit | 556bb4937ca2cc301c01b67fc50fa80944bec4c9 (patch) | |
| tree | a5f3221f68367463c6872a2216f356d4bf137b43 | |
| parent | 969d33307ae0cc1b433a0462ef1561580ea6ddbc (diff) | |
releasing package apt version 1.3~rc4ubuntu11.3_rc4ubuntu1
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | doc/apt-cache.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 2 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 2 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 2 |
7 files changed, 15 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a26b32d71..04780b391 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,7 +165,7 @@ endif() # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>") -set(PACKAGE_VERSION "1.3~rc4") +set(PACKAGE_VERSION "1.3~rc4ubuntu1") if (NOT DEFINED COMMON_ARCH) execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH diff --git a/debian/changelog b/debian/changelog index 0043bfc88..175296ff3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (1.3~rc4ubuntu1) yakkety; urgency=medium + + * Merge with Debian, remaining changes: + - Hack around Ubuntu rejecting symlink copyright + - Revert "test: Assert multi-arch in the chroot" + - Revert "test: Make sure we always find a dpkg in status file" + + -- Julian Andres Klode <juliank@ubuntu.com> Fri, 02 Sep 2016 20:39:36 +0000 + apt (1.3~rc4) unstable; urgency=medium [ Julian Andres Klode ] diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 5c16ce851..ce6030df9 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2016-08-30T00:00:00Z</date> + <date>2016-09-02T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 09a5ba950..818129995 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2016-08-30T00:00:00Z</date> + <date>2016-09-02T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index a516276e9..bdd4587c0 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -239,7 +239,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "1.3~rc4"> +<!ENTITY apt-product-version "1.3~rc4ubuntu1"> <!-- (Code)names for various things used all over the place --> <!ENTITY debian-oldstable-codename "wheezy"> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index ca0203468..e6487ab27 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -19,7 +19,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2016-08-30T00:00:00Z</date> + <date>2016-09-02T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index bfc97e705..2e7156720 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2016-08-30T00:00:00Z</date> + <date>2016-09-02T00:00:00Z</date> </refentryinfo> <refmeta> |