Preparing a release candidategnupg-1.4.8rc1

5 files changed, 48 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index cbffbbfd9..9efb766e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-16  Werner Koch  <[email protected]>
+
+	Released 1.4.8rc1.
+
 2007-10-27  David Shaw  <[email protected]>
 
 	* README: Update notes about OSX Leopard.
diff --git a/NEWS b/NEWS
index c39dc5332..027c8938e 100644
--- a/NEWS
+++ b/NEWS
@@ -5,8 +5,12 @@ Noteworthy changes in version 1.4.8 (unreleased)
 
     * Improved detection of keyrings specified multiple times.
 
+    * Changes to better cope with broken keyservers.
+
     * Minor bug fixes.
 
+    * New option --rfc4880 which is currently identical to --openpgp.
+
 
 Noteworthy changes in version 1.4.7 (2007-03-05)
 ------------------------------------------------
diff --git a/configure.ac b/configure.ac
index b5f730694..1a2c19832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,8 +25,8 @@ min_automake_version="1.9.3"
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.4.8])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [1.4.8rc1])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \
           || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 1d3e681ee..44b01aa00 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-15  Werner Koch  <[email protected]>
+
+	* gnupg.spec.in: Converted to utf-8. Changed polish description.
+	This is bug#676.
+
 2007-06-22  Werner Koch  <[email protected]>
 
 	* mk-w32-dist: Remove underline markup from man pages.  Reported
diff --git a/scripts/gnupg.spec.in b/scripts/gnupg.spec.in
index eaa5d3431..b81a19e22 100644
--- a/scripts/gnupg.spec.in
+++ b/scripts/gnupg.spec.in
@@ -1,4 +1,4 @@
-#
+#                                                       -*- coding: utf-8 -*-
 # gnupg -- gnu privacy guard
 # This is a template.  The dist target uses it to create the real file.
 #
@@ -6,16 +6,16 @@
 %define name gnupg
 Summary: GNU Utility for data encryption and digital signatures
 Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati.
-Summary(cs): GNU n�stroj pro �ifrovanou komunikaci a bezpe�n� ukl�d�n� dat
-Summary(fr): Utilitaire GNU de chiffrement et d'authentification des communications et des donn�es
-Summary(pl): Narzedzie GNU do szyfrowania i podpisywania danych
+Summary(cs): GNU nástroj pro ¹ifrovanou komunikaci a bezpeèné ukládání dat
+Summary(fr): Utilitaire GNU de chiffrement et d'authentification des communications et des données
+Summary(pl): Narzêdzie GNU do szyfrowania i podpisywania danych
 Vendor: GNU Privacy Guard Project
 Name: %{name}
 Version: %{version}
 Release: 1
 Copyright: GPL
 Group: Applications/Cryptography
-Group(cs): Aplikace/�ifrov�n�
+Group(cs): Aplikace/©ifrování
 Group(fr): Applications/Cryptographie
 Group(it): Applicazioni/Crittografia
 Source: ftp://ftp.gnupg.org/gcrypt/gnupg/%{name}-%{version}.tar.gz
@@ -69,13 +69,13 @@ BuildRoot: %{_tmppath}/rpmbuild_%{name}-%{version}
 - Added a * to catch all formats for man pages (plain, gz, bz2...)    
 
 * Mon May 01 2000 Fabio Coatti <[email protected]>
-- Some corrections in French description, thanks to Ga�l Qu�ri
+- Some corrections in French description, thanks to Gaël Quéri
   <[email protected]>; Some corrections to Italian descriptions.
 
 * Tue Apr 25 2000 Fabio Coatti <[email protected]>
 - Removed the no longer needed patch for man page by Keith Owens
 
-* Wed Mar 1 2000 Petr Kri�tof <[email protected]> 
+* Wed Mar 1 2000 Petr Kri¹tof <[email protected]> 
 - Czech descriptions added; some fixes and updates.
 
 * Sat Jan 15 2000 Keith Owens <[email protected]>
@@ -85,7 +85,7 @@ BuildRoot: %{_tmppath}/rpmbuild_%{name}-%{version}
 - Upgraded for 1.0.1 (added missing gpg.1 man page)
 
 * Sat May 29 1999 Fabio Coatti <[email protected]>
-- Some corrections in French description, thanks to Ga�l Qu�ri <[email protected]>  
+- Some corrections in French description, thanks to Gaël Quéri <[email protected]>  
 
 * Mon May 17 1999 Fabio Coatti <[email protected]>
 - Added French description, provided by 
@@ -121,43 +121,43 @@ if the patent does not apply to you and you need to be compatible with
 these versions of PGP 2.
 
 %description -l it
-GnuPG (GNU Privacy Guard) � una utility GNU per la cifratura di dati e
+GnuPG (GNU Privacy Guard) è una utility GNU per la cifratura di dati e
 la creazione di firme digitali. Possiede una gestione avanzata delle
