Hi again!

intrigeri wrote (16 Jan 2016 15:11:19 GMT) :
> Shall I NMU with this change?

I initially missed that the control field must embed the version
number of the depended-upon source package (which is obvious in
retrospect), so it's a little bit more complicated.

This RC bug is more than one year old, with no maintainer activity
yet, so I'm going intend to NMU with the attached patch applied before
building (modulo improved changelog entries, perhaps), that solves
this problem for me.

Full disclosure: Tails uses tsocks a little bit (for sending Git
traffic through Tor), and I'd like to be able to build
a Stretch -based Tails ISO before I bother dropping our dependency on
tsocks entirely, so I need tsocks to be back into testing at least for
some more time.

Cheers,
--
intrigeri

diff --git a/debian/changelog b/debian/changelog
index 5998f53..6e1a44b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tsocks (1.8beta5-9.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Document with Built-Using that tsocks ships the saveme binary,
+    that is statically linked against libc6 (Closes: #769343).
+
+ -- intrigeri <intrig...@debian.org>  Sun, 17 Jan 2016 00:23:55 +0000
+
 tsocks (1.8beta5-9.2) unstable; urgency=low
 
   * Added SONAME (Closes: 636384)
diff --git a/debian/control b/debian/control
index 07a5ea2..154e5f3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Homepage: http://tsocks.sf.net
 Package: tsocks
 Architecture: any
 Depends: ${shlibs:Depends}
+Built-Using: ${extra:Built-Using}
 Description: transparent network access through a SOCKS 4 or 5 proxy
  tsocks provides transparent network access through a SOCKS version 4
  or 5 proxy (usually on a firewall). tsocks intercepts the calls
diff --git a/debian/rules b/debian/rules
index 20a68c0..b1b21f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,6 +96,8 @@ binary-arch: build install
 	dh_fixperms
 	dh_makeshlibs
 
+	./debian/util/write-built-using
+
 	#create conffiles automagically:
 	#find $(CURDIR)/debian/$(package)/etc -type f|sed s:$(CURDIR)/debian/$(package):: >$(CURDIR)/debian/conffiles
 	dh_installdeb
diff --git a/debian/util/write-built-using b/debian/util/write-built-using
new file mode 100755
index 0000000..f749847
--- /dev/null
+++ b/debian/util/write-built-using
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+EXTRA_PACKAGES="libc6"
+echo -n "extra:Built-Using=" >> debian/tsocks.substvars
+for package in $EXTRA_PACKAGES; do
+  dpkg-query -f '${source:Package} (= ${source:Version}), ' -W $package 2>/dev/null
+done >> debian/tsocks.substvars
+echo >> debian/tsocks.substvars

Reply via email to