[Pkg-gnupg-commit] [gnupg2] 197/205: more cleanup related to upstream fixes

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 829ddfe92c4f0c737847e77d8205a8a4af7169af
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue May 10 21:15:44 2016 -0400

    more cleanup related to upstream fixes
---
 debian/rules | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 5e69db3..921bf41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,24 +32,22 @@ override_dh_auto_configure:
 
 override_dh_auto_build-arch:
 	dh_auto_build --builddirectory=build-gpgv-udeb
-	ln build-gpgv-udeb/g10/gpgv2 build-gpgv-udeb/g10/gpgv
 	dh_auto_build --builddirectory=build
 
 override_dh_auto_build-indep:
 	mkdir -p build-gpgv-win32
 	cd build-gpgv-win32 && $(WIN32_FLAGS) ../configure \
 	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x)) \
-		$(foreach x, libgpg-error libgcrypt libassuan libiconv ksba npth, --with-$x-prefix=/usr/i686-w64-mingw32) \
+		$(foreach x, libgpg-error libgcrypt libassuan ksba npth, --with-$x-prefix=/usr/i686-w64-mingw32) \
 		--enable-gpg2-is-gpg \
 		--with-zlib=/usr/i686-w64-mingw \
-		--without-libiconv-prefix \
 		--prefix=/usr/i686-w64-mingw32 \
 		--host i686-w64-mingw32
 	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libcommon.a
 	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libgpgrl.a
 	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libsimple-pwquery.a
 	cd build-gpgv-win32/kbx && $(WIN32_FLAGS) $(MAKE) libkeybox.a
-	cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv2.exe
+	cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv.exe
 
 override_dh_shlibdeps:
 # Make ldap a recommends rather than a hard dependency.

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