Merge branch '2.3' into 2.4

This commit is contained in:
Juergen Daubert 2007-10-30 09:26:25 +01:00
commit 67a216f12b
15 changed files with 36 additions and 42 deletions

View File

@ -1,8 +1,10 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/btcflash
-rwxr-xr-x root/root usr/bin/cdda2wav
-rwxr-xr-x root/root usr/bin/cdrecord
-rwxr-xr-x root/root usr/bin/devdump
-rwxr-xr-x root/root usr/bin/isodebug
-rwxr-xr-x root/root usr/bin/isodump
-rwxr-xr-x root/root usr/bin/isoinfo
-rwxr-xr-x root/root usr/bin/isovfy
@ -10,16 +12,22 @@ lrwxrwxrwx root/root usr/bin/mkhybrid -> mkisofs
-rwxr-xr-x root/root usr/bin/mkisofs
-rwxr-xr-x root/root usr/bin/readcd
-rwxr-xr-x root/root usr/bin/scgcheck
-rwxr-xr-x root/root usr/bin/scgskeleton
drwxr-xr-x root/root usr/etc/
drwxr-xr-x root/root usr/etc/default/
-rw-r--r-- root/root usr/etc/default/cdrecord
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/btcflash.1.gz
-rw-r--r-- root/root usr/man/man1/cdda2wav.1.gz
-rw-r--r-- root/root usr/man/man1/cdrecord.1.gz
-rw-r--r-- root/root usr/man/man1/readcd.1.gz
-rw-r--r-- root/root usr/man/man1/scgcheck.1.gz
drwxr-xr-x root/root usr/man/man8/
lrwxrwxrwx root/root usr/man/man8/devdump.8.gz -> isoinfo.8.gz
lrwxrwxrwx root/root usr/man/man8/isodump.8.gz -> isoinfo.8.gz
-rw-r--r-- root/root usr/man/man8/devdump.8.gz
-rw-r--r-- root/root usr/man/man8/isodebug.8.gz
-rw-r--r-- root/root usr/man/man8/isodump.8.gz
-rw-r--r-- root/root usr/man/man8/isoinfo.8.gz
lrwxrwxrwx root/root usr/man/man8/isovfy.8.gz -> isoinfo.8.gz
-rw-r--r-- root/root usr/man/man8/isovfy.8.gz
-rw-r--r-- root/root usr/man/man8/mkhybrid.8.gz
-rw-r--r-- root/root usr/man/man8/mkisofs.8.gz

View File

@ -1,2 +1 @@
354f8a0b7197f1f2b381dff6b538d1a6 cdrtools-2.01.patch
d44a81460e97ae02931c31188fe8d3fd cdrtools-2.01.tar.bz2
0e6f9ecd4e4df0735a981156c0b22682 cdrtools-2.01.01a36.tar.bz2

View File

@ -3,26 +3,19 @@
# Maintainer: Simon Gloßner, viper at hometux dot de
name=cdrtools
version=2.01
release=2
source=(ftp://ftp.berlios.de/pub/cdrecord/$name-$version.tar.bz2 \
$name-$version.patch)
version=2.01.01a36
release=1
source=(ftp://ftp.berlios.de/pub/cdrecord/alpha/$name-$version.tar.bz2)
build() {
cd $name-$version
cd $name-2.01.01
patch -p1 < ../$name-$version.patch
make
make INS_BASE=$PKG/usr install
./Gmake.linux
./Gmake.linux INS_BASE=$PKG/usr install
ln -sf isoinfo.8 $PKG/usr/man/man8/isodump.8
ln -sf isoinfo.8 $PKG/usr/man/man8/devdump.8
ln -sf isoinfo.8 $PKG/usr/man/man8/isovfy.8
rm -rf $PKG/usr/{include,lib,sbin,man/man5}
rm -rf $PKG/usr/{include,lib,sbin,share,man/man5}
rm -rf $PKG/usr/etc/default/rscsi
rm -rf $PKG/usr/man/man1/cdda2ogg.1
rm -rf $PKG/usr/bin/{skel,isodebug}
chown -R root.root $PKG
chmod -R u+w,g-w $PKG

View File

@ -1,12 +0,0 @@
diff -ru cdrtools-2.01/DEFAULTS/Defaults.linux cdrtools-2.01-new/DEFAULTS/Defaults.linux
--- cdrtools-2.01/DEFAULTS/Defaults.linux 2003-02-16 01:01:48.000000000 +0100
+++ cdrtools-2.01-new/DEFAULTS/Defaults.linux 2005-03-23 22:29:45.925249224 +0100
@@ -18,7 +18,7 @@
###########################################################################
CWARNOPTS=
-DEFINCDIRS= $(SRCROOT)/include /usr/src/linux/include
+DEFINCDIRS= $(SRCROOT)/include
LDPATH= -L/opt/schily/lib
RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)

View File

@ -1,2 +1,2 @@
52d3396fd3ce07441bb0da8e7690b2b3 clex-3.16.tar.gz
81aeca7c0a6fab0a26f669cfcfe86f2a clex-3.17.tar.gz
ee270c60bc5e8b0afc81340528c7d32f clex-bs.patch

View File

@ -4,7 +4,7 @@
# Depends on: ncurses
name=clex
version=3.16
version=3.17
release=1
source=(http://www.clex.sk/download/$name-$version.tar.gz \
$name-bs.patch)

View File

@ -1,3 +1,3 @@
23bc5ff22fe4f9a208d65fbbfd489ad9 30-dbus.launch
0552a9b54beb4a044951b7cdbc8fc855 dbus-1.0.2.tar.gz
f3d2047d1a05cc0c6fcb5afaea4605a5 rc.dbus
dd882e45b9397a5dbf8650057ee9a340 rc.dbus

View File

@ -5,7 +5,7 @@
name=dbus
version=1.0.2
release=3
release=4
source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \
rc.dbus 30-dbus.launch)

