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: 21-May-2009 19:53:21
Branch: HEAD Handle: 2009052118532100
Modified files:
openpkg-src/dpkg dpkg.patch dpkg.spec
Log:
upgrading package: dpkg 1.15.0 -> 1.15.1
Summary:
Revision Changes Path
1.10 +14 -52 openpkg-src/dpkg/dpkg.patch
1.30 +3 -3 openpkg-src/dpkg/dpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dpkg/dpkg.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 dpkg.patch
--- openpkg-src/dpkg/dpkg.patch 3 Mar 2009 20:05:24 -0000 1.9
+++ openpkg-src/dpkg/dpkg.patch 21 May 2009 17:53:21 -0000 1.10
@@ -1,44 +1,6 @@
-Index: dselect/Makefile.in
---- 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>' | \
-- $(CPP) - | grep 'curses.h' | head -n 1 | \
-+ cursesfile=`echo '#include <ncurses/curses.h>' | \
-+ $(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 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
--#include <ncursesw/curses.h>
-+#include <ncurses/curses.h>
-
- struct helpmenuentry {
- char key;
-Index: dselect/main.cc
---- 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>
-
- #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
+--- lib/dpkg-db.h.orig 2009-05-12 20:30:33 +0200
++++ lib/dpkg-db.h 2009-05-21 19:07:17 +0200
@@ -29,6 +29,7 @@
#include <sys/types.h>
@@ -48,8 +10,8 @@
struct versionrevision {
unsigned long epoch;
Index: lib/tarfn.c
---- lib/tarfn.c.orig 2009-03-01 04:15:03 +0100
-+++ lib/tarfn.c 2009-03-03 20:47:50 +0100
+--- lib/tarfn.c.orig 2009-05-02 17:20:48 +0200
++++ lib/tarfn.c 2009-05-21 19:07:17 +0200
@@ -66,7 +66,9 @@
int len;
char * str;
@@ -62,18 +24,18 @@
memcpy(str, s, len);
str[len] = 0;
Index: man/Makefile.in
---- 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 @@
+--- man/Makefile.in.orig 2009-05-21 06:49:55 +0200
++++ man/Makefile.in 2009-05-21 19:50:34 +0200
+@@ -197,7 +197,7 @@
top_srcdir = @top_srcdir@
# Extract the list of languages from the po4a config file.
--LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p'
$(srcdir)/po/po4a.cfg)
+-LINGUAS = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p'
$(srcdir)/po/po4a.cfg`
+LINGUAS =
- dist_man_MANS = \
- 822-date.1 \
- deb-control.5 \
-@@ -543,7 +543,7 @@
+ dist_man_MANS = deb-control.5 deb-version.5 deb-shlibs.5 \
+ deb-substvars.5 deb-symbols.5 deb-triggers.5 deb-old.5 \
+ deb-override.5 deb.5 dpkg-architecture.1 dpkg-buildpackage.1 \
+@@ -523,7 +523,7 @@
all-local: all-loc...@use_nls@
all-local-no:
@@ -83,8 +45,8 @@
# FIXME: Use a stamp file until po4a supports them internally.
man.stamp:
Index: scripts/Makefile.in
---- scripts/Makefile.in.orig 2009-03-02 05:14:32 +0100
-+++ scripts/Makefile.in 2009-03-03 20:47:50 +0100
+--- scripts/Makefile.in.orig 2009-05-21 06:49:55 +0200
++++ scripts/Makefile.in 2009-05-21 19:07:17 +0200
@@ -736,8 +736,8 @@
$(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dpkg/dpkg.spec
============================================================================
$ cvs diff -u -r1.29 -r1.30 dpkg.spec
--- openpkg-src/dpkg/dpkg.spec 18 Apr 2009 13:09:57 -0000 1.29
+++ openpkg-src/dpkg/dpkg.spec 21 May 2009 17:53:21 -0000 1.30
@@ -22,8 +22,8 @@
##
# package version
-%define V_tarball 1.15.0
-%define V_subdir 1.15.0
+%define V_tarball 1.15.1
+%define V_subdir 1.15.1
# package information
Name: dpkg
@@ -36,7 +36,7 @@
Group: Archiver
License: GPL
Version: %{V_tarball}
-Release: 20090303
+Release: 20090521
# 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
