[Pkg-gnupg-commit] r92 - in /gnupg/trunk/debian: ./ patches/

thijs at users.alioth.debian.org thijs at users.alioth.debian.org
Mon Feb 16 18:09:45 UTC 2009


Author: thijs
Date: Mon Feb 16 18:09:45 2009
New Revision: 92

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=92
Log:
merge experimental branch back into trunk

Added:
    gnupg/trunk/debian/TODO
    gnupg/trunk/debian/compat
    gnupg/trunk/debian/gnupg-udeb.install
    gnupg/trunk/debian/gnupg.dirs
    gnupg/trunk/debian/gnupg.docs
    gnupg/trunk/debian/gnupg.examples
      - copied unchanged from r91, gnupg/branches/experimental/debian/gnupg.examples
    gnupg/trunk/debian/gnupg.install
      - copied unchanged from r91, gnupg/branches/experimental/debian/gnupg.install
    gnupg/trunk/debian/gnupg.links
    gnupg/trunk/debian/gnupg.manpages
    gnupg/trunk/debian/gpgv-udeb.install
    gnupg/trunk/debian/gpgv.files
      - copied unchanged from r91, gnupg/branches/experimental/debian/gpgv.files
Removed:
    gnupg/trunk/debian/gpg-convert-from-106.1
    gnupg/trunk/debian/patches/15_free_caps.dpatch
    gnupg/trunk/debian/patches/16_min_privileges.dpatch
Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/control
    gnupg/trunk/debian/patches/00list
    gnupg/trunk/debian/rules

