aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Johnson <youngmug@animeneko.net>2010-05-11 19:46:22 +0200
committerAlan Hicks <alan@lizella.net>2010-05-11 19:46:22 +0200
commit11cc83fe3cb41f89f133ac84df93db006269425f (patch)
tree3a7d901b898cee6faa3c0ddc78ff3a617557cf00
parentf4df8cfaadd8cb8458358757bcddd46fb4db3616 (diff)
system/cdrkit: Updated for version 1.1.2
-rw-r--r--system/cdrkit/README12
-rw-r--r--system/cdrkit/cdrkit.SlackBuild6
-rw-r--r--system/cdrkit/slack-desc8
3 files changed, 14 insertions, 12 deletions
diff --git a/system/cdrkit/README b/system/cdrkit/README
index 2db2b12aff5d2..19f84b1ea5946 100644
--- a/system/cdrkit/README
+++ b/system/cdrkit/README
@@ -3,10 +3,10 @@ This is a fork of the last free GPL version of cdrtools.
wodim -- burn discs in most ATAPI and SCSI CD-R drives (formerly cdrecord).
genisoimage -- create ISO9660/HFS/Joliet CD-ROM images (formerly mkisofs).
-CDRKit was forked from CDRTools because of an alleged license
-incompatibility that would make it impossible to distribute
-(combining GPL and CDDL code in the same binary).
-See http://debburn.alioth.debian.org/FORK for more details,
+CDRKit was forked from CDRTools because of an alleged license
+incompatibility that would make it impossible to distribute
+(combining GPL and CDDL code in the same binary).
+See http://debburn.alioth.debian.org/FORK for more details,
but note that the issue is not settled - there are arguments
that the interaction between the CDDL-licensed portion (the build
tools) and the GPL-licensed portion (the actual code) is such
@@ -17,8 +17,8 @@ if you wish to use it.
This package will conflict with cdrtools - in other words, you need
to remove cdrtools before installing cdrkit.
-This package will require libcap, cmake, and zisofs-tools, all of
-which are also available in our repository.
+This package will require libcap, and zisofs-tools, both of which are
+available in our repository.
This script will create symlinks for mkisofs and cdda2wav for backwards
compatability with cdrtools and previous versions of cdrkit.
diff --git a/system/cdrkit/cdrkit.SlackBuild b/system/cdrkit/cdrkit.SlackBuild
index 09b2b30ac66fa..18552dfbbfb77 100644
--- a/system/cdrkit/cdrkit.SlackBuild
+++ b/system/cdrkit/cdrkit.SlackBuild
@@ -80,9 +80,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-
-if [ "$1" = "--cleanup" ]; then
- cd $CWD
- rm -rf $TMP/$PRGNAM-$VERSION
- rm -rf $PKG
-fi
diff --git a/system/cdrkit/slack-desc b/system/cdrkit/slack-desc
index d6eb35a17b20e..4917f486b191f 100644
--- a/system/cdrkit/slack-desc
+++ b/system/cdrkit/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
cdrkit: cdrkit (Tools for mastering and writing compact discs)
cdrkit:
cdrkit: This is a fork of the last free GPL version of cdrtools.