OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 03-Mar-2009 21:05:24
Branch: HEAD Handle: 2009030320052400
Modified files:
openpkg-src/dpkg dpkg.patch dpkg.spec
Log:
upgrading package: dpkg 1.14.25 -> 1.15.0
Summary:
Revision Changes Path
1.9 +36 -100 openpkg-src/dpkg/dpkg.patch
1.28 +3 -3 openpkg-src/dpkg/dpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dpkg/dpkg.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 dpkg.patch
--- openpkg-src/dpkg/dpkg.patch 1 Apr 2008 20:03:10 -0000 1.8
+++ openpkg-src/dpkg/dpkg.patch 3 Mar 2009 20:05:24 -0000 1.9
@@ -1,60 +1,21 @@
-Index: dpkg-deb/Makefile.in
---- 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-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-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 @@
+--- dselect/Makefile.in.orig 2009-03-02 05:14:32 +0100
++++ dselect/Makefile.in 2009-03-03 20:47:50 +0100
+@@ -642,8 +642,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 | \
+- $(CPP) - | grep 'curses.h' | head -n 1 | \
+ cursesfile=`echo '#include <ncurses/curses.h>' | \
-+ $(CC) $(CPPFLAGS) -E - | grep 'curses.h' | head -n 1 | \
++ $(CPP) $(CPPFLAGS) - | 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 @@
+--- dselect/dselect.h.orig 2009-03-01 04:15:03 +0100
++++ dselect/dselect.h 2009-03-03 20:47:50 +0100
+@@ -30,7 +30,7 @@
#include <signal.h>
#undef ERR
@@ -64,21 +25,32 @@
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>
+--- dselect/main.cc.orig 2009-03-01 04:15:03 +0100
++++ dselect/main.cc 2009-03-03 20:47:50 +0100
+@@ -43,7 +43,7 @@
+ #include <locale.h>
+ #endif
-#include <ncursesw/term.h>
+#include <ncurses/term.h>
- extern "C" {
#include <dpkg.h>
+ #include <dpkg-db.h>
+Index: lib/dpkg-db.h
+--- lib/dpkg-db.h.orig 2009-03-01 04:15:03 +0100
++++ lib/dpkg-db.h 2009-03-03 21:01:27 +0100
+@@ -29,6 +29,7 @@
+
+ #include <sys/types.h>
+ #include <stdio.h>
++#include <stdarg.h>
+
+ struct versionrevision {
+ unsigned long epoch;
Index: lib/tarfn.c
---- 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 @@
+--- lib/tarfn.c.orig 2009-03-01 04:15:03 +0100
++++ lib/tarfn.c 2009-03-03 20:47:50 +0100
+@@ -66,7 +66,9 @@
int len;
char * str;
@@ -90,9 +62,9 @@
memcpy(str, s, len);
str[len] = 0;
Index: man/Makefile.in
---- 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 @@
+--- man/Makefile.in.orig 2009-03-02 05:14:32 +0100
++++ man/Makefile.in 2009-03-03 20:47:50 +0100
+@@ -190,7 +190,7 @@
top_srcdir = @top_srcdir@
# Extract the list of languages from the po4a config file.
@@ -100,8 +72,8 @@
+LINGUAS =
dist_man_MANS = \
822-date.1 \
- cleanup-info.8 \
-@@ -540,7 +540,7 @@
+ deb-control.5 \
+@@ -543,7 +543,7 @@
all-local: all-loc...@use_nls@
all-local-no:
@@ -111,9 +83,9 @@
# FIXME: Use a stamp file until po4a supports them internally.
man.stamp:
Index: scripts/Makefile.in
---- 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 @@
+--- scripts/Makefile.in.orig 2009-03-02 05:14:32 +0100
++++ scripts/Makefile.in 2009-03-03 20:47:50 +0100
+@@ -736,8 +736,8 @@
$(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)
install-data-local:
@@ -124,39 +96,3 @@
# Ideally we'd use 'sed -i', but unfortunately that's not portable.
install-data-hook:
-Index: src/Makefile.in
---- 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.27 -r1.28 dpkg.spec
--- openpkg-src/dpkg/dpkg.spec 3 Feb 2009 06:53:29 -0000 1.27
+++ openpkg-src/dpkg/dpkg.spec 3 Mar 2009 20:05:24 -0000 1.28
@@ -22,8 +22,8 @@
##
# package version
-%define V_tarball 1.14.25
-%define V_subdir 1.14.25
+%define V_tarball 1.15.0
+%define V_subdir 1.15.0
# package information
Name: dpkg
@@ -36,7 +36,7 @@
Group: Archiver
License: GPL
Version: %{V_tarball}
-Release: 20090203
+Release: 20090303
# 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
