From 132fe5d6587524cdf2541b476d6c8a479340e8cf Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Tue, 9 May 2006 15:52:41 +0000 Subject: [PATCH] * New upstream release. * Clarified copyright/license of included parts. * Fixed watch file. --- configure | 2 +- configure.ac | 4 ++-- debian/changelog | 9 ++++++++- debian/copyright | 12 ++++++++---- debian/watch | 2 +- src/cdck | Bin 89296 -> 89296 bytes src/config.h | 2 +- src/lib_cdinfo.cpp | 4 ++-- src/lib_cdinfo.h | 4 ++-- 9 files changed, 25 insertions(+), 14 deletions(-) diff --git a/configure b/configure index ce7babf..bd0a1c9 100755 --- a/configure +++ b/configure @@ -1785,7 +1785,7 @@ fi # Define the identity of the package. PACKAGE=cdck - VERSION=0.5.2rc1 + VERSION=0.5.2 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 90bcd52..4083a1a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ dnl $RCSfile: configure.ac,v $ dnl $Author: swaj $ -dnl $Revision: 1.6 $ +dnl $Revision: 1.7 $ AC_INIT AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(cdck, 0.5.2rc1) +AM_INIT_AUTOMAKE(cdck, 0.5.2) S_CFLAGS=${CFLAGS} diff --git a/debian/changelog b/debian/changelog index c0c0b2f..adaf787 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ +cdck (0.5.2-1) unstable; urgency=low + + * New upstream release. + * Clarified copyright/license of included parts. + * Fixed watch file. + + -- gregor herrmann Tue, 9 May 2006 17:51:58 +0200 + cdck (0.5.1+0.5.2rc1-1) unstable; urgency=low * New upstream release. * Removed manpage from debian/ (now included in upstream tarball). * Update to Standards-Version: 3.7.2 (no changes required). * Reverted changes of output of `cdck -h` (fixes included upstream). - * -- gregor herrmann Mon, 8 May 2006 16:44:59 +0200 diff --git a/debian/copyright b/debian/copyright index 66e8386..31605b9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,7 +12,11 @@ GNU GPL 2 (no explicit licence is mentioned but COPYING contains the GNU GPL 2) On Debian systems you can find the text of the GNU General Public Licence 2 at /usr/share/common-licenses/GPL-2 - -Some code to get CD info was taken from cdinfo program -(c) 1996,1997 Gerd Knorr and Heiko Eissfeldt - +src/lib_cdinfo.{cpp,h}: +"This code is from cdinfo and has the following copyrights: + (c) 1996,1997 Gerd Knorr + and Heiko Eissfeldt " + +cdinfo is released under the GPL: +http://www.ibiblio.org/pub/linux/utils/disk-management/cdinfo.c +http://www.ibiblio.org/pub/Linux/utils/disk-management/cdinfo.lsm diff --git a/debian/watch b/debian/watch index aa03380..d91ea94 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ # Compulsory line, this is a version 3 file version=3 -http://swaj.net/unix/index.html cdck-(.*)\.tar\.gz +http://swaj.net/unix/ cdck/cdck-(.*)\.tar\.gz diff --git a/src/cdck b/src/cdck index 492526d37051d827117f786b8b8bd6a814dfa0e4..21ac97e9a2a67bd4baf077337e0395097feecfed 100755 GIT binary patch delta 18 acmcbxll8(*)(wZ2Pi|z9+x%ephb;hJfeK0h delta 22 ecmcbxll8(*)(wZ2GZ!TrPHtq8-uz(shb;hp@e5D@ diff --git a/src/config.h b/src/config.h index 79d6260..ad9d7ad 100644 --- a/src/config.h +++ b/src/config.h @@ -65,7 +65,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.5.2rc1" +#define VERSION "0.5.2" /* Number of bits in a file offset, on hosts where this is settable. */ #define _FILE_OFFSET_BITS 64 diff --git a/src/lib_cdinfo.cpp b/src/lib_cdinfo.cpp index fc1c1cd..c7679b9 100644 --- a/src/lib_cdinfo.cpp +++ b/src/lib_cdinfo.cpp @@ -1,11 +1,11 @@ /* * $RCSfile: lib_cdinfo.cpp,v $ * $Author: swaj $ - * $Revision: 1.2 $ + * $Revision: 1.3 $ */ /* - * This code taken quickly from cdinfo and has the following copyrights: + * This code is from cdinfo and has the following copyrights: * (c) 1996,1997 Gerd Knorr * and Heiko Eissfeldt */ diff --git a/src/lib_cdinfo.h b/src/lib_cdinfo.h index 1695d3e..d840b36 100644 --- a/src/lib_cdinfo.h +++ b/src/lib_cdinfo.h @@ -1,11 +1,11 @@ /* * $RCSfile: lib_cdinfo.h,v $ * $Author: swaj $ - * $Revision: 1.2 $ + * $Revision: 1.3 $ */ /* - * This code taken quickly from cdinfo and has the following copyrights: + * This code is from cdinfo and has the following copyrights: * (c) 1996,1997 Gerd Knorr * and Heiko Eissfeldt */ -- 2.30.2