4 files changed, 48 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 128398d00..8d2289a21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,22 @@ apt (1.3~rc2) unstable; urgency=medium
 
  -- Julian Andres Klode <jak@debian.org>  Wed, 17 Aug 2016 23:31:07 +0200
 
+apt (1.3~rc1ubuntu2) yakkety; urgency=medium
+
+  * Don't build with -O3. See LP: #1473674.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Aug 2016 09:44:56 +0200
+
+apt (1.3~rc1ubuntu1) yakkety; urgency=medium
+
+  * debian/NEWS: Get rid of 1.3~pre3+cmake1 entry.
+    Thanks to Axel Beckert for reporting
+  * CMake: Use COPYONLY instead of @ONLY
+  * debian: Install etc/apt if present (e.g., on Ubuntu)
+  * Hack around Ubuntu rejecting symlink copyright
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 12 Aug 2016 00:20:40 +0000
+
 apt (1.3~rc1) unstable; urgency=medium
 
   * Summary: CMake branch merged, socks5h (and tor) support, and fancy
diff --git a/debian/control b/debian/control
index c383e2fc1..535d3693d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: apt
 Section: admin
 Priority: important
-Maintainer: APT Development Team <deity@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>,
  Julian Andres Klode <jak@debian.org>,
  David Kalnischkies <donkult@debian.org>
diff --git a/debian/copyright b/debian/copyright
index 012065c85..c0e89b51a 120000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1 +1,23 @@
-../COPYING
-\ No newline at end of file
+Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others.
+Apt is currently developed by APT Development Team <deity@lists.debian.org>.
+
+License: GPLv2+
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+See /usr/share/common-licenses/GPL-2, or
+<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+of the GNU General Public License.
+
diff --git a/debian/rules b/debian/rules
index b6dfc96ea..f662944f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,11 @@
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 
+export DEB_CXXFLAGS_MAINT_STRIP := -O3
+export DEB_CFLAGS_MAINT_STRIP := -O3
+export DEB_CXXFLAGS_MAINT_APPEND := -O2
+export DEB_CFLAGS_MAINT_APPEND := -O2
+
 # do not fail as we are just experimenting with symbol files for now
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 
@@ -19,7 +24,8 @@ override_dh_install-indep:
 
 override_dh_install-arch:
 	dh_movefiles
-	dh_install --fail-missing
+	if [ -e debian/tmp/etc/apt ]; then dh_install -papt etc/apt/* etc/apt; fi
+	dh_install --list-missing
 	install -m 644 debian/apt.conf.autoremove debian/apt/etc/apt/apt.conf.d/01autoremove
 	install -m 755 debian/apt.auto-removal.sh debian/apt/etc/kernel/postinst.d/apt-auto-removal