Browse Source

Daniel Jahre:


			
			
				rocklinux
			
			
		
Daniel Jahre 19 years ago
parent
commit
80007fe423
3 changed files with 2 additions and 197 deletions
  1. +0
    -134
      package/tibit/dpkg/00-mk-docdir-skip-event.patch
  2. +2
    -2
      package/tibit/dpkg/dpkg.desc
  3. +0
    -61
      package/tibit/dpkg/head1.patch

+ 0
- 134
package/tibit/dpkg/00-mk-docdir-skip-event.patch

@ -1,134 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/tibit/dpkg/00-mk-docdir-skip-event.patch
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
diff -ur orig-dpkg-1.9.21/Makefile.in dpkg-1.9.21/Makefile.in
--- orig-dpkg-1.9.21/Makefile.in 2001-03-04 15:39:05.000000000 +0100
+++ dpkg-1.9.21/Makefile.in 2003-02-21 11:29:07.000000000 +0100
@@ -9,7 +9,7 @@
include Makefile.conf
SUBDIRS = include optlib lib intl dpkg-deb split scripts utils main \
- utils @DSELECTDIR@ po methods doc
+ @DSELECTDIR@ po methods doc
all: version.h all-recursive
diff -ur orig-dpkg-1.9.21/doc/Makefile.in dpkg-1.9.21/doc/Makefile.in
--- orig-dpkg-1.9.21/doc/Makefile.in 2000-12-30 23:12:10.000000000 +0100
+++ dpkg-1.9.21/doc/Makefile.in 2003-02-21 11:23:48.000000000 +0100
@@ -2,8 +2,6 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-SUBDIRS = fr ja sv
-
include ../Makefile.conf
MAN5PAGES = deb-control.5 deb-old.5 deb.5
@@ -44,6 +42,7 @@
$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/internals/$$bn ; \
done
endif
+ $(mkinstalldirs) $(DESTDIR)$(docdir)
$(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)/ChangeLog.manuals
set -e ; for i in ChangeLog THANKS TODO ; do \
$(INSTALL_DATA) $(top_srcdir)/$$i $(DESTDIR)$(docdir) ; \
diff -ur orig-dpkg-1.9.21/dselect/mkcurkeys.pl dpkg-1.9.21/dselect/mkcurkeys.pl
--- orig-dpkg-1.9.21/dselect/mkcurkeys.pl 1999-01-29 09:54:00.000000000 +0100
+++ dpkg-1.9.21/dselect/mkcurkeys.pl 2003-02-21 10:46:51.000000000 +0100
@@ -43,6 +43,7 @@
m/#define KEY_(\w+)\s+\d+\s+/ || next;
$rhs= $';
$k= "KEY_$1";
+ if ($k eq 'KEY_EVENT') { next; }
$_= $1;
&capit;
$base{$k}= $_;
diff -ur orig-dpkg-1.9.21/scripts/Makefile.in dpkg-1.9.21/scripts/Makefile.in
--- orig-dpkg-1.9.21/scripts/Makefile.in 2001-06-20 02:53:45.000000000 +0200
+++ dpkg-1.9.21/scripts/Makefile.in 2003-02-21 11:32:55.000000000 +0100
@@ -10,13 +10,12 @@
dpkg-scanpackages dpkg-scansources \
dpkg-architecture dpkg-checkbuilddeps
-SBIN_SCRIPTS = update-rc.d update-alternatives install-info \
- dpkg-divert dpkg-statoverride cleanup-info
+SBIN_SCRIPTS = dpkg-divert dpkg-statoverride
MAN1PAGES = dpkg-name.1 dpkg-source.1 822-date.1 \
dpkg-checkbuilddeps.1
-MAN8PAGES = update-rc.d.8 update-alternatives.8 install-info.8 \
- cleanup-info.8 dpkg-scanpackages.8 dpkg-scansources.8 \
+MAN8PAGES = update-alternatives.8 \
+ dpkg-scanpackages.8 dpkg-scansources.8 \
dpkg-divert.8 dpkg-statoverride.8
CHANGELOG_PARSERS = cl-debian
diff -ur orig-dpkg-1.9.21/utils/Makefile.in dpkg-1.9.21/utils/Makefile.in
--- orig-dpkg-1.9.21/utils/Makefile.in 2001-04-24 13:05:58.000000000 +0200
+++ dpkg-1.9.21/utils/Makefile.in 2003-02-21 11:28:58.000000000 +0100
@@ -12,23 +12,19 @@
SSD_OBJECTS = $(patsubst %.c, %.o, $(SSD_SOURCES))
SSD_MANPAGES = start-stop-daemon.8
-MD5_SOURCES = md5sum.c
-MD5_OBJECTS = $(patsubst %.c, %.o, $(MD5_SOURCES))
-MD5_MANPAGES = md5sum.1
-
ENOENT_SOURCES = enoent.c
ENOENT_OBJECTS = $(patsubst %.c, %.o, $(ENOENT_SOURCES))
-GENFILES = $(MD5_OBJECTS) md5sum $(ENOENT_OBJECTS) enoent
+GENFILES = $(ENOENT_OBJECTS) enoent
ifeq (@USE_START_STOP_DAEMON@, true)
GENFILES += $(SSD_OBJECTS) start-stop-daemon
endif
.PHONY: all
ifeq (@USE_START_STOP_DAEMON@, true)
-all:: start-stop-daemon md5sum enoent
+all:: enoent
else
-all:: md5sum enoent
+all:: enoent
endif
.PHONY: install
@@ -51,9 +47,6 @@
$(mkinstalldirs) $(DESTDIR)/$(sbindir)
$(INSTALL_PROGRAM) start-stop-daemon $(DESTDIR)/$(sbindir)
endif
- $(mkinstalldirs) $(DESTDIR)/$(bindir)
- $(INSTALL_PROGRAM) md5sum $(DESTDIR)/$(bindir)
-
$(mkinstalldirs) $(DESTDIR)/$(dpkglibdir)
$(INSTALL_PROGRAM) enoent $(DESTDIR)/$(dpkglibdir)
@@ -63,11 +56,7 @@
$(mkinstalldirs) $(DESTDIR)/$(man8dir)
$(INSTALL_DATA) $(srcdir)/$(SSD_MANPAGES) $(DESTDIR)/$(man8dir)
endif
- $(mkinstalldirs) $(DESTDIR)/$(man1dir)
- $(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
$(CC) $(LDFLAGS) -o $@ $^ $(SSD_LIBS)
-md5sum: $(MD5_OBJECTS) ../lib/libdpkg.a
- $(CC) $(LDFLAGS) -o $@ $^ $(NLS_LIBS)

+ 2
- 2
package/tibit/dpkg/dpkg.desc

@ -42,8 +42,8 @@
[L] GPL
[S] Stable
[V] 1.9.21
[V] 1.13.11
[P] X -?---5---9 113.700
[D] 614820839 dpkg_1.9.21.tar.gz http://ftp.debian.org/debian/pool/main/d/dpkg/
[D] 2661223084 dpkg_1.13.11.tar.gz http://ftp.debian.org/debian/pool/main/d/dpkg/

+ 0
- 61
package/tibit/dpkg/head1.patch

@ -1,61 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/tibit/dpkg/head1.patch
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./config.guess 2001-04-15 22:37:33.000000000 +0200
+++ /tmp/tmp.kINzFP2545 2004-05-21 10:36:10.000000000 +0200
@@ -314,7 +314,7 @@
echo m68k-sun-sunos${UNAME_RELEASE}
exit 0 ;;
sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ UNAME_RELEASE=`(head -n 1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
@@ -493,7 +493,7 @@
fi
exit 0 ;;
*:AIX:*:[45])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -n 1 | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
--- ./dselect/Makefile.in 2001-04-24 13:02:50.000000000 +0200
+++ /tmp/tmp.SHaCDd2558 2004-05-21 10:36:11.000000000 +0200
@@ -57,7 +57,7 @@
curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
cursesfile=`echo '#include <curses.h>' | \
- $(CC) -E - | grep 'curses.h' | head -1 | \
+ $(CC) -E - | grep 'curses.h' | head -n 1 | \
$(SED) -e 's/^[^"]*"//; s/".*$$//'`; \
if [ "$$cursesfile" = "" ]; then echo "can't find curses file"; exit 1; fi; \
perl $(srcdir)/mkcurkeys.pl $< $$cursesfile > $@
--- ./methods/disk.setup 2000-12-24 09:41:48.000000000 +0100
+++ /tmp/tmp.fKYzOF2566 2004-05-21 10:36:11.000000000 +0200
@@ -422,7 +422,7 @@
fi
if ! ( find "$mountpoint$2/" -follow -name '*.deb' -print \
- | head -1 ) 2>/dev/null | grep . >/dev/null
+ | head -n 1 ) 2>/dev/null | grep . >/dev/null
then
echo "\`$2' does not contain any *.deb packages. Hmmpf."
return

Loading…
Cancel
Save