[Pkg-gnupg-commit] r21 - in /gnupg/branches/experimental/debian: changelog control patches/00list patches/25_fr.po_fixes.dpatch

Thu May 22 02:29:01 UTC 2008

Author: dleidert-guest
Date: Thu May 22 02:29:01 2008
New Revision: 21

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=21
Log:
* debian/control (Suggests): Added eog and imagemagick as alternatives to
  xloadimage (closes: #381419).
* debian/patches/25_fr.po_fixes.dpatch: Added.
  - po/fr.po: Fixed mileading translation (closes: #394037).
* debian/patches/00list: Adjusted.

* adding watch closes #450670
* forcemerged #412508 and #402958

Added:
    gnupg/branches/experimental/debian/patches/25_fr.po_fixes.dpatch   (with props)
Modified:
    gnupg/branches/experimental/debian/changelog
    gnupg/branches/experimental/debian/control
    gnupg/branches/experimental/debian/patches/00list

Modified: gnupg/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/changelog?rev=21&op=diff
==============================================================================

--- gnupg/branches/experimental/debian/changelog (original)
+++ gnupg/branches/experimental/debian/changelog Thu May 22 02:29:01 2008
@@ -3,8 +3,8 @@
   * New upstream release 1.4.9 (closes: #452118).
     - Removed shutdown code in util/http.c (closes: #201589).
     - Limit bytes read for an unknown alogorithm (closes: #402592).
-    - Build changes to fully evaluate paths (closes: #412508, #420613;
-      LP #76983).
+    - Build changes to fully evaluate paths (closes: #402958, #412508,
+      #420613; LP #76983).
     - Decrypt multiple files and not just the first (closes: #431828).
     - Fixes yat2m and gpg.texi to fix formatting in the man-page (closes:
       #445328).
@@ -15,7 +15,8 @@
   * debian/control: Added Homepage field. Added XC-Package-Type for udebs.
     (Standards-Version): Updated to latest 3.7.3.
     (Build-Depends): Added debhelper v5.
-    (Suggests): Added libpcsclite1 (closes: #297253).
+    (Suggests): Added libpcsclite1 (closes: #297253). Added eog and
+    imagemagick as alternatives to xloadimage (closes: #381419).
     (binary-arch): Install the added gpg-zip.1 manpage.
   * debian/gnupg.dirs: Added for new debhelper-based debian/rules.
   * debian/gnupg.docs: Ditto.
@@ -26,10 +27,12 @@
   * debian/gpgv-udeb.install: Ditto.
   * debian/gpg-zip.1: Added (closes: #399092). Thanks to Colin Tuckley.
   * debian/rules: Complete rewrite using debhelper (closes: #437050, #430459).
-  * debian/watch: Added.
+  * debian/watch: Added (closes: #450670).
   * debian/preinst: Removed (too old (1998!)).
   * debian/README.Debian: Ditto (closes: #381413).
   * debian/patches/25_de.po_fixes.dpatch: Updated.
+  * debian/patches/25_fr.po_fixes.dpatch: Added.
+    - po/fr.po: Fixed mileading translation (closes: #394037).
   * debian/patches/25_it.po_fixes.dpatch: Added.
     - po/it.po: Typo fix (closes: #298699).
   * debian/patches/28_multiple_message.dpatch: Dropped (applied 1.4.7).

Modified: gnupg/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/control?rev=21&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/control (original)
+++ gnupg/branches/experimental/debian/control Thu May 22 02:29:01 2008
@@ -11,7 +11,7 @@
 Package: gnupg
 Architecture: any
 Depends: ${shlibs:Depends}, gpgv
-Suggests: gnupg-doc, xloadimage, libpcsclite1
+Suggests: gnupg-doc, xloadimage | eog | imagemagick, libpcsclite1
 Conflicts: gpg-rsa, gpg-rsaref, suidmanager (<< 0.50), gpg-idea (<= 2.2)
 Replaces: gpg-rsa, gpg-rsaref
 Provides: gpg-rsa, gpg-rsaref

Modified: gnupg/branches/experimental/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/patches/00list?rev=21&op=diff
==============================================================================
--- gnupg/branches/experimental/debian/patches/00list (original)
+++ gnupg/branches/experimental/debian/patches/00list Thu May 22 02:29:01 2008
@@ -2,5 +2,6 @@
 16_min_privileges
 24_gpgv_manpage_cleanup
 25_de.po_fixes
+25_fr.po_fixes
 25_it.po_fixes
 99_yat2m_fix_samp_handling

Added: gnupg/branches/experimental/debian/patches/25_fr.po_fixes.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/patches/25_fr.po_fixes.dpatch?rev=21&op=file
==============================================================================
--- gnupg/branches/experimental/debian/patches/25_fr.po_fixes.dpatch (added)
+++ gnupg/branches/experimental/debian/patches/25_fr.po_fixes.dpatch Thu May 22 02:29:01 2008
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25_fr.po_fixes.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad experimental~/po/fr.po experimental/po/fr.po
+--- experimental~/po/fr.po	2008-03-25 11:23:35.000000000 +0100
++++ experimental/po/fr.po	2008-05-22 04:16:49.000000000 +0200
+@@ -2809,9 +2809,8 @@
+ "etc.)\n"
+ msgstr ""
+ "Décidez maintenant à quel point vous avez confiance en cet utilisateur\n"
+-"pour qu'il vérifie les clés des autres utilisateurs (vous pouvez\n"
+-"vérifier son passeport, vérifier les empreintes de plusieurs sources\n"
+-"différentes, etc.)\n"
++"pour qu'il vérifie les clés des autres utilisateurs (en vérifiant les passeports, en 
++vérifiant les empreintes de plusieurs sources différentes, etc.)\n"
+ 
+ #: g10/keyedit.c:417 g10/pkclist.c:276
+ #, c-format

Propchange: gnupg/branches/experimental/debian/patches/25_fr.po_fixes.dpatch
------------------------------------------------------------------------------
    svn:executable = *


