[Pkg-gnupg-commit] r201 - in /gnupg/trunk/debian: changelog control gpgv-win32.install rules
thijs at users.alioth.debian.org
thijs at users.alioth.debian.org
Tue Feb 15 21:25:42 UTC 2011
Author: thijs
Date: Tue Feb 15 21:25:30 2011
New Revision: 201
URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=201
Log:
committed r200 in the wrong branch
Added:
gnupg/trunk/debian/gpgv-win32.install
Modified:
gnupg/trunk/debian/changelog
gnupg/trunk/debian/control
gnupg/trunk/debian/rules
Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=201&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Tue Feb 15 21:25:30 2011
@@ -1,11 +1,13 @@
-gnupg (1.4.11-3) UNRELEASED; urgency=low
+gnupg (1.4.11-3) unstable; urgency=low
* Install gpg setuid root again on kFreeBSD. We dropped this
bit earlier because it's not necessary anymore on Linux, but
the kFreeBSD kernel still requires it for secure memory.
Thanks Robert Millan for the patch. (Closes: 598471)
-
- -- Thijs Kinkhorst <thijs at debian.org> Sat, 13 Nov 2010 17:16:46 +0100
+ * Add a gpgv-win32 package, to be used by win32-loader. Patch
+ from Didier Raboud (Closes: #612462).
+
+ -- Thijs Kinkhorst <thijs at debian.org> Tue, 15 Feb 2011 19:49:51 +0100
gnupg (1.4.11-2) experimental; urgency=low
Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=201&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Tue Feb 15 21:25:30 2011
@@ -10,6 +10,7 @@
libusb-dev [!hurd-i386],
libreadline-dev, file, gettext, dpatch,
libcurl4-gnutls-dev
+Build-Depends-Indep: mingw32
Homepage: http://www.gnupg.org
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnupg/gnupg/trunk/
@@ -96,3 +97,19 @@
.
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.
Added: gnupg/trunk/debian/gpgv-win32.install
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gpgv-win32.install?rev=201&op=file
==============================================================================
--- gnupg/trunk/debian/gpgv-win32.install (added)
+++ gnupg/trunk/debian/gpgv-win32.install Tue Feb 15 21:25:30 2011
@@ -1,0 +1,1 @@
+build-win32/g10/gpgv.exe usr/bin/
Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=201&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Tue Feb 15 21:25:30 2011
@@ -25,7 +25,7 @@
--enable-noexecstack
ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-CONFARGS += --host=$(DEB_HOST_GNU_TYPE)
+HOSTARG += --host=$(DEB_HOST_GNU_TYPE)
endif
ifeq ($(DEB_BUILD_ARCH),ppc64)
@@ -52,6 +52,12 @@
../configure $(CONFARGS) $(HOSTARG) \
--without-bzip2 --without-readline --without-libcurl)
+build-win32/config.status:
+ dh_testdir
+ (mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
+ ../configure $(CONFARGS) --host i586-mingw32msvc \
+ --disable-gnupg-iconv --without-bzip2 --without-readline --without-libcurl)
+
##################################### build ##################################
build-deb-stamp: patch-stamp build-deb/config.status
@@ -75,16 +81,22 @@
$(MAKE) -C build-udeb/
touch $@
+build-win32-stamp: patch-stamp build-win32/config.status
+ dh_testdir
+ $(MAKE) -C build-win32/
+ touch $@
+
build: build-deb-stamp build-deb-curl-stamp build-udeb-stamp
+build-indep: build-win32-stamp
##################################### clean ##################################
clean: unpatch
dh_testdir
dh_testroot
- rm -rf build-udeb/ build-deb-curl/ build-deb/
+ rm -rf build-udeb/ build-deb-curl/ build-deb/ build-win32/
# find . -name \*~ | xargs rm -vf
- dh_clean build-deb-stamp build-deb-curl-stamp build-udeb-stamp patch-stamp
+ dh_clean build-deb-stamp build-deb-curl-stamp build-udeb-stamp build-win32-stamp patch-stamp
#################################### install #################################
@@ -107,39 +119,53 @@
#################################### binary ##################################
-binary-indep: build install
+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
- dh_testroot
- dh_installchangelogs NEWS
+ dh_testdir -a
+ dh_testroot -a
+ dh_installchangelogs -a NEWS
# Do we want to ship these 100 of kB's changelogs?
for i in checks cipher doc g10 include keyserver mpi po tools util; do \
install -m 644 $$i/ChangeLog debian/gnupg/usr/share/doc/gnupg/changelog.$$i; \
done
install -m 644 ChangeLog debian/gnupg/usr/share/doc/gnupg/changelog.toplevel
install -m 644 keyserver/ChangeLog debian/gnupg-curl/usr/share/doc/gnupg-curl/changelog.keyserver
- dh_installdocs
- dh_installexamples
- dh_movefiles -pgpgv --sourcedir=debian/gnupg
- dh_install
- dh_installinfo doc/gnupg1.info
- dh_installman
- dh_installudev
- if which dh_bugfiles ; then dh_bugfiles ; fi
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_movefiles -a -pgpgv --sourcedir=debian/gnupg
+ dh_install -a
+ dh_installinfo -a doc/gnupg1.info
+ dh_installman -a
+ dh_installudev -a
+ if which dh_bugfiles ; then dh_bugfiles -a ; fi
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
# see http://www.gnupg.org/faq.html#q6.1
chown root:root debian/gnupg/usr/bin/gpg
chmod 4755 debian/gnupg/usr/bin/gpg
endif
- dh_installdeb
- dh_shlibdeps -X debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -- -dRecommends $(CURDIR)/debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -dDepends
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_installdeb -a
+ dh_shlibdeps -a -X debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -- -dRecommends $(CURDIR)/debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -dDepends
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-indep binary-arch
More information about the Pkg-gnupg-commit
mailing list