Commit 974d8986 authored by Paul Martin's avatar Paul Martin Committed by Michael Jeanson

Import Debian changes 1.16-1

popt (1.16-1) unstable; urgency=low

  * New upstream release (Closes: #581439)
  * Switch to dpkg-source 3.0 (quilt) format
  * Add a watch file.
  * Update to standards version 3.8.4 (no changes)
parents c16b8211 3dc417b7
1.15 -> 1.16:
- add lv.po, update translations (Translation Project).
- include xcode project files in distributed popt tar ball.
- make distcheck is now squeaky clean.
- permit VPATH builds.
- add shallow tests using ISP/RAS api-sanity-autotest.pl.
- prefix bit set routines with popt to avoid symbol coolisions w rpm.
- add tdict.c to exercise popt bit sets against /usr/dict/words.
- add poptBitsArgs() method to generate args bit set.
- add methods for bit set union and intersection.
- permit comma separated attribute lists, handle negated attributes.
- better test for POPT_ARG_BITSET.
- add POPT_ARG_BITSET handling.
- add POPT_ARG_SHORT handling.
- handle all callback traversals within a C switch (for extendability ease).
- add popt.pc.
- devzero2000: add AC_CONFIG_AUX_DIR, AC_CONFIG_MACRO_DIR to configure. Create build-aux
- devzero2000: del acinclude.m4 : AC_CHECK_VA_COPY is not used
1.14 -> 1.15:
- release popt-1.15.
- rse: fix building under --disable-nls
......
2007-06-14 gettextize <bug-gnu-gettext@gnu.org>
* Makefile.am (EXTRA_DIST): Add config.rpath, m4/ChangeLog.
* configure.ac (AC_OUTPUT): Add po/Makefile.in.
......@@ -2,37 +2,42 @@
AUTOMAKE_OPTIONS = 1.4 foreign
LINT = splint
LINT = splint
MCCABE = pmccabe
EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
EXTRA_DIST = config.rpath lookup3.c autogen.sh CHANGES $(man_MANS) \
m4/Makefile.in \
footer_no_timestamp.html libpopt.vers \
testit.sh test-poptrc test3-data/0* \
po/*.in po/*.po po/popt.pot \
testit.sh test-poptrc \
popt.xcodeproj/project.pbxproj \
popt.ps
SUBDIRS = po
SUBDIRS = po . auto
INCLUDES = -I. -I$(top_srcdir)
AM_CPPFLAGS = -I. -I$(top_srcdir)
noinst_HEADERS = poptint.h system.h
noinst_PROGRAMS = test1 test2 test3
noinst_PROGRAMS = test1 test2 tdict # test3
test1_SOURCES = test1.c
test1_LDFLAGS =
test1_LDADD = $(usrlib_LTLIBRARIES)
test2_SOURCES = test2.c
test2_LDFLAGS =
test2_LDADD = $(usrlib_LTLIBRARIES)
test3_SOURCES = test3.c
test3_LDFLAGS =
test3_LDADD = $(usrlib_LTLIBRARIES)
#test3_SOURCES = test3.c
#test3_LDFLAGS =
#test3_LDADD = $(usrlib_LTLIBRARIES)
tdict_SOURCES = tdict.c
tdict_LDFLAGS =
tdict_LDADD = $(usrlib_LTLIBRARIES)
noinst_SCRIPTS = testit.sh
TESTS_ENVIRONMENT = \
test1="./test1"
test1="$(top_builddir)/test1"
TESTS = testit.sh
TESTS = $(top_srcdir)/testit.sh
include_HEADERS = popt.h
......@@ -42,13 +47,19 @@ usrlib_LTLIBRARIES = libpopt.la
libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
pkgconfigdir = $(prefix)/lib/pkgconfig
pkgconfig_DATA = popt.pc
if HAVE_LD_VERSION_SCRIPT
libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/libpopt.vers
endif
man_MANS = popt.3
#BUILT_SOURCES = popt.lcd
BUILT_SOURCES = popt.pc # popt.lcd
distclean-local:
rm -rf .ccache
.PHONY: updatepo
updatepo:
......@@ -65,6 +76,10 @@ sources:
lint:
$(LINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES}
.PHONY: mccabe
mccabe:
$(MCCABE) $(libpopt_la_SOURCES) | sort -n -r | head -n 10
.PHONY: doxygen
doxygen: Doxyfile
rm -rf doxygen
......
This diff is collapsed.
dnl ##
dnl ## acinclude.m4 -- additional source for aclocal(1)
dnl ##
dnl ##
dnl ## Check for C99 va_copy() implementation
dnl ## (and provide fallback implementation if neccessary)
dnl ##
dnl ## configure.in:
dnl ## AC_CHECK_VA_COPY
dnl ## foo.c:
dnl ## #include "config.h"
dnl ## [...]
dnl ## va_copy(d,s)
dnl ##
dnl ## This check is rather complex: first because we really have to
dnl ## try various possible implementations in sequence and second, we
dnl ## cannot define a macro in config.h with parameters directly.
dnl ##
dnl # test program for va_copy() implementation
changequote(<<,>>)
m4_define(__va_copy_test, <<[
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#define DO_VA_COPY(d, s) $1
void test(char *str, ...)
{
va_list ap, ap2;
int i;
va_start(ap, str);
DO_VA_COPY(ap2, ap);
for (i = 1; i <= 9; i++) {
int k = (int)va_arg(ap, int);
if (k != i)
abort();
}
DO_VA_COPY(ap, ap2);
for (i = 1; i <= 9; i++) {
int k = (int)va_arg(ap, int);
if (k != i)
abort();
}
va_end(ap);
}
int main(int argc, char *argv[])
{
test("test", 1, 2, 3, 4, 5, 6, 7, 8, 9);
exit(0);
}
]>>)
changequote([,])
dnl # test driver for va_copy() implementation
m4_define(__va_copy_check, [
AH_VERBATIM($1,
[/* Predefined possible va_copy() implementation (id: $1) */
#define __VA_COPY_USE_$1(d, s) $2])
if test ".$ac_cv_va_copy" = .; then
AC_TRY_RUN(__va_copy_test($2), [ac_cv_va_copy="$1"])
fi
])
dnl # Autoconf check for va_copy() implementation checking
AC_DEFUN([AC_CHECK_VA_COPY],[
dnl # provide Autoconf display check message
AC_MSG_CHECKING(for va_copy() function)
dnl # check for various implementations in priorized sequence
AC_CACHE_VAL(ac_cv_va_copy, [
ac_cv_va_copy=""
dnl # 1. check for standardized C99 macro
__va_copy_check(C99, [va_copy((d), (s))])
dnl # 2. check for alternative/deprecated GCC macro
__va_copy_check(GCM, [VA_COPY((d), (s))])
dnl # 3. check for internal GCC macro (high-level define)
__va_copy_check(GCH, [__va_copy((d), (s))])
dnl # 4. check for internal GCC macro (built-in function)
__va_copy_check(GCB, [__builtin_va_copy((d), (s))])
dnl # 5. check for assignment approach (assuming va_list is a struct)
__va_copy_check(ASS, [do { (d) = (s); } while (0)])
dnl # 6. check for assignment approach (assuming va_list is a pointer)
__va_copy_check(ASP, [do { *(d) = *(s); } while (0)])
dnl # 7. check for memory copying approach (assuming va_list is a struct)
__va_copy_check(CPS, [memcpy((void *)&(d), (void *)&(s), sizeof((s)))])
dnl # 8. check for memory copying approach (assuming va_list is a pointer)
__va_copy_check(CPP, [memcpy((void *)(d), (void *)(s), sizeof(*(s)))])
if test ".$ac_cv_va_copy" = .; then
AC_ERROR([no working implementation found])
fi
])
dnl # optionally activate the fallback implementation
if test ".$ac_cv_va_copy" = ".C99"; then
AC_DEFINE(HAVE_VA_COPY, 1, [Define if va_copy() macro exists (and no fallback implementation is required)])
fi
dnl # declare which fallback implementation to actually use
AC_DEFINE_UNQUOTED([__VA_COPY_USE], [__VA_COPY_USE_$ac_cv_va_copy],
[Define to id of used va_copy() implementation])
dnl # provide activation hook for fallback implementation
AH_VERBATIM([__VA_COPY_ACTIVATION],
[/* Optional va_copy() implementation activation */
#ifndef HAVE_VA_COPY
#define va_copy(d, s) __VA_COPY_USE(d, s)
#endif
])
dnl # provide Autoconf display result message
if test ".$ac_cv_va_copy" = ".C99"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no (using fallback implementation)])
fi
])
This diff is collapsed.
AUTOMAKE_OPTIONS = 1.4 foreign
AUTOTEST = api-sanity-autotest.pl
TDIRS = descriptors_storage header_compile_errors test_results tests
clean-local:
rm -rf $(TDIRS)
check-local:
-[ -d tests ] && ${AUTOTEST} -l popt -d desc -clean
-${AUTOTEST} -l popt -d desc -st types -gen -build -run
This diff is collapsed.
<version>
1.15
</version>
<headers>
popt.h
</headers>
<libs>
@abs_top_builddir@/.libs/libpopt.so
</libs>
<include_paths>
@abs_top_srcdir@
</include_paths>
<gcc_options>
@CFLAGS@
</gcc_options>
<opaque_types>
</opaque_types>
<skip_interfaces>
</skip_interfaces>
<include_preamble>
</include_preamble>
<libs_depend>
</libs_depend>
<?xml version="1.0" encoding="UTF-8"?>
<collection>
<spec_type>
<kind> common_env </kind>
<global_code>
static int aVal = 141421;
static unsigned int aFlag = 0x8aceU;
static short aShort = (short)4523;
static int aInt = 271828;
static long aLong = 738905609L;
static long long aLongLong = 738905609LL;
static float aFloat = 3.1415926535;
static double aDouble = 9.86960440108935861883;
static const char ** aArgv = NULL;
static struct poptOption optionsTable[] = {
{ "val", '\0', POPT_ARG_VAL | POPT_ARGFLAG_SHOW_DEFAULT, &aVal, 125992,
"POPT_ARG_VAL: 125992 141421", 0},
{ "int", 'i', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &aInt, 0,
"POPT_ARG_INT: 271828", NULL },
{ "short", 's', POPT_ARG_SHORT | POPT_ARGFLAG_SHOW_DEFAULT, &aShort, 0,
"POPT_ARG_SHORT: 4523", NULL },
{ "long", 'l', POPT_ARG_LONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLong, 0,
"POPT_ARG_LONG: 738905609", NULL },
{ "longlong", 'L', POPT_ARG_LONGLONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLongLong, 0,
"POPT_ARG_LONGLONG: 738905609", NULL },
{ "float", 'f', POPT_ARG_FLOAT | POPT_ARGFLAG_SHOW_DEFAULT, &aFloat, 0,
"POPT_ARG_FLOAT: 3.14159", NULL },
{ "double", 'd', POPT_ARG_DOUBLE | POPT_ARGFLAG_SHOW_DEFAULT, &aDouble, 0,
"POPT_ARG_DOUBLE: 9.8696", NULL },
{ "argv", '\0', POPT_ARG_ARGV, &aArgv, 0,
"POPT_ARG_ARGV: append string to argv array (can be used multiple times)","STRING"},
POPT_AUTOALIAS
POPT_AUTOHELP
POPT_TABLEEND
};
</global_code>
</spec_type>
<spec_type>
<kind> common_param </kind>
<data_type> poptContext </data_type>
<value> poptGetContext(argv[0], argc, argv, optionsTable, 0) </value>
<final_code>
$0 = poptFreeContext($0);
</final_code>
<associating>
<except>
poptAddItem <!-- FIXME -->
</except>
</associating>
</spec_type>
<spec_type>
<kind> normal </kind>
<data_type> poptContext </data_type>
<value> poptGetContext(argv[0], argc, argv, optionsTable, 0) </value>
<associating>
<interfaces>
poptFreeContext
poptFini
</interfaces>
<links> param1 </links>
</associating>
</spec_type>
<spec_type>
<kind> normal </kind>
<data_type> poptItem </data_type>
<value> NULL </value>
<global_code>
#include <malloc.h>
</global_code>
<init_code>
$0 = calloc(1, sizeof(*$0));
$0->option = *poptHelpOptionsI18N;
$0->argc = 1;
$0->argv = calloc(2, sizeof(*$0->argv));
$0->argv[0] = strdup("arg1");
</init_code>
<associating>
<interfaces> poptAddItem </interfaces>
<links> param2 </links>
</associating>
</spec_type>
<spec_type>
<kind> common_param </kind>
<data_type> struct poptAlias </data_type>
<value> _alias </value>
<global_code>
#include <malloc.h>
static struct poptAlias _alias = {
.longName = "longName",
.shortName = 'l',
.argc = 0,
.argv = NULL
};
</global_code>
<init_code>
$0.argc = 1;
$0.argv = calloc($0.argc + 1, sizeof(*$0.argv));
$0.argv[0] = strdup("arg1");
</init_code>
</spec_type>
<spec_type>
<kind> common_param </kind>
<name> poptBits </name>
<data_type> poptBits </data_type>
<value>
create_poptBits()
</value>
<global_code>
poptBits create_poptBits()
{
poptBits a = NULL;
(void) poptSaveBits(&a, 0, "foo");
(void) poptSaveBits(&a, 0, "bar");
(void) poptSaveBits(&a, 0, "baz");
return a;
}
</global_code>
</spec_type>
<spec_type>
<kind> normal </kind>
<data_type> const char *** </data_type>
<value> &av </value>
<global_code>
#include <malloc.h>
</global_code>
<init_code>
const char ** av = NULL;
</init_code>
<final_code>
free(av[0]);
free(av);
</final_code>
<associating>
<interfaces> poptSaveString </interfaces>
<links> param1 </links>
</associating>
</spec_type>
</collection>
......@@ -22,7 +22,7 @@ perl -p -i~ -e 's/(po\/Makefile\.in)\s+po\/Makefile\.in/$1/' configure.ac
perl -p -i~ -e 's/(SUBDIRS\s+=\s+po)\s+po/$1/' Makefile.am
aclocal -I m4
autoheader
automake -a -c
automake -Wall -Wno-override -a -c
autoconf
if [ "$1" = "--noconfigure" ]; then
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
AC_PREREQ(2.57)
AC_INIT(popt, 1.15, popt-devel@rpm5.org)
AC_CANONICAL_TARGET
AC_INIT(popt, 1.16, popt-devel@rpm5.org)
AC_CONFIG_SRCDIR([popt.h])
AC_CONFIG_HEADERS([config.h])
AC_CANONICAL_TARGET
dnl Must come before AM_INIT_AUTOMAKE.
dnl AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign -Wall])
AM_MAINTAINER_MODE
# Library code modified: REVISION++
# Interfaces changed/added/removed: CURRENT++ REVISION=0
......@@ -12,11 +18,11 @@ AC_SUBST(LT_CURRENT, 0)
AC_SUBST(LT_REVISION, 0)
AC_SUBST(LT_AGE, 8)
AM_INIT_AUTOMAKE([foreign])
ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko lv nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
AC_PROG_CC_STDC
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LIBTOOL
......@@ -63,6 +69,16 @@ AC_ARG_ENABLE([ld-version-script],
[ : ] )
AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
AC_ARG_ENABLE(build-gcov,
AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov]), [dnl
if test ".$enableval" = .yes; then
if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
dnl # GNU GCC (usually "gcc")
CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
fi
fi
])
AC_CHECK_FUNC(setreuid, [], [
AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
])
......@@ -75,9 +91,45 @@ popt_sysconfdir="${sysconfdir}"
eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory])
# Define a (hope) portable Libs pkgconfig directive that
# - Don't harm if the default library search path include ${libdir}
# (https://bugzilla.novell.com/show_bug.cgi?id=529921)
# - Don't require a not upstream patch to pkgconfig
# (https://bugs.freedesktop.org/show_bug.cgi?id=16095)
popt_pkgconfig_libs='-L${libdir} -lpopt'
case "${host}" in
*-*-linux*)
case "${libdir}" in
/usr/lib|/usr/lib64|/lib|/lib64)
popt_pkgconfig_libs='-lpopt'
;;
*)
popt_pkgconfig_libs='-L${libdir} -lpopt'
;;
esac
;;
*-*-gnu*)
case "${libdir}" in
/usr/lib|/usr/lib64|/lib|/lib64)
popt_pkgconfig_libs='-lpopt'
;;
*)
popt_pkgconfig_libs='-L${libdir} -lpopt'
;;
esac
;;
esac
AC_SUBST([POPT_PKGCONFIG_LIBS],"$popt_pkgconfig_libs")
POPT_SOURCE_PATH="`pwd`"
AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
[Full path to popt top_srcdir.])
AC_SUBST(POPT_SOURCE_PATH)
AC_OUTPUT([Doxyfile Makefile po/Makefile.in])
AC_CONFIG_SUBDIRS()
AC_CONFIG_FILES([ po/Makefile.in m4/Makefile
Doxyfile Makefile popt.pc popt.spec test-poptrc
auto/Makefile auto/desc auto/types
])
AC_OUTPUT
This package uses quilt to manage all modifications to the upstream
source. Changes are stored in the source package as diffs in
debian/patches and applied during the build.
Please see /usr/share/doc/quilt/README.source for more details.
popt (1.16-1) unstable; urgency=low
* New upstream release (Closes: #581439)
* Switch to dpkg-source 3.0 (quilt) format
* Add a watch file.
* Update to standards version 3.8.4 (no changes)
-- Paul Martin <pm@debian.org> Thu, 13 May 2010 05:14:50 +0100
popt (1.15-1) unstable; urgency=low
* New upstream release
......
......@@ -4,13 +4,13 @@ Priority: optional
Maintainer: Paul Martin <pm@debian.org>
Build-Depends: debhelper (>> 7), gettext, quilt
Homepage: http://rpm5.org/
Standards-Version: 3.8.3
Standards-Version: 3.8.4
Package: libpopt0
Architecture: any
Section: libs
Priority: important
Depends: ${shlibs:Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: popt, libpopt-dev (<= 1.4-1), rpm (<= 4.0.2-3)
Replaces: popt
Description: lib for parsing cmdline parameters
......@@ -27,7 +27,7 @@ Package: libpopt-dev
Architecture: any
Section: libdevel
Priority: optional
Depends: libc6-dev | libc-dev, libpopt0 (= ${binary:Version})
Depends: libc6-dev | libc-dev, libpopt0 (= ${binary:Version}), ${misc:Depends}
Conflicts: popt
Replaces: popt
Description: lib for parsing cmdline parameters - development files
......@@ -44,7 +44,7 @@ Package: libpopt0-udeb
XC-Package-Type: udeb
Architecture: any
Section: debian-installer
Depends: ${shlibs:Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: lib for parsing cmdline parameters
Popt was heavily influenced by the getopt() and getopt_long() functions,
but it allows more powerful argument expansion. It can parse arbitrary
......
Index: popt-1.15/popt.c
Index: popt-1.16/popt.c
===================================================================
--- popt-1.15.orig/popt.c 2009-10-06 18:56:06.390006971 +0100
+++ popt-1.15/popt.c 2009-10-06 18:56:24.132007037 +0100
@@ -817,8 +817,13 @@
--- popt-1.16.orig/popt.c 2010-05-13 04:57:52.006009545 +0100
+++ popt-1.16/popt.c 2010-05-13 04:58:15.027009502 +0100
@@ -1023,8 +1023,13 @@
int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
{
......@@ -16,7 +16,7 @@ Index: popt-1.15/popt.c
return POPT_ERROR_NULLARG;
if (aLong != 0 && LF_ISSET(RANDOM)) {
@@ -858,8 +863,13 @@
@@ -1056,8 +1061,13 @@
int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
{
......
Index: popt-1.14/popt.3
Index: popt-1.16/popt.3
===================================================================
--- popt-1.14.orig/popt.3 2008-06-09 17:08:18.737275277 +0100
+++ popt-1.14/popt.3 2008-06-09 17:08:32.613284157 +0100
@@ -656,21 +656,22 @@
--- popt-1.16.orig/popt.3 2010-05-13 04:58:04.357009234 +0100
+++ popt-1.16/popt.3 2010-05-13 04:58:09.716009057 +0100
@@ -657,21 +657,22 @@
.nf
#include <popt.h>
#include <stdio.h>
......
Index: popt-1.15/popt.c
Index: popt-1.16/popt.c
===================================================================
--- popt-1.15.orig/popt.c 2009-10-06 18:56:04.086007174 +0100
+++ popt-1.15/popt.c 2009-10-06 18:56:06.390006971 +0100
--- popt-1.16.orig/popt.c 2010-05-13 04:57:46.853009777 +0100
+++ popt-1.16/popt.c 2010-05-13 04:57:52.006009545 +0100
@@ -184,6 +184,7 @@
con->os->next = 1; /* skip argv[0] */
......@@ -10,7 +10,7 @@ Index: popt-1.15/popt.c
/*@-dependenttrans -assignexpose@*/ /* FIX: W2DO? */
con->options = options;
/*@=dependenttrans =assignexpose@*/
@@ -1099,7 +1100,19 @@
@@ -1358,7 +1359,19 @@
return 0;
}
if (con->leftovers != NULL) /* XXX can't happen */
......@@ -31,7 +31,7 @@ Index: popt-1.15/popt.c
continue;
}
@@ -1353,6 +1366,8 @@
@@ -1612,6 +1625,8 @@
poptContext poptFreeContext(poptContext con)
{
......@@ -40,7 +40,7 @@ Index: popt-1.15/popt.c
if (con == NULL) return con;
poptResetContext(con);
con->os->argb = _free(con->os->argb);
@@ -1363,7 +1378,11 @@
@@ -1622,7 +1637,11 @@
con->execs = poptFreeItems(con->execs, con->numExecs);
con->numExecs = 0;
......@@ -52,11 +52,11 @@ Index: popt-1.15/popt.c
con->finalArgv = _free(con->finalArgv);
con->appName = _free(con->appName);
con->otherHelp = _free(con->otherHelp);
Index: popt-1.15/poptint.h
Index: popt-1.16/poptint.h
===================================================================
--- popt-1.15.orig/poptint.h 2009-10-06 18:56:04.097007072 +0100
+++ popt-1.15/poptint.h 2009-10-06 18:56:06.391006841 +0100
@@ -112,6 +112,7 @@
--- popt-1.16.orig/poptint.h 2010-05-13 04:57:46.878010140 +0100
+++ popt-1.16/poptint.h 2010-05-13 04:57:52.008009414 +0100
@@ -119,6 +119,7 @@
/*@owned@*/ /*@null@*/
poptArgv leftovers;
int numLeftovers;
......
Index: popt-1.15/po/ca.po
Index: popt-1.16/po/ca.po
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ popt-1.15/po/ca.po 2009-10-06 18:54:14.712007454 +0100
+++ popt-1.16/po/ca.po 2010-05-13 04:59:13.757009036 +0100
@@ -0,0 +1,116 @@
+# Catalan translation of popt.
+# Copyright © Free Software Foundation, Inc.
......@@ -119,16 +119,16 @@ Index: popt-1.15/po/ca.po
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[OPCIÓ...]"
Index: popt-1.15/configure
Index: popt-1.16/configure
===================================================================
--- popt-1.15.orig/configure 2009-04-12 20:31:14.000000000 +0100
+++ popt-1.15/configure 2009-10-06 18:55:21.764008060 +0100
@@ -2697,7 +2697,7 @@
--- popt-1.16.orig/configure 2010-05-04 21:55:59.000000000 +0100
+++ popt-1.16/configure 2010-05-13 04:59:47.938008097 +0100
@@ -2765,7 +2765,7 @@
LT_AGE=8
-ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko lv nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
+ALL_LINGUAS="ca cs da de eo es fi fr ga gl hu id is it ja ko lv nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
-ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
+ALL_LINGUAS="ca cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
DEPDIR="${am__leading_dot}deps"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
Index: popt-1.14/popt.3
Index: popt-1.16/popt.3
===================================================================
--- popt-1.14.orig/popt.3 2008-02-17 00:35:13.000000000 +0000
+++ popt-1.14/popt.3 2008-06-09 17:08:18.737275277 +0100
@@ -199,7 +199,7 @@
--- popt-1.16.orig/popt.3 2010-05-13 04:57:46.665009784 +0100
+++ popt-1.16/popt.3 2010-05-13 04:58:04.357009234 +0100
@@ -200,7 +200,7 @@
.RB "This macro includes another option table (via " POPT_ARG_INCLUDE_TABLE
; see below) in the main one which provides the table entries for these
.RB "arguments. When " --usage " or " --help " are passed to programs which
......@@ -11,7 +11,7 @@ Index: popt-1.14/popt.3
stderr as soon as it finds the option, and exits the program with a
return code of 0. If you want to use popt's automatic help generation in
a different way, you need to explicitly add the option entries to your programs
@@ -209,7 +209,7 @@
@@ -210,7 +210,7 @@
the argument will not be shown in help output.
.sp
If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_SHOW_DEFAULT\fR,
......@@ -20,7 +20,7 @@ Index: popt-1.14/popt.3
.sp
The final structure in the table should have all the pointer values set
.RB "to " NULL " and all the arithmetic values set to 0, marking the "
@@ -232,7 +232,7 @@
@@ -233,7 +233,7 @@
contain a overall description of the option table being included.
.sp
The other special option table entry type tells popt to call a function (a
......@@ -29,7 +29,7 @@ Index: popt-1.14/popt.3
when included option tables are being used, as the program which provides
the top-level option table doesn't need to be aware of the other options