wok-6.x rev 6792

merge
author Christopher Rogers <slaxemulator@gmail.com>
date Mon Oct 18 17:37:17 2010 +0000 (2010-10-18)
parents 56edd85935af e97b439c02c1
children 4c76c5893fda
files
line diff
     1.1 --- a/cdrkit-audio/receipt	Mon Oct 18 17:36:33 2010 +0000
     1.2 +++ b/cdrkit-audio/receipt	Mon Oct 18 17:37:17 2010 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="cdrkit-audio"
     1.7 -VERSION="1.1.10"
     1.8 +VERSION="1.1.11"
     1.9  CATEGORY="multimedia"
    1.10  SHORT_DESC="Icedax, cdda2ogg and other tools for extracting audio files."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -15,7 +15,6 @@
    1.13  	cp -a $_pkg/usr/bin/cdda* $fs/usr/bin
    1.14  	cp $_pkg/usr/bin/icedax $fs/usr/bin
    1.15  	cp $_pkg/usr/bin/pitchplay $fs/usr/bin
    1.16 -	strip -s $fs/usr/bin/* 2>/dev/null
    1.17  	# Make symlinks for cdrtools compatibility
    1.18  	cd $fs/usr/bin
    1.19  	ln -s icedax cdda2wav 
     2.1 --- a/cdrkit-isoinfo/receipt	Mon Oct 18 17:36:33 2010 +0000
     2.2 +++ b/cdrkit-isoinfo/receipt	Mon Oct 18 17:37:17 2010 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="cdrkit-isoinfo"
     2.7 -VERSION="1.1.10"
     2.8 +VERSION="1.1.11"
     2.9  CATEGORY="multimedia"
    2.10  SHORT_DESC="Isoinfo Utility programs for iso9660 images"
    2.11  MAINTAINER="jozee@slitaz.org"
    2.12 @@ -12,7 +12,5 @@
    2.13  genpkg_rules()
    2.14  {
    2.15  	mkdir -p $fs/usr/bin
    2.16 -	cp -a $_pkg/usr/bin/isoinfo $fs/usr/bin
    2.17 -	strip -s $fs/usr/bin/* 2>/dev/null
    2.18 -	
    2.19 +	cp -a $_pkg/usr/bin/isoinfo $fs/usr/bin	
    2.20  }
     3.1 --- a/cdrkit/receipt	Mon Oct 18 17:36:33 2010 +0000
     3.2 +++ b/cdrkit/receipt	Mon Oct 18 17:37:17 2010 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="cdrkit"
     3.7 -VERSION="1.1.10"
     3.8 +VERSION="1.1.11"
     3.9  CATEGORY="utilities"
    3.10  SHORT_DESC="Wodim for recording/blanking CDs/DVDs and genisoimage for ISO."
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12 @@ -18,8 +18,8 @@
    3.13  	sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' \
    3.14  		genisoimage/CMakeLists.txt
    3.15  	#patch -p1 < ../stuff/$PACKAGE-1.1.9-glibc-2.10.patch || exit 1
    3.16 -	grep -qs 'define u8' libusal/scsi-linux-sg.c ||
    3.17 -	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' libusal/scsi-linux-sg.c
    3.18 +	#grep -qs 'define u8' libusal/scsi-linux-sg.c ||
    3.19 +	#sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' libusal/scsi-linux-sg.c
    3.20  	make &&
    3.21  	make install PREFIX=$PWD/_pkg/usr
    3.22  }
    3.23 @@ -29,12 +29,10 @@
    3.24  {
    3.25  	mkdir -p $fs/usr/bin
    3.26  	cp $_pkg/usr/bin/genisoimage $fs/usr/bin
    3.27 -	cp $_pkg/usr/bin/wodim $fs/usr/bin
    3.28 -	strip -s $fs/usr/bin/*
    3.29 -
    3.30 +	cp $_pkg/usr/bin/wodim $fs/usr/bin	
    3.31  	# Make symlinks for cdrtools compatibility
    3.32 -  cd $fs/usr/bin
    3.33 -  ln -s wodim cdrecord
    3.34 -  ln -s genisoimage mkisofs
    3.35 -  ln -s genisoimage mkhybrid
    3.36 +	cd $fs/usr/bin
    3.37 +	ln -s wodim cdrecord
    3.38 +	ln -s genisoimage mkisofs
    3.39 +	ln -s genisoimage mkhybrid
    3.40  }