[Pkg-gnupg-commit] r16 - in /gnupg/branches/experimental/debian: ./ patches/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Wed May 21 23:15:36 UTC 2008
Author: dleidert-guest
Date: Wed May 21 23:15:36 2008
New Revision: 16
URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=16
Log:
* debian/compat: Added to define debhelper compat level 5.
* debian/control: Added XC-Package-Type for udebs.
(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/preinst: Renamed to debian/gnupg.preinst. Added DEBHELPER token.
* debian/rules: Complete rewrite using debhelper.
* debian/patches/25_de.po_fixes.dpatch: Updated.
* debian/patches/28_multiple_message.dpatch: Dropped (applied 1.4.7).
* debian/patches/99_yat2m_fix_samp_handling.dpatch: Added.
- doc/yat2m.c: Backport two fixes from the upstream SVN regarding the
correct handling of backslahes and fixing the samples output format
avoiding man-db warnings.
* debian/patches/00list: Adjusted.
* debian/patches/15_free_caps.dpatch: Fixed shebang for current dpatch.
* debian/patches/16_min_privileges.dpatch: Ditto.
* debian/patches/24_gpgv_manpage_cleanup.dpatch: Ditto.
Added:
gnupg/branches/experimental/debian/compat
gnupg/branches/experimental/debian/gnupg-udeb.install
gnupg/branches/experimental/debian/gnupg.dirs
gnupg/branches/experimental/debian/gnupg.docs
gnupg/branches/experimental/debian/gnupg.links
gnupg/branches/experimental/debian/gnupg.manpages
gnupg/branches/experimental/debian/gnupg.preinst
- copied, changed from r6, gnupg/branches/experimental/debian/preinst
gnupg/branches/experimental/debian/gpgv-udeb.install
gnupg/branches/experimental/debian/gpgv.files
gnupg/branches/experimental/debian/patches/99_yat2m_fix_samp_handling.dpatch (with props)
Removed:
gnupg/branches/experimental/debian/patches/28_multiple_message.dpatch
gnupg/branches/experimental/debian/preinst
Modified:
gnupg/branches/experimental/debian/TODO
gnupg/branches/experimental/debian/changelog
gnupg/branches/experimental/debian/control
gnupg/branches/experimental/debian/patches/00list
gnupg/branches/experimental/debian/patches/15_free_caps.dpatch
gnupg/branches/experimental/debian/patches/16_min_privileges.dpatch
gnupg/branches/experimental/debian/patches/24_gpgv_manpage_cleanup.dpatch
gnupg/branches/experimental/debian/patches/25_de.po_fixes.dpatch
gnupg/branches/experimental/debian/rules
Modified: gnupg/branches/experimental/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/TODO?rev=16&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/TODO (original)
+++ gnupg/branches/experimental/debian/TODO Wed May 21 23:15:36 2008
@@ -25,7 +25,13 @@
* check for ldap to be put in recommends (#399167)
-* 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)
+* 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)
* check for compliance with version 3.7.3 of the policy!
Modified: gnupg/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/changelog?rev=16&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/changelog (original)
+++ gnupg/branches/experimental/debian/changelog Wed May 21 23:15:36 2008
@@ -8,12 +8,30 @@
- Decrypt multiple files and not just the first (closes: #431828).
[ Daniel Leidert ]
- * debian/control: Added Homepage field.
+ * debian/compat: Added to define debhelper compat level 5.
+ * debian/control: Added Homepage field. Added XC-Package-Type for udebs.
(Standards-Version): Updated to latest 3.7.3.
+ (Build-Depends): Added debhelper v5.
(binary-arch): Install the added gpg-zip.1 manpage.
+ * 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/gpg-zip.1: Added (closes: #399092). Thanks to Colin Tuckley.
+ * debian/preinst: Renamed to debian/gnupg.preinst. Added DEBHELPER token.
+ * debian/rules: Complete rewrite using debhelper.
* debian/watch: Added.
* debian/README.Debian: Make lintian happy (/usr/doc transition).
+ * debian/patches/25_de.po_fixes.dpatch: Updated.
+ * debian/patches/28_multiple_message.dpatch: Dropped (applied 1.4.7).
+ * debian/patches/99_yat2m_fix_samp_handling.dpatch: Added.
+ - doc/yat2m.c: Backport two fixes from the upstream SVN regarding the
+ correct handling of backslahes and fixing the samples output format
+ avoiding man-db warnings.
+ * debian/patches/00list: Adjusted.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Tue, 20 May 2008 18:49:47 +0200
Added: gnupg/branches/experimental/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/compat?rev=16&op=file
==============================================================================
--- gnupg/branches/experimental/debian/compat (added)
+++ gnupg/branches/experimental/debian/compat Wed May 21 23:15:36 2008
@@ -1,0 +1,1 @@
+5
Modified: gnupg/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/control?rev=16&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/control (original)
+++ gnupg/branches/experimental/debian/control Wed May 21 23:15:36 2008
@@ -3,7 +3,7 @@
Priority: important
Maintainer: Sune Vuorela <debian at pusling.com>
Standards-Version: 3.7.3
-Build-Depends: libz-dev, libldap2-dev, libbz2-dev,
+Build-Depends: debhelper (>> 5), libz-dev, libldap2-dev, libbz2-dev,
libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libusb-dev,
libreadline5-dev, file, gettext, dpatch, dpkg-dev (>= 1.13.12)
Homepage: http://www.gnupg.org
@@ -39,6 +39,7 @@
make the signature are trustworthy.
Package: gnupg-udeb
+XC-Package-Type: udeb
Section: debian-installer
Priority: extra
Architecture: any
@@ -52,6 +53,7 @@
This is GnuPG packaged in minimal form for use in debian-installer.
Package: gpgv-udeb
+XC-Package-Type: udeb
Section: debian-installer
Priority: extra
Architecture: any
Added: gnupg/branches/experimental/debian/gnupg-udeb.install
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gnupg-udeb.install?rev=16&op=file
==============================================================================
--- gnupg/branches/experimental/debian/gnupg-udeb.install (added)
+++ gnupg/branches/experimental/debian/gnupg-udeb.install Wed May 21 23:15:36 2008
@@ -1,0 +1,1 @@
+gpg usr/bin/
Added: gnupg/branches/experimental/debian/gnupg.dirs
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gnupg.dirs?rev=16&op=file
==============================================================================
--- gnupg/branches/experimental/debian/gnupg.dirs (added)
+++ gnupg/branches/experimental/debian/gnupg.dirs Wed May 21 23:15:36 2008
@@ -1,0 +1,2 @@
+usr/share/doc/gnupg
+usr/share/man/ru/man1
Added: gnupg/branches/experimental/debian/gnupg.docs
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gnupg.docs?rev=16&op=file
==============================================================================
--- gnupg/branches/experimental/debian/gnupg.docs (added)
+++ gnupg/branches/experimental/debian/gnupg.docs Wed May 21 23:15:36 2008
@@ -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/branches/experimental/debian/gnupg.links
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gnupg.links?rev=16&op=file
==============================================================================
--- gnupg/branches/experimental/debian/gnupg.links (added)
+++ gnupg/branches/experimental/debian/gnupg.links Wed May 21 23:15:36 2008
@@ -1,0 +1,1 @@
+usr/share/doc/gnupg/changelog.g10.gz usr/share/doc/gnupg/changelog.gz
Added: gnupg/branches/experimental/debian/gnupg.manpages
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gnupg.manpages?rev=16&op=file
==============================================================================
--- gnupg/branches/experimental/debian/gnupg.manpages (added)
+++ gnupg/branches/experimental/debian/gnupg.manpages Wed May 21 23:15:36 2008
@@ -1,0 +1,4 @@
+debian/gpg-convert-from-106.1
+debian/gpgsplit.1
+debian/lspgpot.1
+debian/gpg-zip.1
Copied: gnupg/branches/experimental/debian/gnupg.preinst (from r6, gnupg/branches/experimental/debian/preinst)
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gnupg.preinst?rev=16&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/preinst (original)
+++ gnupg/branches/experimental/debian/gnupg.preinst Wed May 21 23:15:36 2008
@@ -42,6 +42,8 @@
fi;
fi;
;;
- abort-upgrade)
- ;;
esac
+
+#DEBHELPER#
+
+exit 0
Added: gnupg/branches/experimental/debian/gpgv-udeb.install
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gpgv-udeb.install?rev=16&op=file
==============================================================================
--- gnupg/branches/experimental/debian/gpgv-udeb.install (added)
+++ gnupg/branches/experimental/debian/gpgv-udeb.install Wed May 21 23:15:36 2008
@@ -1,0 +1,1 @@
+gpgv usr/bin/
Added: gnupg/branches/experimental/debian/gpgv.files
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gpgv.files?rev=16&op=file
==============================================================================
--- gnupg/branches/experimental/debian/gpgv.files (added)
+++ gnupg/branches/experimental/debian/gpgv.files Wed May 21 23:15:36 2008
@@ -1,0 +1,2 @@
+usr/bin/gpgv
+usr/share/man/man1/gpgv.1
Modified: gnupg/branches/experimental/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/patches/00list?rev=16&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/patches/00list (original)
+++ gnupg/branches/experimental/debian/patches/00list Wed May 21 23:15:36 2008
@@ -2,4 +2,4 @@
16_min_privileges
24_gpgv_manpage_cleanup
25_de.po_fixes
-28_multiple_message
+99_yat2m_fix_samp_handling
Modified: gnupg/branches/experimental/debian/patches/15_free_caps.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/patches/15_free_caps.dpatch?rev=16&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/patches/15_free_caps.dpatch (original)
+++ gnupg/branches/experimental/debian/patches/15_free_caps.dpatch Wed May 21 23:15:36 2008
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
## 15_free_caps.dpatch by <mpitt at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
@@ -7,24 +7,6 @@
## DP: Please note that this approach alone is not safe: when using
## DP: USE_CAPABILITIES the root user is not setuid() back any more to a normal
## DP: user.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
@DPATCH@
diff -urNad /home/weasel/tmp/debian-gpg/gnupg-1.2.5/g10/status.c gnupg-1.2.5/g10/status.c
Modified: gnupg/branches/experimental/debian/patches/16_min_privileges.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/patches/16_min_privileges.dpatch?rev=16&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/patches/16_min_privileges.dpatch (original)
+++ gnupg/branches/experimental/debian/patches/16_min_privileges.dpatch Wed May 21 23:15:36 2008
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
## 16_min_privileges.dpatch by <mpitt at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
@@ -7,24 +7,6 @@
## DP: exec(). This patch ensures minimal privileges by immediately revoking
## DP: root user and all capabilities except CAP_IPC_LOCK. After the shared
## DP: memory is set up, this last capability is dropped as well.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
@DPATCH@
diff -urNad gnupg-1.4.0/g10/gpg.c /tmp/dpep.O5S02c/gnupg-1.4.0/g10/gpg.c
Modified: gnupg/branches/experimental/debian/patches/24_gpgv_manpage_cleanup.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/patches/24_gpgv_manpage_cleanup.dpatch?rev=16&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/patches/24_gpgv_manpage_cleanup.dpatch (original)
+++ gnupg/branches/experimental/debian/patches/24_gpgv_manpage_cleanup.dpatch Wed May 21 23:15:36 2008
@@ -1,28 +1,11 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
## 24_gpgv_manpage_cleanup.dpatch
##
## DP: Description: Small fixes for gpgv manpage (#177951)
## DP: Author: "Jim W. Jaszewski" <grok at sprint.ca>
-## DP: Upstream status: Not yet submitted
+## DP: Upstream status: https://bugs.g10code.com/gnupg/issue917
+## DP: Upstream status: https://bugs.g10code.com/gnupg/issue918
## DP: Date: 2003-01-22
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
@DPATCH@
diff -urNad gnupg-1.4.6~/doc/gpgv.texi gnupg-1.4.6/doc/gpgv.texi
Modified: gnupg/branches/experimental/debian/patches/25_de.po_fixes.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/patches/25_de.po_fixes.dpatch?rev=16&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/patches/25_de.po_fixes.dpatch (original)
+++ gnupg/branches/experimental/debian/patches/25_de.po_fixes.dpatch Wed May 21 23:15:36 2008
@@ -1,195 +1,172 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
## 25_de.po_fixes.dpatch
##
## DP: Description: Small fixes for the German translation (#314069)
## DP: Author: Jens Seidel <jensseidel at users.sf.net>
-## DP: Upstream status: Not yet submitted
-## DP: Date: 2005-06-14
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
+## DP: Updates by Daniel Leidert <daniel.leidert at wgdd.de>
+## DP: Upstream status: https://bugs.g10code.com/gnupg/issue916
+## DP: Date: 2008-05-21
@DPATCH@
-diff -urNad gnupg-1.4.5~/po/de.po gnupg-1.4.5/po/de.po
---- gnupg-1.4.5~/po/de.po 2006-08-01 12:08:06.000000000 +0100
-+++ gnupg-1.4.5/po/de.po 2006-08-01 21:50:19.000000000 +0100
-@@ -1241,7 +1241,7 @@
+diff -urNad experimental~/po/de.po experimental/po/de.po
+--- experimental~/po/de.po 2008-03-25 09:53:06.000000000 +0100
++++ experimental/po/de.po 2008-05-21 22:43:35.000000000 +0200
+@@ -1248,7 +1248,7 @@
- #: g10/gpg.c:791
+ #: g10/gpg.c:803
msgid "Pubkey: "
--msgstr "Öff.Schlüssel: "
-+msgstr "Öff. Schlüssel: "
+-msgstr "Öff.Schlüssel: "
++msgstr "Öff. Schlüssel: "
- #: g10/gpg.c:797 g10/keyedit.c:2310
+ #: g10/gpg.c:809 g10/keyedit.c:2306
msgid "Cipher: "
-@@ -2330,7 +2330,7 @@
- #: g10/import.c:319
+@@ -2350,7 +2350,7 @@
+ #: g10/import.c:318
#, c-format
msgid " secret keys unchanged: %lu\n"
--msgstr " unveränderte geh.Schl.: %lu\n"
-+msgstr " unveränderte geh. Schl.: %lu\n"
+-msgstr " unveränderte geh.Schl.: %lu\n"
++msgstr " unveränderte geh. Schl.: %lu\n"
- #: g10/import.c:321
+ #: g10/import.c:320
#, c-format
-@@ -3388,11 +3388,11 @@
+@@ -2400,7 +2400,7 @@
+ #: g10/import.c:645
+ msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+ msgstr ""
+-"diesen Schüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
++"diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
+ "Verfahrenskombinationen zu vermeiden\n"
- #: g10/keyedit.c:2035
+ #: g10/import.c:669
+@@ -3029,7 +3029,7 @@
+ #: g10/keyedit.c:1124
+ msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+ msgstr ""
+-"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schüsselelemente- keine "
++"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- keine "
+ "Passphrase ist zu ändern.\n"
+
+ #: g10/keyedit.c:1135 g10/keygen.c:3226
+@@ -3275,7 +3275,7 @@
+
+ #: g10/keyedit.c:1751
+ msgid "Really sign all user IDs? (y/N) "
+-msgstr "Wirklich alle User-IDs beglaubigen? "
++msgstr "Wirklich alle User-IDs beglaubigen? (j/N) "
+
+ #: g10/keyedit.c:1758
+ msgid "Hint: Select the user IDs to sign\n"
+@@ -3351,15 +3351,15 @@
+
+ #: g10/keyedit.c:2020
+ msgid "Do you really want to revoke the entire key? (y/N) "
+-msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? "
++msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? (j/N) "
+
+ #: g10/keyedit.c:2031
msgid "Do you really want to revoke the selected subkeys? (y/N) "
--msgstr "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? "
-+msgstr "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) "
+-msgstr "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? "
++msgstr "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) "
- #: g10/keyedit.c:2037
+ #: g10/keyedit.c:2033
msgid "Do you really want to revoke this subkey? (y/N) "
--msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? "
-+msgstr "Möchten Sie diesen Unterschlüssel wirklich widerrufen? (j/N) "
+-msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? "
++msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? (j/N) "
- #: g10/keyedit.c:2087
- msgid ""
-@@ -3568,7 +3568,7 @@
+ #: g10/keyedit.c:2083
+ msgid "Owner trust may not be set while using a user provided trust database\n"
+@@ -3383,11 +3383,11 @@
- #: g10/keyedit.c:3022
+ #: g10/keyedit.c:2201
+ msgid "Save changes? (y/N) "
+-msgstr "Änderungen speichern? "
++msgstr "Änderungen speichern? (j/N) "
+
+ #: g10/keyedit.c:2204
+ msgid "Quit without saving? (y/N) "
+-msgstr "Beenden ohne zu speichern? "
++msgstr "Beenden ohne zu speichern? (j/N) "
+
+ #: g10/keyedit.c:2214
+ #, c-format
+@@ -3531,7 +3531,7 @@
+
+ #: g10/keyedit.c:3018
msgid "You may not add a photo ID to a PGP2-style key.\n"
--msgstr "Sie können einem PGP2-artigen SchlüÂüsel keine Foto-ID hinzufügen.\n"
-+msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n"
+-msgstr "Sie können einem PGP2-artigen SchlüÂüsel keine Foto-ID hinzufügen.\n"
++msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n"
- #: g10/keyedit.c:3162
+ #: g10/keyedit.c:3158
msgid "Delete this good signature? (y/N/q)"
-@@ -3622,7 +3622,7 @@
- #: g10/keyedit.c:3352
+@@ -3605,7 +3605,7 @@
+ #: g10/keyedit.c:3353
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
--"Sie können einem PGP2-artigen SchlüÂüsel keine vorgesehenen Widerrufer "
-+"Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer "
- "hinzufügen.\n"
+-"Sie können einem PGP2-artigen SchlüÂüsel keine vorgesehenen Widerrufer "
++"Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer "
+ "hinzufügen.\n"
- #: g10/keyedit.c:3372
-@@ -5034,7 +5034,7 @@
- "Wählen Sie ein Bild für Ihre Photo ID aus. Das Bild muß eine JPEG Datei\n"
- "sein. Bitte beachten Sie, daß das Bild in Ihrem öffentlichen\n"
- "Schlüssel gespeichert wird. Wenn Sie ein sehr großes Bild benutzen,\n"
--"wir Ihr Schlüssel leider auch sehr groß werden. Ein Bild der GröÂße\n"
-+"wir Ihr Schlüssel leider auch sehr groß werden. Ein Bild der Größe\n"
+ #: g10/keyedit.c:3373
+@@ -5013,7 +5013,7 @@
+ "Wählen Sie ein Bild für Ihre Foto-ID aus. Das Bild muß eine JPEG-Datei\n"
+ "sein. Bitte beachten Sie, daß das Bild in Ihrem öffentlichen\n"
+ "Schlüssel gespeichert wird. Wenn Sie ein sehr großes Bild benutzen,\n"
+-"wir Ihr Schlüssel leider auch sehr groß werden. Ein Bild der GröÂße\n"
++"wir Ihr Schlüssel leider auch sehr groß werden. Ein Bild der Größe\n"
"240x288 Pixel ist eine gute Wahl.\n"
- #: g10/photoid.c:95
-@@ -5406,7 +5406,7 @@
- #: g10/pubkey-enc.c:244
+ #: g10/photoid.c:93
+@@ -5374,7 +5374,7 @@
+ #: g10/pubkey-enc.c:242
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
--msgstr "Verschüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
-+msgstr "Verschlüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
+-msgstr "Verschüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
++msgstr "Verschlüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
- #: g10/pubkey-enc.c:282
- #, fuzzy, c-format
-@@ -5504,7 +5504,7 @@
+ #: g10/pubkey-enc.c:280
+ #, c-format
+@@ -5473,7 +5473,7 @@
msgstr ""
"Widerrufszertifikat wurde erzeugt.\n"
"\n"
-"Bitte speichern Sie es auf einem Medium welches sie wegschliessen\n"
-+"Bitte speichern Sie es auf einem Medium welches sie wegschließen\n"
- "können; falls Mallory (ein Angreifer) Zugang zu diesem Zertifikat\n"
- "erhält, kann erIhren Schlüssel unbrauchbar machen. Es wäre klug,\n"
++"Bitte speichern Sie es auf einem Medium welches sie wegschließen\n"
+ "können; falls Mallory (ein Angreifer) Zugang zu diesem Zertifikat\n"
+ "erhält, kann erIhren Schlüssel unbrauchbar machen. Es wäre klug,\n"
"dieses Widerrufszertifikat auch auszudrucken und sicher aufzubewahren,\n"
-@@ -5588,7 +5588,7 @@
+@@ -5556,7 +5556,7 @@
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
- "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlüssels für "
--"sym.Verschlüsselung nicht vermieden werden!\n"
-+"sym. Verschlüsselung nicht vermieden werden!\n"
+ "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlüssels für "
+-"sym.Verschlüsselung nicht vermieden werden!\n"
++"sym. Verschlüsselung nicht vermieden werden!\n"
- #: g10/seskey.c:222
+ #: g10/seskey.c:218
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
-@@ -6133,7 +6133,7 @@
- #, fuzzy, c-format
+@@ -6066,7 +6066,7 @@
+ #, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
--"öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %08lX nicht gefunden\n"
-+"öff. Schlüssel des uneingeschränkt vertrautem Schlüssel %08lX nicht gefunden\n"
+-"öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n"
++"öff. Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n"
- #: g10/trustdb.c:2197
+ #: g10/trustdb.c:2270
#, c-format
-@@ -6190,7 +6190,7 @@
+@@ -6125,7 +6125,7 @@
- #: util/errors.c:60
+ #: util/errors.c:58
msgid "bad public key"
--msgstr "Falscher öffentlicher Schüssel"
-+msgstr "Falscher öffentlicher Schlüssel"
+-msgstr "Falscher öffentlicher Schüssel"
++msgstr "Falscher öffentlicher Schlüssel"
- #: util/errors.c:61
+ #: util/errors.c:59
msgid "bad secret key"
-@@ -6366,7 +6366,7 @@
+@@ -6301,7 +6301,7 @@
- #: util/errors.c:106
+ #: util/errors.c:104
msgid "unusable public key"
--msgstr "unbrauchbarer öffentlicher Schüssel"
-+msgstr "unbrauchbarer öffentlicher Schlüssel"
+-msgstr "unbrauchbarer öffentlicher Schüssel"
++msgstr "unbrauchbarer öffentlicher Schlüssel"
- #: util/errors.c:107
+ #: util/errors.c:105
msgid "unusable secret key"
-@@ -6775,7 +6775,7 @@
- #~ "Es wird ein neues %s Schlüsselpaar erzeugt.\n"
- #~ " kleinste Schlüssellänge ist 768 Bit\n"
- #~ " standard Schlüssellänge ist 1024 Bit\n"
--#~ " gröÂßte sinnvolle Schlüssellänge ist 2048 Bit\n"
-+#~ " größte sinnvolle Schlüssellänge ist 2048 Bit\n"
-
- #~ msgid "DSA only allows keysizes from 512 to 1024\n"
- #~ msgstr "DSA erlaubt nur Schlüssellängen von 512 bis 1024\n"
-@@ -6787,13 +6787,13 @@
- #~ msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n"
-
- #~ msgid "keysize too large; %d is largest value allowed.\n"
--#~ msgstr "SchüsselgröÂße zu hoch; %d ist der Maximalwert.\n"
-+#~ msgstr "Schlüsselgröße zu hoch; %d ist der Maximalwert.\n"
-
- #~ msgid ""
- #~ "Keysizes larger than 2048 are not suggested because\n"
- #~ "computations take REALLY long!\n"
- #~ msgstr ""
--#~ "Schlüssellängen gröÂßer als 2048 werden nicht empfohlen, da die\n"
-+#~ "Schlüssellängen größer als 2048 werden nicht empfohlen, da die\n"
- #~ "Berechnungen dann WIRKLICH lange brauchen!\n"
-
- #, fuzzy
-@@ -7136,7 +7136,7 @@
- #~ msgstr "zu viele `%c' Voreinstellungen\n"
-
- #~ msgid "key %08lX: not a rfc2440 key - skipped\n"
--#~ msgstr "Schlüssel %08lX: dies ist kein RFC2440-Schüssel - übersprungen\n"
-+#~ msgstr "Schlüssel %08lX: dies ist kein RFC2440-Schlüssel - übersprungen\n"
-
- #~ msgid ""
- #~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
-@@ -7292,7 +7292,7 @@
- #~ msgstr ""
- #~ "Dieses Verfahren wird nur von GnuPG unterstützt. Sie können diesen "
- #~ "Schlüssel\n"
--#~ "nicht zur Verständigung mit PGP-Anwendern benutzen. Ausserdem ist "
-+#~ "nicht zur Verständigung mit PGP-Anwendern benutzen. Außerdem ist "
- #~ "dieses\n"
- #~ "Verfahren sehr langsam, und es könnte nicht so sicher wie die anderen "
- #~ "sein.\n"
-@@ -7603,7 +7603,7 @@
-
- #~ msgid "Do you really want to create a sign and encrypt key? "
- #~ msgstr ""
--#~ "Möchten Sie wirklich einen Unterschriften-/Verschlüsselungschlüssel "
-+#~ "Möchten Sie wirklich einen Unterschriften-/Verschlüsselungsschlüssel "
- #~ "erzeugen? "
-
- #~ msgid "%s: user not found: %s\n"
Added: gnupg/branches/experimental/debian/patches/99_yat2m_fix_samp_handling.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/patches/99_yat2m_fix_samp_handling.dpatch?rev=16&op=file
==============================================================================
--- gnupg/branches/experimental/debian/patches/99_yat2m_fix_samp_handling.dpatch (added)
+++ gnupg/branches/experimental/debian/patches/99_yat2m_fix_samp_handling.dpatch Wed May 21 23:15:36 2008
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_yat2m_fix_samp_handling.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a bug in the @samp{} handling. Leading to "warning: `foo'' not
+## DP: defines. Further use a fix from upstream to handle backslashes
+## DP: correctly (#4734, #4735).
+## DP:
+## DP: <URL:https://bugs.g10code.com/gnupg/issue898>
+
+ at DPATCH@
+diff -urNad experimental~/doc/yat2m.c experimental/doc/yat2m.c
+--- experimental~/doc/yat2m.c 2007-12-12 19:40:17.000000000 +0100
++++ experimental/doc/yat2m.c 2008-05-22 00:45:24.000000000 +0200
+@@ -449,7 +449,7 @@
+ { "code", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+- { "samp", 0, "'", "'" },
++ { "samp", 0, "\\(aq", "\\(aq'" },
+ { "file", 0, "`\\fI","\\fR'" },
+ { "env", 0, "`\\fI","\\fR'" },
+ { "acronym", 0 },
+@@ -675,6 +675,8 @@
+ }
+ *eol_action = 0;
+ }
++ else if (*s == '\\')
++ fputs ("\\\\", fp);
+ else
+ putc (*s, fp);
+ }
Propchange: gnupg/branches/experimental/debian/patches/99_yat2m_fix_samp_handling.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: gnupg/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/rules?rev=16&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/rules (original)
+++ gnupg/branches/experimental/debian/rules Wed May 21 23:15:36 2008
@@ -9,173 +9,107 @@
# 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
+################################### configure ################################
-install_dir=install -d -m 755
-install_file=install -m 644
-install_script=install -m 755
-install_binary=install -m 755 -s
+build-deb/config.status:
+ dh_testdir
+ (mkdir -p $(@D); cd $(@D); \
+ ../configure $(CONFARGS) $(HOSTARG))
-VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+build-udeb/config.status:
+ dh_testdir
+ (mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
+ ../configure $(CONFARGS) $(HOSTARG) --without-bzip2 --without-readline)
-include /usr/share/dpatch/dpatch.make
+##################################### build ##################################
-build-deb-stamp: patch-stamp
- $(checkdir)
- mkdir -p build-deb
- cd build-deb && ../configure $(CONFARGS) $(HOSTARG)
- $(MAKE) -C build-deb
+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
+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
- -$(MAKE) -C build-deb -i distclean || $(MAKE) -C build-deb -f Makefile.in distclean
- -$(MAKE) -C build-udeb -i distclean || $(MAKE) -C build-udeb -f Makefile.in distclean
- -rm -rf build-deb build-udeb debian/gpgv-udeb debian/gnupg-udeb debian/gpgv
- -rm -rf debian/tmp debian/patched debian/files* debian/*substvars
- find . -name \*~ | xargs rm -vf
+ dh_testdir
+ dh_testroot
+ rm -rf build-udeb/ build-deb/
+ rm -rf debian/tmp-udeb/
+ # 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
+ # rm debian/tmp/usr/share/info/*
+ : # 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
+ sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/gnupg/usr/bin/lspgpot
+ sed -e "s#../g10/gpg#gpg#" < tools/convert-from-106 > debian/gnupg/usr/bin/gpg-convert-from-106
+ sed -e "s#/usr/local/#/usr/#" -i debian/gnupg/usr/share/man/man1/gpg.1
+ find debian/gnupg/ -type d -empty | xargs rmdir
- : # gnupg
- -rm -rf debian/tmp
- $(install_dir) debian/tmp/DEBIAN/
- $(install_script) debian/preinst debian/tmp/DEBIAN/
- $(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/lspgpot.1 debian/gpg-zip.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) debian/README.Debian 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_install -pgnupg-udeb -pgpgv-udeb --sourcedir=build-udeb/g10
+ dh_movefiles -pgpgv --sourcedir=debian/gnupg
+ dh_movefiles -pgpgv-udeb --sourcedir=debian/gnupg-udeb
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps -l $(CURDIR)/debian/libexpat1/usr/lib:$(CURDIR)/debian/lib64expat1/usr/lib64
+ 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
- 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
- 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/
- 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/
- 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