Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index cd4819d32543b9f385652233782059189f86fb37..b1136139fe9f3b28b66b0384356499cff02e8432 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,16 @@ jacktrip (1.0.5.patch2-2) UNRELEASED; urgency=low
   [ Jonas Smedegaard ]
   * Fix typo and improve wording of long description.
   * Rewrap long description at 72 chars.
+  * Rewrite copyright file using Subversion candidate draft r157 of
+    DEP5.
+  * Tighten build-dependency on cdbs to versions properly supporting
+    debhelper compat level 7.
 
   [ IOhannes m zmölnig ]
-  * force NAME-paragraph of manpage to something useful
-  * shortened line separator in console printout
+  * Force NAME-paragraph of manpage to something useful.
+  * Shorten line separator in console printout.
 
- -- IOhannes m zmoelnig (gpg-key at iem) <zmoelnig@iem.at>  Mon, 13 Dec 2010 12:07:22 +0100
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 15 Jan 2011 12:09:12 +0100
 
 jacktrip (1.0.5.patch2-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index eb089e14c133387b78ed5187d4d612b84f4dd25f..ccf24a9230229bcde9e7d5ab7f1d3613f502bc6b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
 Uploaders: IOhannes m zmoelnig (gpg-key at iem) <zmoelnig@iem.at>,
  Jonas Smedegaard <dr@jones.dk>
-Build-Depends: debhelper (>= 7.0.1),
+Build-Depends: cdbs (>= 0.4.85~),
+ debhelper (>= 7.0.1),
  dh-buildinfo,
- cdbs (>= 0.4.69~),
  devscripts (>= 2.10.7~),
  doxygen,
  help2man,

diff --git a/debian/copyright_hints b/debian/copyright_hints
index c2376caa9ea9909109fa763ec7bf66ab555d90ee..57b43a4f755edcacd08ef1f6ea0de385eba3e631 100644 (file)
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,97 +1,108 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-X-Draft: Autogenerated by CDBS snippet copyright-check.mk
+Format: http://bzr.debian.org/scm/loggerhead/dep/dep5/trunk/annotate/137/dep5.mdwn
+Upstream-Name: FIXME
+Upstream-Contact: FIXME
+Source: FIXME
+Copyright: FIXME
+License: FIXME
+Disclaimer: Autogenerated by CDBS snippet copyright-check.mk
 
-Files: ./documentation/documentation.cpp,
-       ./src/DataProtocol.cpp,
-       ./src/DataProtocol.h,
-       ./src/DataProtocolPOSIX.cpp.tmp,
-       ./src/DataProtocolPOSIX.h.tmp,
-       ./src/JackAudioInterface.cpp,
-       ./src/JackAudioInterface.h,
-       ./src/JackTrip.cpp,
-       ./src/JackTrip.h,
-       ./src/JackTripThread.cpp,
-       ./src/JackTripThread.h,
-       ./src/JackTripWorker.cpp,
-       ./src/JackTripWorker.h,
-       ./src/JackTripWorkerMessages.h,
-       ./src/LoopBack.cpp,
-       ./src/LoopBack.h,
-       ./src/NetKS.h,
-       ./src/PacketHeader.cpp,
-       ./src/PacketHeader.h,
-       ./src/ProcessPlugin.h,
-       ./src/RingBuffer.cpp,
-       ./src/RingBuffer.h,
-       ./src/RingBufferWavetable.h,
-       ./src/Settings.h,
-       ./src/UdpDataProtocol.cpp,
-       ./src/UdpDataProtocol.h,
-       ./src/UdpDataProtocolPOSIX.cpp.tmp,
-       ./src/UdpDataProtocolPOSIX.h.tmp,
-       ./src/UdpMasterListener.cpp,
-       ./src/UdpMasterListener.h,
-       ./src/jacktrip_globals.cpp,
-       ./src/jacktrip_globals.h,
-       ./src/jacktrip_main.cpp,
-       ./src/jacktrip_tests.cpp,
-       ./src/jacktrip_types.h,
-       ./src/tests.cpp
+Files: documentation/documentation.cpp
+ src/DataProtocol.cpp
+ src/DataProtocol.h
+ src/DataProtocolPOSIX.cpp.tmp
+ src/DataProtocolPOSIX.h.tmp
+ src/JackAudioInterface.cpp
+ src/JackAudioInterface.h
+ src/JackTrip.cpp
+ src/JackTrip.h
+ src/JackTripThread.cpp
+ src/JackTripThread.h
+ src/JackTripWorker.cpp
+ src/JackTripWorker.h
+ src/JackTripWorkerMessages.h
+ src/LoopBack.cpp
+ src/LoopBack.h
+ src/NetKS.h
+ src/PacketHeader.cpp
+ src/PacketHeader.h
+ src/ProcessPlugin.h
+ src/RingBuffer.cpp
+ src/RingBuffer.h
+ src/RingBufferWavetable.h
+ src/Settings.h
+ src/UdpDataProtocol.cpp
+ src/UdpDataProtocol.h
+ src/UdpDataProtocolPOSIX.cpp.tmp
+ src/UdpDataProtocolPOSIX.h.tmp
+ src/UdpMasterListener.cpp
+ src/UdpMasterListener.h
+ src/jacktrip_globals.cpp
+ src/jacktrip_globals.h
+ src/jacktrip_main.cpp
+ src/jacktrip_tests.cpp
+ src/jacktrip_types.h
+ src/tests.cpp
 Copyright: 2008, Juan-Pablo Caceres, Chris Chafe
 License: MIT/X11 (BSD like)
  FIXME
 
-Files: ./CHANGESLOG.txt,
-       ./INSTALL.txt,
-       ./TODO.txt,
-       ./debian/compat,
-       ./debian/control,
-       ./debian/control.in,
-       ./debian/doc-base,
-       ./debian/docs,
-       ./debian/gbp.conf,
-       ./debian/jacktrip.links,
-       ./debian/jacktrip.manpages,
-       ./debian/source/format,
-       ./debian/source/local-options,
-       ./debian/watch,
-       ./documentation/html_footer.html,
-       ./faust-src/Makefile,
-       ./faust-src/Makefile.compile,
-       ./faust-src/Makefile.ladspacompile,
-       ./faust-src/Makefile.mspcompile,
-       ./faust-src/Makefile.pdcompile,
-       ./faust-src/Makefile.qcompile,
-       ./faust-src/Makefile.qtcompile,
-       ./faust-src/Makefile.sccompile,
-       ./faust-src/Makefile.svg,
-       ./faust-src/Makefile.vstcompile,
-       ./faust-src/minimal.cpp,
-       ./jacktrip_doxygen,
-       ./src/ProcessPlugin.cpp,
-       ./src/TestRingBuffer.h,
-       ./src/ThreadPoolTest.h,
-       ./src/build,
-       ./src/jacktrip-1.0.5.diff,
-       ./src/jacktrip.pro
+Files: CHANGESLOG.txt
+ INSTALL.txt
+ TODO.txt
+ debian/compat
+ debian/control
+ debian/control.in
+ debian/doc-base
+ debian/docs
+ debian/gbp.conf
+ debian/jacktrip.links
+ debian/jacktrip.manpages
+ debian/patches/series
+ debian/source/format
+ debian/source/local-options
+ debian/watch
+ documentation/html_footer.html
+ faust-src/Makefile
+ faust-src/Makefile.compile
+ faust-src/Makefile.ladspacompile
+ faust-src/Makefile.mspcompile
+ faust-src/Makefile.pdcompile
+ faust-src/Makefile.qcompile
+ faust-src/Makefile.qtcompile
+ faust-src/Makefile.sccompile
+ faust-src/Makefile.svg
+ faust-src/Makefile.vstcompile
+ faust-src/minimal.cpp
+ jacktrip_doxygen
+ src/ProcessPlugin.cpp
+ src/TestRingBuffer.h
+ src/ThreadPoolTest.h
+ src/build
+ src/jacktrip-1.0.5.diff
+ src/jacktrip.pro
 Copyright: *No copyright*
 License: UNKNOWN
  FIXME
 
-Files: ./debian/rules
+Files: debian/rules
 Copyright: 2010, IOhannes m zmölnig <zmoelnig@iem.at>
-       HOLDERS BE LIABLE FOR ANY
+ HOLDERS BE LIABLE FOR ANY
 License: MIT/X11 (BSD like)
  FIXME
 
-Files: ./src/Settings.cpp
+Files: src/Settings.cpp
 Copyright: 2008, Juan-Pablo Caceres, Chris Chafe
-       2008-2009, Juan-Pablo Caceres, Chris Chafe." << endl;
+ 2008-2009, Juan-Pablo Caceres, Chris Chafe." << endl;
 License: MIT/X11 (BSD like)
  FIXME
 
-Files: ./faust-src/net-ks.dsp
+Files: faust-src/net-ks.dsp
 Copyright: " Juan-Pablo Caceres 2008";
 License: UNKNOWN
  FIXME
 
+Files: debian/patches/manpage-has-errors-from-man
+Copyright: 2008-2009, Juan-Pablo Caceres, Chris Chafe." << endl;
+License: UNKNOWN
+ FIXME
+