* New upstream release.

* Clarified copyright/license of included parts.
* Fixed watch file.

diff --git a/configure b/configure
index ce7babf8a532ea76c066ebfb61a7b9617fbda457..bd0a1c92b8d5f15f5cb4bb14e23a43a05f5e1708 100755 (executable)
--- 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 90bcd52426884fd044fe64be4d478a33cd91b85a..4083a1a30b16b7f1aa0862546fac10c69f6ceba7 100644 (file)
--- 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 c0c0b2fc2384f5c7344c44142fc89e4266b27929..adaf787d634319a802c80a517a661b764096bdd3 100644 (file)
--- 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 <gregor+debian@comodo.priv.at>  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 <gregor+debian@comodo.priv.at>  Mon,  8 May 2006 16:44:59 +0200
 

diff --git a/debian/copyright b/debian/copyright
index 66e8386d8f2addcdfa8d4299fdb44aab298f459f..31605b9666f66699243e5793da39ecfcdbfe8397 100644 (file)
--- 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 <kraxel@cs.tu-berlin.de> and Heiko Eissfeldt <heiko@colossus.escape.de>
-
+src/lib_cdinfo.{cpp,h}:
+"This code is from cdinfo and has the following copyrights:
+ (c) 1996,1997  Gerd Knorr <kraxel@cs.tu-berlin.de>
+ and Heiko Eissfeldt <heiko@colossus.escape.de>"
+   
+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 aa0338013f088391c9d42f708802821f9afd13a2..d91ea948f9ab7899f0662d1518f4982634bee1a4 100644 (file)
--- 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 (executable)
Binary files a/src/cdck and b/src/cdck differ

diff --git a/src/config.h b/src/config.h
index 79d62604a67eb3e5b7f35a1692420b84fa574069..ad9d7ad326306a918817954998ed6f4ff2416aab 100644 (file)
--- 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 fc1c1cd15954e42b5d1a48672be57cab385c4f66..c7679b9e3ce72b00fa63f4ce5f4c6bca02884b6f 100644 (file)
--- 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 <kraxel@cs.tu-berlin.de>
  * and Heiko Eissfeldt <heiko@colossus.escape.de>
  */

diff --git a/src/lib_cdinfo.h b/src/lib_cdinfo.h
index 1695d3e40fb133cd3ead66311614d13d69da8d9d..d840b36fabb4f4dbec8fcb34aa3ff690add9f01f 100644 (file)
--- 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 <kraxel@cs.tu-berlin.de>
  * and Heiko Eissfeldt <heiko@colossus.escape.de>
  */