[Pkg-gnupg-commit] [gnupg2] 01/01: prepare gpgv-static-udeb

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch gpgv-static-udeb
in repository gnupg2.

commit f6d38678c8053d74ac9a655fc7faf6fe21481ecf
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Mar 25 15:54:09 2016 -0400

    prepare gpgv-static-udeb
---
 debian/changelog                |  6 ++++++
 debian/clean                    |  1 +
 debian/control                  | 15 +++++++++++++++
 debian/gpgv-static-udeb.install |  1 +
 debian/rules                    |  5 +++++
 5 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4ff1b65..6055450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnupg2 (2.1.11-6+exp1) experimental; urgency=medium
+
+  * add gpgv-static-udeb for space-constrained installers
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Sun, 20 Mar 2016 19:12:22 -0400
+
 gnupg2 (2.1.11-6) unstable; urgency=medium
 
   * avoid FTBFS with patch from upstream (Closes: #814842)
diff --git a/debian/clean b/debian/clean
index fc12542..3092ac0 100644
--- a/debian/clean
+++ b/debian/clean
@@ -3,3 +3,4 @@ debian/gpg-check-pattern.1
 po/*.gmo
 po/stamp-po
 build-gpgv-udeb/
+build-gpgv-static-udeb/
diff --git a/debian/control b/debian/control
index 7280a80..cad2f44 100644
--- a/debian/control
+++ b/debian/control
@@ -148,3 +148,18 @@ Description: minimal signature verification tool
  .
  This is GnuPG's signature verification tool, gpgv, packaged in minimal
  form for use in debian-installer.
+
+Package: gpgv-static-udeb
+Package-Type: udeb
+Section: debian-installer
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: minimal signature verification tool (statically compiled)
+ GnuPG is GNU's tool for secure communication and data storage.
+ It can be used to encrypt data and to create digital signatures.
+ It includes an advanced key management facility and is compliant
+ with the proposed OpenPGP Internet standard as described in RFC 4880.
+ .
+ This is GnuPG's signature verification tool, gpgv built statically
+ and packaged in minimal form for use in debian-installer.
diff --git a/debian/gpgv-static-udeb.install b/debian/gpgv-static-udeb.install
new file mode 100644
index 0000000..d1b8181
--- /dev/null
+++ b/debian/gpgv-static-udeb.install
@@ -0,0 +1 @@
+build-gpgv-static-udeb/g10/gpgv usr/bin/
diff --git a/debian/rules b/debian/rules
index ccde094..4c0da0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,9 @@ GPGV_UDEB_UNNEEDED = gpgtar bzip2 gpgsm scdaemon dirmngr doc tofu exec ldap gnut
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build-gpgv-udeb -- \
 	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x))
+	LDFLAGS="-static $$(printf %s "$$LDFLAGS" | sed s/-pie//)" \
+		dh_auto_configure --builddirectory=build-gpgv-static-udeb -- \
+	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x))
 	dh_auto_configure -- --libexecdir=\$${prefix}/lib/gnupg2 \
 		--disable-gpgtar \
 		--enable-symcryptrun --enable-large-secmem
@@ -35,6 +38,8 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	dh_auto_build --builddirectory=build-gpgv-udeb
 	ln build-gpgv-udeb/g10/gpgv2 build-gpgv-udeb/g10/gpgv
+	dh_auto_build --builddirectory=build-gpgv-static-udeb
+	ln build-gpgv-static-udeb/g10/gpgv2 build-gpgv-static-udeb/g10/gpgv
 	dh_auto_build
 
 override_dh_shlibdeps:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git