OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 09-May-2007 07:45:19 Branch: HEAD Handle: 2007050906451900 Modified files: openpkg-src/dpkg dpkg.patch dpkg.spec Log: upgrading package: dpkg 1.13.25 -> 1.14.1 Summary: Revision Changes Path 1.2 +49 -40 openpkg-src/dpkg/dpkg.patch 1.4 +7 -3 openpkg-src/dpkg/dpkg.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/dpkg/dpkg.patch ============================================================================ $ cvs diff -u -r1.1 -r1.2 dpkg.patch --- openpkg-src/dpkg/dpkg.patch 18 Nov 2006 13:17:48 -0000 1.1 +++ openpkg-src/dpkg/dpkg.patch 9 May 2007 05:45:19 -0000 1.2 @@ -1,43 +1,43 @@ Index: dpkg-deb/Makefile.in ---- dpkg-deb/Makefile.in.orig 2006-10-13 15:37:53 +0200 -+++ dpkg-deb/Makefile.in 2006-11-18 14:11:58 +0100 -@@ -140,7 +140,7 @@ - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ +--- dpkg-deb/Makefile.in.orig 2007-05-08 17:24:58 +0200 ++++ dpkg-deb/Makefile.in 2007-05-09 07:42:20 +0200 +@@ -146,7 +146,7 @@ + LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ + LIBPTH = @LIBPTH@ -LIBS = @LIBS@ +LIBS = $(top_builddir)/getopt/libopt.a @LIBS@ + LIBTHREAD = @LIBTHREAD@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ Index: dpkg-split/Makefile.in ---- dpkg-split/Makefile.in.orig 2006-10-13 15:37:54 +0200 -+++ dpkg-split/Makefile.in 2006-11-18 14:11:58 +0100 -@@ -141,7 +141,7 @@ - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ +--- dpkg-split/Makefile.in.orig 2007-05-08 17:24:58 +0200 ++++ dpkg-split/Makefile.in 2007-05-09 07:42:20 +0200 +@@ -147,7 +147,7 @@ + LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ + LIBPTH = @LIBPTH@ -LIBS = @LIBS@ +LIBS = $(top_builddir)/getopt/libopt.a @LIBS@ + LIBTHREAD = @LIBTHREAD@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ Index: dselect/Makefile.in ---- dselect/Makefile.in.orig 2006-10-13 15:37:54 +0200 -+++ dselect/Makefile.in 2006-11-18 14:11:58 +0100 -@@ -156,7 +156,7 @@ - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ +--- dselect/Makefile.in.orig 2007-05-08 17:24:59 +0200 ++++ dselect/Makefile.in 2007-05-09 07:42:20 +0200 +@@ -162,7 +162,7 @@ + LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ + LIBPTH = @LIBPTH@ -LIBS = @LIBS@ +LIBS = $(top_builddir)/getopt/libopt.a @LIBS@ + LIBTHREAD = @LIBTHREAD@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ Index: lib/Makefile.in ---- lib/Makefile.in.orig 2006-10-13 15:37:55 +0200 -+++ lib/Makefile.in 2006-11-18 14:11:58 +0100 -@@ -77,7 +77,7 @@ +--- lib/Makefile.in.orig 2007-05-08 17:24:59 +0200 ++++ lib/Makefile.in 2007-05-09 07:42:20 +0200 +@@ -78,7 +78,7 @@ showcright.$(OBJEXT) showpkg.$(OBJEXT) tarfn.$(OBJEXT) \ utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT) libdpkg_a_OBJECTS = $(am_libdpkg_a_OBJECTS) @@ -48,7 +48,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ Index: lib/tarfn.c --- lib/tarfn.c.orig 2006-06-21 15:41:12 +0200 -+++ lib/tarfn.c 2006-11-18 14:11:58 +0100 ++++ lib/tarfn.c 2007-05-09 07:42:20 +0200 @@ -60,7 +60,9 @@ int len; char * str; @@ -61,21 +61,30 @@ memcpy(str, s, len); str[len] = 0; Index: man/Makefile.in ---- man/Makefile.in.orig 2006-10-13 15:37:55 +0200 -+++ man/Makefile.in 2006-11-18 14:11:58 +0100 -@@ -214,7 +214,7 @@ +--- man/Makefile.in.orig 2007-05-08 17:24:59 +0200 ++++ man/Makefile.in 2007-05-09 07:43:14 +0200 +@@ -226,7 +226,7 @@ target_vendor = @target_vendor@ - # po4a must be the first sub-directory because it generates the translations. --SUBDIRS = C po4a de es fr hu ja pl pt_BR ru sv -+SUBDIRS = C - all: all-recursive + # Extract the list of languages from the po4a config file. +-LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg) ++LINGUAS = + dist_man_MANS = \ + 822-date.1 \ + cleanup-info.8 \ +@@ -562,7 +562,7 @@ + uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 + - .SUFFIXES: +-all-local: man.stamp ++all-local: + + # FIXME: Use a stamp file until po4a supports them internally. + man.stamp: Index: scripts/Makefile.in ---- scripts/Makefile.in.orig 2006-10-13 15:37:57 +0200 -+++ scripts/Makefile.in 2006-11-18 14:14:34 +0100 -@@ -694,11 +694,11 @@ +--- scripts/Makefile.in.orig 2007-05-08 17:25:00 +0200 ++++ scripts/Makefile.in 2007-05-09 07:42:20 +0200 +@@ -707,11 +707,11 @@ $(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir) install-data-local: @@ -91,9 +100,9 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: src/Makefile.in ---- src/Makefile.in.orig 2006-10-13 15:37:58 +0200 -+++ src/Makefile.in 2006-11-18 14:11:58 +0100 -@@ -82,7 +82,7 @@ +--- src/Makefile.in.orig 2007-05-08 17:25:00 +0200 ++++ src/Makefile.in 2007-05-09 07:42:20 +0200 +@@ -83,7 +83,7 @@ query.$(OBJEXT) dpkg_query_OBJECTS = $(am_dpkg_query_OBJECTS) dpkg_query_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a @@ -102,12 +111,12 @@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -147,7 +147,7 @@ - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ +@@ -153,7 +153,7 @@ + LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ + LIBPTH = @LIBPTH@ -LIBS = @LIBS@ +LIBS = $(top_builddir)/getopt/libopt.a @LIBS@ + LIBTHREAD = @LIBTHREAD@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ @@ . patch -p0 <<'@@ .' Index: openpkg-src/dpkg/dpkg.spec ============================================================================ $ cvs diff -u -r1.3 -r1.4 dpkg.spec --- openpkg-src/dpkg/dpkg.spec 3 Jan 2007 09:06:26 -0000 1.3 +++ openpkg-src/dpkg/dpkg.spec 9 May 2007 05:45:19 -0000 1.4 @@ -22,6 +22,10 @@ ## SUCH DAMAGE. ## +# package version +%define V_tarball 1.14.1 +%define V_subdir 1.14.0 + # package information Name: dpkg Summary: Debian Package Management Toolchain @@ -32,8 +36,8 @@ Class: EVAL Group: Archiver License: GPL -Version: 1.13.25 -Release: 20070103 +Version: %{V_tarball} +Release: 20070509 # list of sources Source0: http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.gz @@ -62,7 +66,7 @@ } %prep - %setup -q + %setup -q -n dpkg-%{V_subdir} %patch -p0 %build @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org