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: 22-Jan-2008 17:04:20
Branch: HEAD Handle: 2008012216042000
Modified files:
openpkg-src/dpkg dpkg.patch dpkg.spec
Log:
upgrading package: dpkg 1.14.15 -> 1.14.16.1
Summary:
Revision Changes Path
1.6 +42 -42 openpkg-src/dpkg/dpkg.patch
1.15 +3 -3 openpkg-src/dpkg/dpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dpkg/dpkg.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 dpkg.patch
--- openpkg-src/dpkg/dpkg.patch 28 Dec 2007 09:34:45 -0000 1.5
+++ openpkg-src/dpkg/dpkg.patch 22 Jan 2008 16:04:20 -0000 1.6
@@ -1,54 +1,54 @@
Index: dpkg-deb/Makefile.in
---- dpkg-deb/Makefile.in.orig 2007-12-27 12:09:26 +0100
-+++ dpkg-deb/Makefile.in 2007-12-28 10:28:09 +0100
-@@ -141,7 +141,7 @@
- LIBMULTITHREAD = @LIBMULTITHREAD@
+--- dpkg-deb/Makefile.in.orig 2008-01-21 12:56:03 +0100
++++ dpkg-deb/Makefile.in 2008-01-22 17:01:02 +0100
+@@ -116,7 +116,7 @@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
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 2007-12-27 12:09:26 +0100
-+++ dpkg-split/Makefile.in 2007-12-28 10:28:09 +0100
-@@ -142,7 +142,7 @@
- LIBMULTITHREAD = @LIBMULTITHREAD@
+--- dpkg-split/Makefile.in.orig 2008-01-21 12:56:04 +0100
++++ dpkg-split/Makefile.in 2008-01-22 17:01:15 +0100
+@@ -117,7 +117,7 @@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
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 2007-12-27 12:09:27 +0100
-+++ dselect/Makefile.in 2007-12-28 10:28:09 +0100
-@@ -160,7 +160,7 @@
- LIBMULTITHREAD = @LIBMULTITHREAD@
+--- dselect/Makefile.in.orig 2008-01-21 12:56:04 +0100
++++ dselect/Makefile.in 2008-01-22 17:01:33 +0100
+@@ -132,7 +132,7 @@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
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 2007-12-27 12:09:27 +0100
-+++ lib/Makefile.in 2007-12-28 10:28:09 +0100
-@@ -74,7 +74,7 @@
+--- lib/Makefile.in.orig 2008-01-21 12:56:04 +0100
++++ lib/Makefile.in 2008-01-22 17:01:58 +0100
+@@ -67,7 +67,7 @@
showcright.$(OBJEXT) showpkg.$(OBJEXT) tarfn.$(OBJEXT) \
utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT)
libdpkg_a_OBJECTS = $(am_libdpkg_a_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -I$(top_builddir)/getopt
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-I$(top_builddir)/getopt
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
Index: lib/tarfn.c
---- lib/tarfn.c.orig 2007-12-02 21:44:40 +0100
-+++ lib/tarfn.c 2007-12-28 10:28:09 +0100
+--- lib/tarfn.c.orig 2008-01-21 12:39:01 +0100
++++ lib/tarfn.c 2008-01-22 16:58:27 +0100
@@ -60,7 +60,9 @@
int len;
char * str;
@@ -61,10 +61,10 @@
memcpy(str, s, len);
str[len] = 0;
Index: man/Makefile.in
---- man/Makefile.in.orig 2007-12-27 12:09:27 +0100
-+++ man/Makefile.in 2007-12-28 10:30:56 +0100
-@@ -223,7 +223,7 @@
- top_srcdir = @top_srcdir@
+--- man/Makefile.in.orig 2008-01-21 12:56:04 +0100
++++ man/Makefile.in 2008-01-22 16:58:27 +0100
+@@ -190,7 +190,7 @@
+ target_vendor = @target_vendor@
# Extract the list of languages from the po4a config file.
-LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p'
$(srcdir)/po/po4a.cfg)
@@ -72,7 +72,7 @@
dist_man_MANS = \
822-date.1 \
cleanup-info.8 \
-@@ -574,7 +574,7 @@
+@@ -533,7 +533,7 @@
all-local: [EMAIL PROTECTED]@
all-local-no:
@@ -82,9 +82,9 @@
# FIXME: Use a stamp file until po4a supports them internally.
man.stamp:
Index: scripts/Makefile.in
---- scripts/Makefile.in.orig 2007-12-27 12:09:27 +0100
-+++ scripts/Makefile.in 2007-12-28 10:28:09 +0100
-@@ -786,8 +786,8 @@
+--- scripts/Makefile.in.orig 2008-01-21 12:56:05 +0100
++++ scripts/Makefile.in 2008-01-22 16:58:27 +0100
+@@ -731,8 +731,8 @@
$(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)
install-data-local:
@@ -96,23 +96,23 @@
# Ideally we'd use 'sed -i', but unfortunately that's not portable.
install-data-hook:
Index: src/Makefile.in
---- src/Makefile.in.orig 2007-12-27 12:09:27 +0100
-+++ src/Makefile.in 2007-12-28 10:28:09 +0100
-@@ -79,7 +79,7 @@
+--- src/Makefile.in.orig 2008-01-21 12:56:05 +0100
++++ src/Makefile.in 2008-01-22 17:02:19 +0100
+@@ -72,7 +72,7 @@
query.$(OBJEXT)
dpkg_query_OBJECTS = $(am_dpkg_query_OBJECTS)
dpkg_query_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -I$(top_builddir)/getopt
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-I$(top_builddir)/getopt
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -148,7 +148,7 @@
- LIBMULTITHREAD = @LIBMULTITHREAD@
+@@ -123,7 +123,7 @@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
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.14 -r1.15 dpkg.spec
--- openpkg-src/dpkg/dpkg.spec 8 Jan 2008 18:54:19 -0000 1.14
+++ openpkg-src/dpkg/dpkg.spec 22 Jan 2008 16:04:20 -0000 1.15
@@ -22,8 +22,8 @@
##
# package version
-%define V_tarball 1.14.15
-%define V_subdir 1.14.15
+%define V_tarball 1.14.16.1
+%define V_subdir 1.14.16.1
# package information
Name: dpkg
@@ -36,7 +36,7 @@
Group: Archiver
License: GPL
Version: %{V_tarball}
-Release: 20080108
+Release: 20080122
# list of sources
Source0:
http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