Added: gnupg/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/TODO?rev=92&op=file
==============================================================================
--- gnupg/trunk/debian/TODO (added)
+++ gnupg/trunk/debian/TODO Mon Feb 16 18:09:45 2009
@@ -1,0 +1,56 @@
+TODO
+
+* fixed in older releases and  probably even not relevant in 1.4.x anymore (in
+  braces the upstream tracker item number):
+  
+  #113897: "Oops: lock already hold by us" when using --fast-import (not 100% sure)
+
+  the following I'm not 100% sure:
+  #166794,
+  #172823: --search leads to segfault
+
+
+* Ubuntu patches:
+
+  debian/patches/61_use_agent_default.dpatch: we should decide if used as default
+
+* discuss
+
+  - libcurl4-gnutls-dev build-dependency - seems to fix several issues
+    with the self-written Curl code (LP: #62864, applied-ubuntu since 1.4.6-2ubuntu3)
+
+  - if gpg should be put into /bin (#477671)
+
+  - if keyserver-options verbose should be default (#474569)
+
+  - if the libldap dependency can be downgraded to a recommended package (I'm
+    currently not in favour of this - #399167)
+
+  - why does gnupg depend on gpgv and can this perhaps be made less strong?
+
+general:
+
+
+==============================================================================
+
+
+* Close candidate (upstream rejected change):
+
+ #38857: gnupg: no way to copy a key
+ #61914: gnupg: confusing question in gpg key generation process (I cannot agree)
+ #93656: gnupg; No way to specify multiple keyservers? (#139)
+#162742: gnupg: Please handle "deprecated option honor-http-proxy"
+#173586: gnupg: Suggestion for a better error message
+#185782: `--batch --output existingfile' outputs nothing and exits 0
+#196681: gnupg: gpg says /dev/null at alea isn't a valid email address
+#290980: gnupg: 'gpg -q --verify' should be quiet on success (#919)
+#310805: gnupg: fully exportable armored homedir is completely impossible now!
+#318587: gnupg: should encrypt to all subkeys
+
+#300743: gnupg: Should not depend on libusb
+
+* Forward candidates (to at least get a feedback):
+
+ #58260,
+#317654: remove existing lockfiles ()
+

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=92&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Mon Feb 16 18:09:45 2009
@@ -1,3 +1,29 @@
+gnupg (1.4.9-4) unstable; urgency=low
+
+  [ Daniel Leidert (dale) ]
+  * debian/compat: Added to define debhelper compat level 5.
+  * debian/control: (Build-Depends): Added debhelper v5.
+  * debian/gnupg.dirs: Added for new debhelper-based debian/rules.
+  * debian/gnupg.docs: Ditto.
+  * debian/gnupg.links: Ditto.
+  * debian/gnupg.manpages: Ditto.
+  * debian/gnupg-udeb.install: Ditto.
+  * debian/gpgv.files: Ditto.
+  * debian/gpgv-udeb.install: Ditto.
+  * debian/rules: Complete rewrite using debhelper (closes: #437050, #430459).
+ 
+  [ Thijs Kinkhorst ]
+  * We don't install setuid root anymore, and have not even built
+    with capability support anyway in recent times. Drop libcap-dev
+    build-dependency and associated patches. (Closes: #492622).
+  * No longer install gpg-convert-from-106 in the path, but ship
+    this script to convert from GnuPG 1.0.6 and earlier as an
+    example.
+  * Add --disable-asm build flag on ppc64 architecture (Closes: #343434).
+  * Rephrase description on the subject of IDEA (Closes: #509853).
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Mon, 16 Feb 2009 18:35:15 +0100
+
 gnupg (1.4.9-3) unstable; urgency=low
 
   * Add Package-Type: udeb to μdebs.

Added: gnupg/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/compat?rev=92&op=file
==============================================================================
--- gnupg/trunk/debian/compat (added)
+++ gnupg/trunk/debian/compat Mon Feb 16 18:09:45 2009
@@ -1,0 +1,1 @@
+5

Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=92&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Mon Feb 16 18:09:45 2009
@@ -6,10 +6,9 @@
  Daniel Leidert (dale) <daniel.leidert at wgdd.de>,
  Thijs Kinkhorst <thijs at debian.org>
 Standards-Version: 3.8.0
-Build-Depends: libz-dev, libldap2-dev, libbz2-dev,
- libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+Build-Depends: debhelper (>> 5), libz-dev, libldap2-dev, libbz2-dev,
  libusb-dev [!hurd-i386],
- libreadline5-dev, file, gettext, dpatch, dpkg-dev (>= 1.13.12)
+ libreadline5-dev, file, gettext, dpatch
 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/
@@ -19,22 +18,21 @@
 Depends: ${shlibs:Depends}, gpgv
 Recommends: ${shlibs:Recommends}
 Suggests: gnupg-doc, xloadimage | imagemagick | eog, libpcsclite1
-Conflicts: seahorse (<< 2.22.2-2)
 Description: GNU privacy guard - a free PGP replacement
  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 RFC2440.
  .
- GnuPG does not use any patented algorithms so it cannot be compatible
- with PGP2 because it uses IDEA (which is patented worldwide).
+ GnuPG does not use any patented algorithms. This means it cannot be
+ compatible with PGP2, because that uses IDEA (which is patented in
+ a number of countries).
 
 Package: gpgv
 Architecture: any
 Priority: important
 Depends: ${shlibs:Depends}
 Suggests: gnupg
-Replaces: gnupg (<< 1.4.5-2)
 Description: GNU privacy guard - signature verification tool
  GnuPG is GNU's tool for secure communication and data storage.
  .

Added: gnupg/trunk/debian/gnupg-udeb.install
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gnupg-udeb.install?rev=92&op=file
==============================================================================
--- gnupg/trunk/debian/gnupg-udeb.install (added)
+++ gnupg/trunk/debian/gnupg-udeb.install Mon Feb 16 18:09:45 2009
@@ -1,0 +1,1 @@
+build-udeb/g10/gpg usr/bin/

Added: gnupg/trunk/debian/gnupg.dirs
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gnupg.dirs?rev=92&op=file
==============================================================================
--- gnupg/trunk/debian/gnupg.dirs (added)
+++ gnupg/trunk/debian/gnupg.dirs Mon Feb 16 18:09:45 2009
@@ -1,0 +1,2 @@
+usr/share/doc/gnupg
+usr/share/man/ru/man1

Added: gnupg/trunk/debian/gnupg.docs
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gnupg.docs?rev=92&op=file
==============================================================================
--- gnupg/trunk/debian/gnupg.docs (added)
+++ gnupg/trunk/debian/gnupg.docs Mon Feb 16 18:09:45 2009
@@ -1,0 +1,10 @@
+NEWS
+README
+THANKS
+TODO
+doc/DETAILS
+doc/FAQ
+doc/faq.html
+doc/highlights-1.4.txt
+doc/OpenPGP
+debian/Upgrading_From_PGP.txt

Added: gnupg/trunk/debian/gnupg.links
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gnupg.links?rev=92&op=file
==============================================================================
--- gnupg/trunk/debian/gnupg.links (added)
+++ gnupg/trunk/debian/gnupg.links Mon Feb 16 18:09:45 2009
@@ -1,0 +1,1 @@
+usr/share/doc/gnupg/changelog.g10.gz usr/share/doc/gnupg/changelog.gz

Added: gnupg/trunk/debian/gnupg.manpages
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gnupg.manpages?rev=92&op=file
==============================================================================
--- gnupg/trunk/debian/gnupg.manpages (added)
+++ gnupg/trunk/debian/gnupg.manpages Mon Feb 16 18:09:45 2009
@@ -1,0 +1,3 @@
+debian/gpgsplit.1
+debian/lspgpot.1
+debian/gpg-zip.1

Added: gnupg/trunk/debian/gpgv-udeb.install
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gpgv-udeb.install?rev=92&op=file
==============================================================================
--- gnupg/trunk/debian/gpgv-udeb.install (added)
+++ gnupg/trunk/debian/gpgv-udeb.install Mon Feb 16 18:09:45 2009
@@ -1,0 +1,1 @@
+build-udeb/g10/gpgv usr/bin/

Modified: gnupg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/00list?rev=92&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/00list (original)
+++ gnupg/trunk/debian/patches/00list Mon Feb 16 18:09:45 2009
@@ -1,5 +1,3 @@
-15_free_caps
-16_min_privileges
 24_gpgv_manpage_cleanup
 25_de.po_fixes
 25_it.po_fixes

Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=92&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Mon Feb 16 18:09:45 2009
@@ -9,192 +9,106 @@
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
 
-STRIP=strip --remove-section=.comment --remove-section=.note
+include /usr/share/dpatch/dpatch.make
+
+################################## variables #################################
+
+#VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
 
 DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_TYPE  = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_ARCH    := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+CONFARGS  = --prefix=/usr --libexecdir=/usr/lib/ --enable-mailto --with-mailprog=/usr/sbin/sendmail
+
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-HOSTARG = --host=$(DEB_HOST_GNU_TYPE)
+CONFARGS += --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-
-CONFARGS = --prefix=/usr --libexecdir=/usr/lib/ --enable-mailto --with-mailprog=/usr/sbin/sendmail
-
-install_dir=install -d -m 755
-install_file=install -m 644
-install_script=install -m 755
-install_binary=install -m 755
- 
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       install_binary += -s
+ifeq ($(DEB_BUILD_ARCH),ppc64)
+CONFARGS += --disable-asm
 endif
 
+################################### configure ################################
 
-VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+build-deb/config.status:
+	dh_testdir
+	(mkdir -p $(@D); cd $(@D); \
+	    ../configure $(CONFARGS) $(HOSTARG))
 
-include /usr/share/dpatch/dpatch.make
+build-udeb/config.status:
+	dh_testdir
+	(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
+	    ../configure $(CONFARGS) $(HOSTARG)  --without-bzip2 --without-readline)
 
-build-deb-stamp: patch-stamp
-	$(checkdir)
-	mkdir -p build-deb
-	cd build-deb && ../configure $(CONFARGS) $(HOSTARG)
-	$(MAKE) -C build-deb
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) -C build-deb check
+##################################### build ##################################
+
+build-deb-stamp: patch-stamp build-deb/config.status
+	dh_testdir
+	$(MAKE) -C build-deb/
+ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	make -C build-deb/checks check || exit 1
 endif
 	touch $@
 
-build-udeb-stamp: patch-stamp
-	$(checkdir)
-	mkdir -p build-udeb
-	cd build-udeb && CFLAGS='-g -Os' ../configure $(CONFARGS) $(HOSTARG) --without-bzip2 --without-readline
-	$(MAKE) -C build-udeb
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) -C build-udeb check
-endif
+build-udeb-stamp: patch-stamp build-udeb/config.status
+	dh_testdir
+	$(MAKE) -C build-udeb/
 	touch $@
 
 build: build-deb-stamp build-udeb-stamp
 
-test: build
-	$(checkdir)
-	make -C build-deb/checks check || exit 127
-	touch test
+##################################### clean ##################################
 
 clean: unpatch
-	$(checkdir)
-	rm -f build
-	rm -rf build-deb build-udeb debian/gpgv-udeb debian/gnupg-udeb debian/gpgv
-	rm -rf debian/tmp debian/patched debian/files* debian/*substvars
-	rm -f build-udeb-stamp build-deb-stamp
-	find . -name \*~ | xargs rm -vf
+	dh_testdir
+	dh_testroot
+	rm -rf build-udeb/ build-deb/
+	# find . -name \*~ | xargs rm -vf
+	dh_clean build-deb-stamp build-udeb-stamp patch-stamp
 
-binary-indep:
+#################################### install #################################
 
-binary-arch:	checkroot build # test
-	$(checkdir)
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) -C build-deb install DESTDIR=$(CURDIR)/debian/gnupg
+	: # Move localized manpages to FHS compliant locations
+	mv debian/gnupg/usr/share/man/man1/gpg.ru.1 debian/gnupg/usr/share/man/ru/man1/gpg.1
+	: # Remove from /usr/share/gnupg what we install into /usr/share/doc/gnupg/
+	rm -f debian/gnupg/usr/share/gnupg/FAQ \
+	      debian/gnupg/usr/share/gnupg/faq.html
+	find debian/gnupg/ -type d -empty | xargs rmdir
 
-	: # gnupg
-	rm -rf debian/tmp
-	$(MAKE) -C build-deb prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man libexecdir=`pwd`/debian/tmp/usr/lib/ mkinstalldirs=`pwd`/scripts/mkinstalldirs install
-	: # copies of the manpage which can't be grokked by install-info
-	rm debian/tmp/usr/share/info/*
-	find debian/tmp/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs $(STRIP)
-	chmod 755 debian/tmp/usr/bin/gpg
-	sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot
-	sed -e "s#../g10/gpg#gpg#" < tools/convert-from-106 > debian/tmp/usr/bin/gpg-convert-from-106
-	chmod 755 debian/tmp/usr/bin/lspgpot debian/tmp/usr/bin/gpg-convert-from-106
-	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/share/man/man1/gpg.1 \
-	    > debian/tmp/usr/share/man/man1/gpg.1.new
-	mv debian/tmp/usr/share/man/man1/gpg.1.new debian/tmp/usr/share/man/man1/gpg.1
-	$(install_file) debian/gpg-convert-from-106.1 debian/gpgsplit.1 debian/gpg-zip.1 \
-			debian/lspgpot.1 debian/tmp/usr/share/man/man1/
-	gzip -9v debian/tmp/usr/share/man/man*/*
-	: # Move localized manpages to FHS compliant locations
-	$(install_dir) debian/tmp/usr/share/man/ru/man1/
-	mv debian/tmp/usr/share/man/man1/gpg.ru.1.gz debian/tmp/usr/share/man/ru/man1/gpg.1.gz
-	: # Remove from /usr/share/gnupg what we install into /usr/share/doc/gnupg/
-	rm debian/tmp/usr/share/gnupg/FAQ debian/tmp/usr/share/gnupg/faq.html
-	$(install_dir) debian/tmp/usr/share/doc/gnupg/
-	$(install_file) debian/changelog debian/tmp/usr/share/doc/gnupg/changelog.Debian
-	$(install_file) README NEWS THANKS TODO doc/DETAILS \
-		doc/FAQ doc/faq.html doc/OpenPGP debian/Upgrading_From_PGP.txt \
-		doc/highlights-1.4.txt debian/tmp/usr/share/doc/gnupg/
+#################################### binary ##################################
+
+binary-indep: build install
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	# Maybe drop them and install NEWS as upstream changelog?
 	for i in po util mpi cipher tools g10 checks include; do \
-		$(install_file) $$i/ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.$$i; done
-	$(install_file) ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.toplevel
-	gzip -9v debian/tmp/usr/share/doc/gnupg/*
-	ln -s changelog.g10.gz debian/tmp/usr/share/doc/gnupg/changelog.gz
-	$(install_file) debian/copyright debian/tmp/usr/share/doc/gnupg/
+	    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
+	dh_installdocs
+	dh_installexamples
+	dh_movefiles -pgpgv --sourcedir=debian/gnupg
+	dh_install
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	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
 
-	: # in the gpgv package instead
-	rm debian/tmp/usr/bin/gpgv
-	rm debian/tmp/usr/share/man/man1/gpgv.1.gz
+binary: binary-indep binary-arch
 
-	find debian/tmp/ -type d -empty | xargs rmdir
-
-	#find debian/tmp/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps
-	find debian/tmp/ -path debian/tmp/usr/lib/gnupg/gpgkeys_ldap \
-		-or -type f -print | \
-		xargs file | grep ELF | cut -d: -f 1 | \
-		xargs dpkg-shlibdeps \
-		-dRecommends debian/tmp/usr/lib/gnupg/gpgkeys_ldap -dDepends
-	$(install_dir) debian/tmp/DEBIAN/
-	cd debian/tmp && find * -type f | grep -v DEBIAN | xargs md5sum > DEBIAN/md5sums
-	dpkg-gencontrol -pgnupg -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
-
-	: # gpgv
-	rm -rf debian/gpgv
-	$(install_dir) debian/gpgv/DEBIAN/ 
-
-	$(install_dir) debian/gpgv/usr/bin/
-	$(install_binary) build-udeb/g10/gpgv debian/gpgv/usr/bin/
-	$(STRIP) debian/gpgv/usr/bin/gpgv
-
-	$(install_dir) debian/gpgv/usr/share/man/man1/
-	$(install_file) build-deb/doc/gpgv.1 debian/gpgv/usr/share/man/man1/
-	gzip -9v debian/gpgv/usr/share/man/man*/*
-
-	$(install_dir) debian/gpgv/usr/share/doc/gpgv
-	$(install_file) debian/changelog debian/gpgv/usr/share/doc/gpgv/changelog.Debian
-	gzip -9v debian/gpgv/usr/share/doc/gpgv/*
-	$(install_file) debian/copyright debian/gpgv/usr/share/doc/gpgv/
-
-	find debian/gpgv/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps
-	cd debian/gpgv && find * -type f | grep -v DEBIAN | xargs md5sum > DEBIAN/md5sums
-	dpkg-gencontrol -pgpgv -Pdebian/gpgv -isp
-	chown -R root.root debian/gpgv
-	chmod -R go=rX debian/gpgv
-	dpkg --build debian/gpgv ..
-
-	: ### Udebs
-
-	: # gpgv-udeb
-	rm -rf debian/gpgv-udeb
-	$(install_dir) debian/gpgv-udeb/DEBIAN/ debian/gpgv-udeb/usr/bin/
-	$(install_binary) build-udeb/g10/gpgv debian/gpgv-udeb/usr/bin/
-	$(STRIP) debian/gpgv-udeb/usr/bin/gpgv
-	find debian/gpgv-udeb/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps -Tdebian/gpgv-udeb.substvars -tudeb
-
-	: # Don't let dpkg-gencontrol write incorrect guesses to debian/files.
-	: # Instead, register the udeb manually.
-	dpkg-gencontrol -pgpgv-udeb -Tdebian/gpgv-udeb.substvars -Pdebian/gpgv-udeb -isp -fdebian/files~
-	dpkg-distaddfile gpgv-udeb_$(VERSION)_$(DEB_BUILD_ARCH).udeb debian-installer extra
-
-	chown -R root.root debian/gpgv-udeb
-	chmod -R go=rX debian/gpgv-udeb
-	dpkg --build debian/gpgv-udeb ../gpgv-udeb_$(VERSION)_$(DEB_BUILD_ARCH).udeb
-
-	: # gnupg-udeb
-	rm -rf debian/gnupg-udeb
-	$(install_dir) debian/gnupg-udeb/DEBIAN/ debian/gnupg-udeb/usr/bin/
-	$(install_binary) build-udeb/g10/gpg debian/gnupg-udeb/usr/bin/
-	$(STRIP) debian/gnupg-udeb/usr/bin/gpg
-	find debian/gnupg-udeb/ -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps -Tdebian/gnupg-udeb.substvars -tudeb
-
-	: # Don't let dpkg-gencontrol write incorrect guesses to debian/files.
-	: # Instead, register the udeb manually.
-	dpkg-gencontrol -pgnupg-udeb -Tdebian/gnupg-udeb.substvars -Pdebian/gnupg-udeb -isp -fdebian/files~
-	dpkg-distaddfile gnupg-udeb_$(VERSION)_$(DEB_BUILD_ARCH).udeb debian-installer extra
-
-	chown -R root.root debian/gnupg-udeb
-	chmod -R go=rX debian/gnupg-udeb
-	dpkg --build debian/gnupg-udeb ../gnupg-udeb_$(VERSION)_$(DEB_BUILD_ARCH).udeb
-
-define checkdir
-	test -f g10/gpg.c && test -f debian/rules
-endef
-
-# Below here is fairly generic really
-
-binary: 	binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: build binary binary-arch binary-indep clean checkroot
+.PHONY: build binary binary-arch binary-indep clean




More information about the Pkg-gnupg-commit mailing list