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: 01-Apr-2008 22:03:11
Branch: HEAD Handle: 2008040121031000
Modified files:
openpkg-src/dpkg dpkg.patch dpkg.spec
Log:
upgrading package: dpkg 1.14.16.6 -> 1.14.17
Summary:
Revision Changes Path
1.8 +120 -76 openpkg-src/dpkg/dpkg.patch
1.19 +3 -3 openpkg-src/dpkg/dpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dpkg/dpkg.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 dpkg.patch
--- openpkg-src/dpkg/dpkg.patch 23 Jan 2008 20:03:02 -0000 1.7
+++ openpkg-src/dpkg/dpkg.patch 1 Apr 2008 20:03:10 -0000 1.8
@@ -1,55 +1,84 @@
Index: dpkg-deb/Makefile.in
---- dpkg-deb/Makefile.in.orig 2008-01-23 07:46:59 +0100
-+++ dpkg-deb/Makefile.in 2008-01-23 20:52:54 +0100
-@@ -111,7 +111,7 @@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = $(top_builddir)/getopt/libopt.a @LIBS@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
+--- dpkg-deb/Makefile.in.orig 2008-03-30 11:58:18 +0200
++++ dpkg-deb/Makefile.in 2008-04-01 21:56:55 +0200
+@@ -213,8 +213,7 @@
+ main.c
+
+ dpkg_deb_LDADD = \
+- ../libcompat/libcompat.a \
+- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
++ $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
../libcompat/libcompat.a
+
+ all: all-am
+
Index: dpkg-split/Makefile.in
---- dpkg-split/Makefile.in.orig 2008-01-23 07:46:59 +0100
-+++ dpkg-split/Makefile.in 2008-01-23 20:52:54 +0100
-@@ -112,7 +112,7 @@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = $(top_builddir)/getopt/libopt.a @LIBS@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
+--- dpkg-split/Makefile.in.orig 2008-03-30 11:58:18 +0200
++++ dpkg-split/Makefile.in 2008-04-01 21:57:43 +0200
+@@ -217,9 +217,8 @@
+ split.c
+
+ dpkg_split_LDADD = \
+- ../libcompat/libcompat.a \
+ $(LIBINTL) \
+- ../lib/libdpkg.a
++ ../lib/libdpkg.a ../libcompat/libcompat.a
+
+ pkglib_SCRIPTS = mksplit
+ EXTRA_DIST = mksplit.pl
Index: dselect/Makefile.in
---- dselect/Makefile.in.orig 2008-01-23 07:47:00 +0100
-+++ dselect/Makefile.in 2008-01-23 20:52:54 +0100
-@@ -130,7 +130,7 @@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = $(top_builddir)/getopt/libopt.a @LIBS@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
-Index: lib/Makefile.in
---- lib/Makefile.in.orig 2008-01-23 07:47:02 +0100
-+++ lib/Makefile.in 2008-01-23 20:56:26 +0100
-@@ -63,7 +63,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
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+--- dselect/Makefile.in.orig 2008-03-30 11:58:18 +0200
++++ dselect/Makefile.in 2008-04-01 21:56:55 +0200
+@@ -249,10 +249,9 @@
+ pkgtop.cc
+
+ dselect_LDADD = \
+- ../libcompat/libcompat.a \
+ $(LIBINTL) \
+ $(CURSES_LIBS) \
+- ../lib/libdpkg.a
++ ../lib/libdpkg.a ../libcompat/libcompat.a
+
+ EXTRA_DIST = keyoverride mkcurkeys.pl
+ CLEANFILES = curkeys.h
+@@ -640,8 +639,8 @@
+
+ curkeys.$(OBJEXT): curkeys.h
+ curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
+- cursesfile=`echo '#include <ncursesw/curses.h>' | \
+- $(CC) -E - | grep 'curses.h' | head -n 1 | \
++ cursesfile=`echo '#include <ncurses/curses.h>' | \
++ $(CC) $(CPPFLAGS) -E - | grep 'curses.h' | head -n 1 | \
+ sed -e 's/^[^"]*"//; s/".*$$//'`; \
+ if [ "$$cursesfile" = "" ]; then \
+ echo "can't find curses file"; exit 1; \
+Index: dselect/dselect.h
+--- dselect/dselect.h.orig 2008-03-30 11:57:41 +0200
++++ dselect/dselect.h 2008-04-01 21:56:55 +0200
+@@ -28,7 +28,7 @@
+
+ #include <signal.h>
+ #undef ERR
+-#include <ncursesw/curses.h>
++#include <ncurses/curses.h>
+
+ struct helpmenuentry {
+ char key;
+Index: dselect/main.cc
+--- dselect/main.cc.orig 2008-03-30 11:57:41 +0200
++++ dselect/main.cc 2008-04-01 21:56:55 +0200
+@@ -37,7 +37,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+
+-#include <ncursesw/term.h>
++#include <ncurses/term.h>
+
+ extern "C" {
+ #include <dpkg.h>
Index: lib/tarfn.c
---- lib/tarfn.c.orig 2008-01-23 07:34:44 +0100
-+++ lib/tarfn.c 2008-01-23 20:52:54 +0100
-@@ -60,7 +60,9 @@
+--- lib/tarfn.c.orig 2008-03-30 10:58:51 +0200
++++ lib/tarfn.c 2008-04-01 21:56:55 +0200
+@@ -62,7 +62,9 @@
int len;
char * str;
@@ -57,13 +86,13 @@
+ len = strlen(s);
+ if (len > size)
+ len = size;
- str = malloc(len + 1);
+ str = m_malloc(len + 1);
memcpy(str, s, len);
str[len] = 0;
Index: man/Makefile.in
---- man/Makefile.in.orig 2008-01-23 07:47:02 +0100
-+++ man/Makefile.in 2008-01-23 20:52:54 +0100
-@@ -186,7 +186,7 @@
+--- man/Makefile.in.orig 2008-03-30 11:58:18 +0200
++++ man/Makefile.in 2008-04-01 21:56:55 +0200
+@@ -189,7 +189,7 @@
top_srcdir = @top_srcdir@
# Extract the list of languages from the po4a config file.
@@ -72,7 +101,7 @@
dist_man_MANS = \
822-date.1 \
cleanup-info.8 \
-@@ -537,7 +537,7 @@
+@@ -540,7 +540,7 @@
all-local: [EMAIL PROTECTED]@
all-local-no:
@@ -82,9 +111,9 @@
# FIXME: Use a stamp file until po4a supports them internally.
man.stamp:
Index: scripts/Makefile.in
---- scripts/Makefile.in.orig 2008-01-23 07:47:02 +0100
-+++ scripts/Makefile.in 2008-01-23 20:52:54 +0100
-@@ -737,8 +737,8 @@
+--- scripts/Makefile.in.orig 2008-03-30 11:58:19 +0200
++++ scripts/Makefile.in 2008-04-01 21:56:55 +0200
+@@ -757,8 +757,8 @@
$(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)
install-data-local:
@@ -96,23 +125,38 @@
# Ideally we'd use 'sed -i', but unfortunately that's not portable.
install-data-hook:
Index: src/Makefile.in
---- src/Makefile.in.orig 2008-01-23 07:47:02 +0100
-+++ src/Makefile.in 2008-01-23 20:56:44 +0100
-@@ -68,7 +68,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
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -118,7 +118,7 @@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = $(top_builddir)/getopt/libopt.a @LIBS@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
+--- src/Makefile.in.orig 2008-03-30 11:58:19 +0200
++++ src/Makefile.in 2008-04-01 21:56:55 +0200
+@@ -239,8 +239,8 @@
+ update.c
+
+ dpkg_LDADD = \
+- ../libcompat/libcompat.a \
+- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
++ \
++ $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
../libcompat/libcompat.a
+
+ dpkg_query_SOURCES = \
+ errors.c \
+@@ -248,17 +248,17 @@
+ query.c
+
+ dpkg_query_LDADD = \
+- ../libcompat/libcompat.a \
++ \
+ $(LIBINTL) \
+- ../lib/libdpkg.a
++ ../lib/libdpkg.a ../libcompat/libcompat.a
+
+ dpkg_trigger_SOURCES = \
+ trigcmd.c
+
+ dpkg_trigger_LDADD = \
+- ../libcompat/libcompat.a \
++ \
+ $(LIBINTL) \
+- ../lib/libdpkg.a
++ ../lib/libdpkg.a ../libcompat/libcompat.a
+
+ all: all-am
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dpkg/dpkg.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 dpkg.spec
--- openpkg-src/dpkg/dpkg.spec 28 Jan 2008 18:16:22 -0000 1.18
+++ openpkg-src/dpkg/dpkg.spec 1 Apr 2008 20:03:10 -0000 1.19
@@ -22,8 +22,8 @@
##
# package version
-%define V_tarball 1.14.16.6
-%define V_subdir 1.14.16.6
+%define V_tarball 1.14.17
+%define V_subdir 1.14.17
# package information
Name: dpkg
@@ -36,7 +36,7 @@
Group: Archiver
License: GPL
Version: %{V_tarball}
-Release: 20080128
+Release: 20080401
# 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 [email protected]