View File

@ -13,7 +13,7 @@ case $1 in
;;
stop)
killall -q /usr/sbin/dbus-daemon
rm -f /var/run/dbus/pid
rm -f /var/run/dbus/dbus.pid
;;
restart)
$0 stop

View File

@ -1,3 +1,3 @@
1c37d911bc42fb40f0ef5a3f5822b170 dovecot
94b7d29cf44f63f89d538361afa05c40 dovecot-1.0.5.tar.gz
4d0dbe1fe87fd0f69acd28d100fe72ab dovecot-1.0.7.tar.gz
9678a18c4fb67618e263fc6ce8a4e95c dovecot-config.patch

View File

@ -4,7 +4,7 @@
# Depends on: openssl
name=dovecot
version=1.0.5
version=1.0.7
release=1
source=(http://dovecot.org/releases/1.0/$name-$version.tar.gz \
dovecot-config.patch dovecot)

View File

@ -6,7 +6,7 @@
name=stunnel
version=4.20
release=1
source=(ftp://stunnel.mirt.net/stunnel/$name-$version.tar.gz \
source=(http://www.stunnel.org/download/stunnel/src/$name-$version.tar.gz \
$name-config.patch $name)
build () {

View File

@ -134,6 +134,7 @@ drwxr-xr-x root/root usr/include/wine/windows/
-rw-r--r-- root/root usr/include/wine/windows/d3dx8.h
-rw-r--r-- root/root usr/include/wine/windows/d3dx8core.h
-rw-r--r-- root/root usr/include/wine/windows/d3dx8math.h
-rw-r--r-- root/root usr/include/wine/windows/d3dx8math.inl
-rw-r--r-- root/root usr/include/wine/windows/dbghelp.h
-rw-r--r-- root/root usr/include/wine/windows/dbinit.idl
-rw-r--r-- root/root usr/include/wine/windows/dbprop.idl
@ -159,6 +160,8 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/devenum.idl
-rw-r--r-- root/root usr/include/wine/windows/devguid.h
-rw-r--r-- root/root usr/include/wine/windows/digitalv.h
-rw-r--r-- root/root usr/include/wine/windows/dimm.h
-rw-r--r-- root/root usr/include/wine/windows/dimm.idl
-rw-r--r-- root/root usr/include/wine/windows/dinput.h
-rw-r--r-- root/root usr/include/wine/windows/dispdib.h
-rw-r--r-- root/root usr/include/wine/windows/dispex.h
@ -618,9 +621,11 @@ drwxr-xr-x root/root usr/lib/wine/
-rw-r--r-- root/root usr/lib/wine/libcomctl32.def
-rw-r--r-- root/root usr/lib/wine/libcomdlg32.def
-rw-r--r-- root/root usr/lib/wine/libcompstui.def
-rw-r--r-- root/root usr/lib/wine/libcredui.def
-rw-r--r-- root/root usr/lib/wine/libcrtdll.def
-rw-r--r-- root/root usr/lib/wine/libcrypt32.def
-rw-r--r-- root/root usr/lib/wine/libcryptdll.def
-rw-r--r-- root/root usr/lib/wine/libcryptnet.def
-rw-r--r-- root/root usr/lib/wine/libctl3d32.def
-rw-r--r-- root/root usr/lib/wine/libd3d8.def
-rw-r--r-- root/root usr/lib/wine/libd3d9.def
@ -767,6 +772,7 @@ drwxr-xr-x root/root usr/lib/wine/
-rwxr-xr-x root/root usr/lib/wine/msi.dll.so
-rwxr-xr-x root/root usr/lib/wine/msiexec.exe.so
-rwxr-xr-x root/root usr/lib/wine/msimg32.dll.so
-rwxr-xr-x root/root usr/lib/wine/msimtf.dll.so
-rwxr-xr-x root/root usr/lib/wine/msisys.ocx.so
-rwxr-xr-x root/root usr/lib/wine/msnet32.dll.so
-rwxr-xr-x root/root usr/lib/wine/msrle32.dll.so

View File

@ -1 +1 @@
dfeeb7c137a1abab917f82dafbef5c8a wine-0.9.47.tar.bz2
e2cc11fe7ec7769bcf8fe4f59b1dd75a wine-0.9.48.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: fontforge
name=wine
version=0.9.47
version=0.9.48
release=1
source=(http://ibiblio.org/pub/linux/system/emulators/wine/wine-$version.tar.bz2)