From a40310a5e60d880ce1bd82f0513c5d6658bb48ef Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 30 Nov 2013 13:15:01 +0100
Subject: enable NOISE for build logs to enable analyse
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It was enabled for a (long) while in Ubuntu, but it shouldn't hurt to
enable it in Debian as well – especially now that Debian has automatic
analyses of the buildlogs which don't work that well without the 'noise'
---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'debian')

diff --git a/debian/rules b/debian/rules
index 06ccdac31..28525af50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
 
+# build in verbose mode by default to make it easy to diangose issues
+export NOISY=1
+
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-- 
cgit v1.2.3


From 0005fa07886135d6adfec59f2d722df229b7af12 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 30 Nov 2013 22:07:38 +0100
Subject: use a substvar to set the archive-keyring in debian/control

Adds a small helper to extract the small information bits we store in
apt-vendor.ent and uses it in debian/rules to set apt:keyring as a
substvar for debian/control populated with the &keyring-package; info
---
 debian/control | 2 +-
 debian/rules   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'debian')

diff --git a/debian/control b/debian/control
index 84d6155a6..c70d0e9ea 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ XS-Testsuite: autopkgtest
 
 Package: apt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gnupg
 Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~)
 Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~)
 Conflicts: python-apt (<< 0.7.93.2~)
diff --git a/debian/rules b/debian/rules
index 28525af50..f4f7ec06b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -219,7 +219,7 @@ apt: build-binary build-manpages debian/apt.install
 	dh_fixperms -p$@
 	dh_installdeb -p$@
 	dh_shlibdeps -p$@
-	dh_gencontrol -p$@
+	dh_gencontrol -p$@ -- -Vapt:keyring="$(shell ./vendor/getinfo keyring-package)"
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
-- 
cgit v1.2.3


From 5555ef9850b7e66aa02d39bb7d624fdf3e43edb2 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 1 Dec 2013 00:05:34 +0100
Subject: drop old /var/state to /var/lib transition artefacts

Regardless of when this transition was, it is so long ago that everyone
who would still need this has a million other problems to deal with now
so lets just drop this code.
---
 debian/preinst | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100755 debian/preinst

(limited to 'debian')

diff --git a/debian/preinst b/debian/preinst
deleted file mode 100755
index 985ad9b84..000000000
--- a/debian/preinst
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# dpkg does this for us while we are upgrading..
-#if [ "$1" = "upgrade" -a -L /var/state/apt -a -e /var/lib/apt -a ! -L /var/state/apt ] && dpkg --compare-versions "$2" ">=" "0.4.10"; then
-#  rm /var/state/apt
-#fi
-
-if [ "$1" = "upgrade" -o "$1" = "install" -a "$2" != "" ]; then
-  if [ ! -e /var/lib/apt -a -e /var/state/apt ]; then
-    # upgrading from /var/state/apt using apt.
-    # it's probably running now so we want to ensure /var/state/apt
-    # is still valid afterwards. and since we're upgrading
-
-    if [ -x /usr/bin/perl -a -d /var/state/apt -a ! -L /var/state/apt ] &&
-      perl -e 'exit 1 if ((stat("/var/lib"))[0] != (stat("/var/state/apt"))[0])'
-    then
-      # same fs, we can mv it
-      mv /var/state/apt /var/lib/apt
-      ln -s ../lib/apt /var/state/apt
-      # note that this symlink (/var/state/apt) will be removed when
-      # dpkg finishes unpacking the apt we're about to install; this is okay
-    else
-      # scary, let's just symlink it and hope
-      ln -s /var/state/apt /var/lib/apt
-    fi
-  fi
-  touch /var/lib/apt/lists/partial/.delete-me-later || true
-fi
-
-#DEBHELPER#
-- 
cgit v1.2.3