- up to snap 20030322

Changed files:
    popt-gettext0.11.patch -> 1.5
    popt-pl.po.patch -> 1.2
    popt-zh_CN.patch -> 1.2

diff --git a/popt-gettext0.11.patch b/popt-gettext0.11.patch
index 9921fdf5dd84921675dc2dd904cfb10712a21750..bc5473dad40e591b243586e3f0f1151bb9567581 100644 (file)
--- a/popt-gettext0.11.patch
+++ b/popt-gettext0.11.patch
@@ -1,7 +1,7 @@
---- popt-1.7/configure.in.wiget        Thu Sep 19 02:09:30 2002
-+++ popt-1.7/configure.in      Thu Sep 19 02:14:19 2002
+--- popt-1.8/configure.ac.wiget        Fri Dec 20 00:41:07 2002
++++ popt-1.8/configure.ac      Thu Mar 27 22:47:24 2003
 @@ -5,7 +5,7 @@
- AM_INIT_AUTOMAKE(popt, 1.7)
+ AM_INIT_AUTOMAKE(popt, 1.8)
  AM_CONFIG_HEADER(config.h)
  
 -ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
@@ -9,30 +9,18 @@
  
  AC_ISC_POSIX
  
-@@ -86,4 +86,4 @@
-       [Full path to popt top_sourcedir.])
- AC_SUBST(POPT_SOURCE_PATH)
+--- popt-1.8/Makefile.am.wiget Sun Dec  1 20:02:30 2002
++++ popt-1.8/Makefile.am       Thu Mar 27 22:48:10 2003
+@@ -4,7 +4,7 @@
  
--AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
-+AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
---- popt-1.7/Makefile.am.wiget Thu Sep 19 02:09:38 2002
-+++ popt-1.7/Makefile.am       Thu Sep 19 02:13:02 2002
-@@ -2,12 +2,12 @@
- 
- AUTOMAKE_OPTIONS = 1.4 foreign
+ LINT = splint
  
 -EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
 +EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
-       testit.sh test-poptrc \
+       testit.sh test-poptrc test3-data/0* \
        po/*.in po/*.po po/popt.pot \
        popt.ps
- 
--SUBDIRS = intl po
-+SUBDIRS = intl  po
- 
- INCLUDES = -I. -I$(top_srcdir)
- 
-@@ -74,3 +74,5 @@
+@@ -78,3 +78,5 @@
        rm -rf doxygen
        mkdir -p doxygen
        doxygen

diff --git a/popt-pl.po.patch b/popt-pl.po.patch
index 423795532945e19da0517687f58b913938cbde66..d8c48a89dcd87e609e3fa3bbe4b41a7332e16bf9 100644 (file)
--- a/popt-pl.po.patch
+++ b/popt-pl.po.patch
@@ -1,5 +1,5 @@
---- popt-1.7/po/pl.po.orig     Tue Sep 17 21:38:15 2002
-+++ popt-1.7/po/pl.po  Thu Oct 24 00:03:37 2002
+--- popt-1.8/po/pl.po.wiget    Thu Mar 27 19:26:53 2003
++++ popt-1.8/po/pl.po  Thu Mar 27 22:54:31 2003
 @@ -1,116 +1,123 @@
 -# SOME DESCRIPTIVE TITLE.
 +# Polish translation for popt.
@@ -11,11 +11,12 @@
  msgid ""
  msgstr ""
 -"Project-Id-Version: popt 1.6.3\n"
-+"Project-Id-Version: popt 1.7\n"
- "POT-Creation-Date: 2002-09-16 13:31-0400\n"
+-"POT-Creation-Date: 2003-03-19 12:16-0500\n"
 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 -"Language-Team: LANGUAGE <LL@li.org>\n"
++"Project-Id-Version: popt 1.7\n"
++"POT-Creation-Date: 2002-09-16 13:31-0400\n"
 +"PO-Revision-Date: 2002-10-23 23:53+0200\n"
 +"Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
 +"Language-Team: Polish <pl@li.org>\n"

diff --git a/popt-zh_CN.patch b/popt-zh_CN.patch
index a15cfa23fc76ac6b3d696c44872b61b2d7bce820..7239fcd81ea428992db3ad0eccf58c28c8dd6d81 100644 (file)
--- a/popt-zh_CN.patch
+++ b/popt-zh_CN.patch
@@ -1,5 +1,5 @@
---- popt-1.7/configure.in.orig Fri Jan 31 11:00:42 2003
-+++ popt-1.7/configure.in      Fri Jan 31 11:15:51 2003
+--- popt-1.7/configure.ac.orig Fri Jan 31 11:00:42 2003
++++ popt-1.7/configure.ac      Fri Jan 31 11:15:51 2003
 @@ -5,7 +5,7 @@
  AM_INIT_AUTOMAKE(popt, 1.7)
  AM_CONFIG_HEADER(config.h)