[Pkg-gnupg-commit] [gnupg] 01/02: drop gpgv-win32, now handled by gnupg2 source package
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Apr 18 22:06:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg.
commit 186dfe4659bb3003fcc0a83abaf1eb7203cd95e8
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Thu Mar 31 09:37:53 2016 -0400
drop gpgv-win32, now handled by gnupg2 source package
---
debian/changelog | 6 ++++++
debian/control | 17 -----------------
debian/gpgv-win32.dirs | 1 -
debian/gpgv-win32.install | 1 -
debian/rules | 30 +++---------------------------
debian/tests/control | 2 --
debian/tests/gpgv-win32 | 28 ----------------------------
7 files changed, 9 insertions(+), 76 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dd9552c..f93c810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnupg (1.4.20-6) unstable; urgency=medium
+
+ * drop gpgv-win32, now handled by gnupg2 source package
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net> Mon, 18 Apr 2016 08:02:15 -0400
+
gnupg (1.4.20-5) unstable; urgency=medium
* use autoreconf
diff --git a/debian/control b/debian/control
index 7a8bbb5..e3c80c8 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: debhelper (>> 9),
libreadline-dev,
libusb-dev [!hurd-i386],
libz-dev
-Build-Depends-Indep: mingw-w64
XS-Testsuite: autopkgtest
Homepage: https://www.gnupg.org
Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-gnupg/gnupg.git
@@ -86,19 +85,3 @@ Description: minimal signature verification tool
.
This is GnuPG's signature verification tool, gpgv, packaged in minimal
form for use in debian-installer.
-
-Package: gpgv-win32
-Architecture: all
-Priority: extra
-Depends: ${misc:Depends}
-Suggests: wine
-Description: GNU privacy guard - signature verification tool (win32 build)
- GnuPG is GNU's tool for secure communication and data storage.
- .
- gpgv is a stripped-down version of gnupg which is only able to check
- signatures. It is smaller than the full-blown gnupg and uses a
- different (and simpler) way to check that the public keys used to
- make the signature are trustworthy.
- .
- This is a win32 version of gpgv. It's meant to be used by the win32-loader
- component of Debian-Installer.
diff --git a/debian/gpgv-win32.dirs b/debian/gpgv-win32.dirs
deleted file mode 100644
index 56f2ee8..0000000
--- a/debian/gpgv-win32.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/win32
diff --git a/debian/gpgv-win32.install b/debian/gpgv-win32.install
deleted file mode 100644
index 911a277..0000000
--- a/debian/gpgv-win32.install
+++ /dev/null
@@ -1 +0,0 @@
-build-win32/g10/gpgv.exe usr/share/win32/
diff --git a/debian/rules b/debian/rules
index 306a2b7..352df72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,12 +64,6 @@ build-udeb/config.status: debian/autoreconf.before
(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
../configure $(CONFARGS) $(CONFARGS_MINIMAL) $(HOSTARG) )
-build-win32/config.status: debian/autoreconf.before
- dh_testdir
- (mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
- LDFLAGS="-Xlinker --no-insert-timestamp" \
- ../configure $(CONFARGS) $(CONFARGS_MINIMAL) --build $(DEB_BUILD_GNU_TYPE) --host i686-w64-mingw32 )
-
##################################### build ##################################
build-deb-stamp: build-deb/config.status
@@ -96,14 +90,9 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
endif
touch $@
-build-win32-stamp: build-win32/config.status
- dh_testdir
- $(MAKE) -C build-win32/
- touch $@
-
build: build-arch
build-arch: build-deb-stamp build-deb-curl-stamp $(UDEB_BUILD_STAMP)
-build-indep: build-win32-stamp
+build-indep:
##################################### clean ##################################
@@ -111,9 +100,9 @@ clean:
dh_testdir
dh_testroot
dh_autoreconf_clean
- rm -rf build-udeb/ build-deb-curl/ build-deb/ build-win32/
+ rm -rf build-udeb/ build-deb-curl/ build-deb/
# find . -name \*~ | xargs rm -vf
- dh_clean build-deb-stamp build-deb-curl-stamp build-udeb-stamp build-win32-stamp
+ dh_clean build-deb-stamp build-deb-curl-stamp build-udeb-stamp
#################################### install #################################
@@ -135,19 +124,6 @@ install: build
#################################### binary ##################################
binary-indep: build-indep
- dh_testdir -i
- dh_testroot -i
- dh_installchangelogs -i NEWS
- dh_installdocs -i
- dh_install -i
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
binary-arch: build install
dh_testdir -a
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index cea1cf6..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests: gpgv-win32
-Depends: gpgv-win32, wine, wine32, gpg
diff --git a/debian/tests/gpgv-win32 b/debian/tests/gpgv-win32
deleted file mode 100644
index d00ece1..0000000
--- a/debian/tests/gpgv-win32
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-export GNUPGHOME=$(mktemp -d)
-
-# Generate a minimal signing key:
-gpg --batch --quick-random --gen-key <<EOF
- %echo Generating a basic OpenPGP key
- Key-Type: RSA
- Key-Length: 1024
- Key-Usage: sign
- Name-Real: Test key for gpgv-win32
- Name-Email: test-key at example.com
- Expire-Date: 2d
- %commit
- %echo done
-EOF
-
-# Sign this very script
-rm -f "${0}.gpg"
-gpg --output "${0}.gpg" --detach-sign "${0}"
-
-# Verify using gpgv
-gpgv --keyring "$GNUPGHOME/pubring.gpg" "${0}.gpg" "${0}"
-
-# Verify using gpgv.exe
-wine /usr/share/win32/gpgv.exe --keyring "Z:\\\\${GNUPGHOME}/pubring.gpg" "Z:\\\\$(pwd)/${0}.gpg" "Z:\\\\$(pwd)/${0}"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg.git
More information about the Pkg-gnupg-commit
mailing list