-chiavi ed � conforme allo standard Internet OpenPGP, descritto nella
-RFC 2440. Non utilizzando algoritmi brevettati, non � compatibile con
+chiavi ed è conforme allo standard Internet OpenPGP, descritto nella
+RFC 2440. Non utilizzando algoritmi brevettati, non è compatibile con
 PGP2 (PGP2.x usa solo IDEA, coperto da brevetto mondiale, ed RSA,
 brevettato negli USA con scadenza 20/09/2000). Questi algoritmi sono
 utilizzabili da GnuPG tramite moduli esterni.
 
 %description -l fr
-GnuPG est un utilitaire GNU destin� � chiffrer des donn�es et � cr�er
-des signatures �lectroniques. Il a des capacit�s avanc�es de gestion de
-cl�s et il est conforme � la norme propos�e OpenPGP d�crite dans la
-RFC2440. Comme GnuPG n'utilise pas d'algorithme brevet�, il n'est
+GnuPG est un utilitaire GNU destiné à chiffrer des données et à créer
+des signatures électroniques. Il a des capacités avancées de gestion de
+clés et il est conforme à la norme proposée OpenPGP décrite dans la
+RFC2440. Comme GnuPG n'utilise pas d'algorithme breveté, il n'est
 compatible avec aucune version de PGP2 (PGP2.x ne sait utiliser que
-l'IDEA brevet� dans le monde entier et RSA, brevet� aux �tats-Unis
+l'IDEA breveté dans le monde entier et RSA, breveté aux États-Unis
 jusqu'au 20 septembre 2000). 
 
 %description -l cs
-GnuPG je GNU n�stroj pro bezpe�nou komunikaci a ukl�d�n� dat. M��e b�t
-pou�it na �ifrov�n� dat a vytv��en� digit�ln�ch podpis�. Obsahuje
-funkce pro pokro�ilou spr�vu kl��� a vyhovuje navrhovan�mu OpenPGP
-Internet standardu podle RFC2440. Byl vytvo�en jako kompletn�
-n�hrada za PGP. Proto�e neobsahuje �ifrovac� algoritmy IDEA nebo RSA,
-m��e b�t pou��v�n bez omezen�.
-Proto�e GnuPG nepou��v� ��dn� patentovan� algoritmus, nem��e b�t �pln�
-kompatibiln� s PGP verze 2. PGP 2.x pou��v� algoritmy IDEA (patentov�no
-celosv�tov�) a RSA (patentov�no ve Spojen�ch st�tech do 20. z���
-2000). Tyto algoritmy lze zav�st do GnuPG pomoc� extern�ch modul�.
+GnuPG je GNU nástroj pro bezpeènou komunikaci a ukládání dat. Mù¾e být
+pou¾it na ¹ifrování dat a vytváøení digitálních podpisù. Obsahuje
+funkce pro pokroèilou správu klíèù a vyhovuje navrhovanému OpenPGP
+Internet standardu podle RFC2440. Byl vytvoøen jako kompletní
+náhrada za PGP. Proto¾e neobsahuje ¹ifrovací algoritmy IDEA nebo RSA,
+mù¾e být pou¾íván bez omezení.
+Proto¾e GnuPG nepou¾ívá ¾ádný patentovaný algoritmus, nemù¾e být úplnì
+kompatibilní s PGP verze 2. PGP 2.x pou¾ívá algoritmy IDEA (patentováno
+celosvìtovì) a RSA (patentováno ve Spojených státech do 20. záøí
+2000). Tyto algoritmy lze zavést do GnuPG pomocí externích modulù.
 
 %description -l pl
-GnuPG (GNU Privacy Guard) jest nazedziem do szfrowania danych i tworzenia
-cyfrowych podpis�w. GnuPG posiada zaawansowane mozliwosci obslugi kluczy
-i jest zgodne z OpenPGP, proponowanym standardem internetowym opisanym
-w RFC2440. Poniewaz GnuPG nie uzywa zadnych opatentowanych algorytm�w
-nie jest wiec zgodne z jaka kolwiek wersja PGP2 (PGP2.x kozysta jedynie
-z algorytm�w: IDEA, opatentowanego na calym swiecie, oraz RSA, kt�rego
-patent na terenie Stan�w Zjednoczonych wygasa 20 wrzesnia 2000).         
+GnuPG (GNU Privacy Guard) jest narzędziem do szyfrowania danych i tworzenia
+cyfrowych podpisów. GnuPG posiada zaawansowane możliwości obsługi kluczy
+i jest zgodne z proponowanym standardem internetowym OpenPGP, opisanym
+w RFC2440. Ponieważ GnuPG nie używa żadnych opatentowanych algorytmów,
+nie jest zgodne z jakąkolwiek wersją PGP2 (PGP2.x korzysta jedynie
+z algorytmów: IDEA, opatentowanego na calym świecie oraz RSA, którego
+patent na terenie Stanów Zjednoczonych wygasa 20. września 2000).         
 
 %prep
 rm -rf $RPM_BUILD_ROOT