[SCM] jackd2/master: Merge branch 'master' of git://git.debian.org/git/pkg-multimedia/jackd2

[adiknoth-guest at users.alioth.debian.org]

Shorten changelog item regarding coyright file rewrite.
Update copyright file: Reqrap license sections at 72 chars.
Update copyright file: Add comment about vaguely declared copyright holders "...and others".
Update copyright file: Use (derivation of) recommended License shortname public-domain.
Update copyright file: Add copyright holder for "public domain" dbus/sigsegv.c, and add comment on how that is arguably incompatible.
Update copyright file: Add comments about listing only most restrictive of multiple applying licenses.
Tidy copyright file: Shorten GPL comments, quote license strings, and avoid repetition.
Update copyright file: Fix use pseudo-comment sections to obey silly restrictions of copyright format 1.0.
Tidy copyright file: Wrap copyright fields at 72 chars.
Update copyright file: Add comment about missing copyright holder for dbus/list.h.
Update changelog, control file and copyright hints.
Tidy TODO.Debian: Style listing similar to changelog. Fix typo.
Tidy copyright file: Move Files section containing wildcard above only-explicit-files ones.
Update copyright file: Relabel shortnames for derived licenses to more easily identify origin.
Update copyright file: Add comment about licensing tied to different jack-audio-connection-kit package.
Tidy copyright file: Reorder some Files sections to better match copyright hints.
Update copyright file: Cover new/changed files, and extend some copyrights.
Update copyright file: Rewrite using file format 1.0.
Update changelog.
Remove debian/source/local-options: abort-on-upstream-changes and unapply-patches are default in dpkg-source since 1.16.1.
Tidy install files: drop leading debian/tmp/: Unneeded since compatibility level 7.
Tidy shell scripts: Avoid sort-of-bashism.
Tidy shell scripts: Explicitly set -e (not in hash-bang).
Tidy shell scripts: Use tab indentation. if-then on single line. Strip trailing space.
Tidy watch file.
Drop pre-squeeze conffile cleanup in preinst.
Update changelog.
Use anonscm.debian.org for Vcs-Browser field.
Build-depend on libopus-dev.
Drop obsolete make_tarball.sh script.
Improve get-orig-source hints with comment on how to do git snapshots.
Merge tag 'upstream/1.9.9.5_dfsg'
Imported Upstream version 1.9.9.5~dfsg
Fix revert to still strip *.dll and *.Lib files.
Add patch to reapply stripped-from-source waflib as unpacked source, and add waf-light.
Merge tag 'upstream/1.9.9.5_dfsg'
Imported Upstream version 1.9.9.5~dfsg
Extend to strip all *.a files in get-orig-source hints and copyright file Excluded-Files field.
Update and simplify to strip all *.a files in get-orig-source hints and copyright file Excluded-Files field.
Update to use github.com URLs in watch file, get-orig-source hints and copyright file Source field.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 94738340260c19bbe6d5323101b7fda6fb44db59
X-Git-Newrev: ed8d9bcbef94240050ca38616fead86087621c9e

The following commit has been merged in the master branch:
commit ed8d9bcbef94240050ca38616fead86087621c9e
Merge: 625705ada8346dca396d8be0500573964fc064b0 94738340260c19bbe6d5323101b7fda6fb44db59
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sun Jan 27 21:13:43 2013 +0100

    Merge branch 'master' of git://git.debian.org/git/pkg-multimedia/jackd2
    
    Conflicts:
    	ChangeLog
    	common/JackConstants.h
    	debian/changelog
    	wscript

diff --combined debian/changelog
index 00224af,e16be5c..a015ca6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,32 +1,39 @@@
+ jackd2 (1.9.9.5~dfsg-1) UNRELEASED; urgency=low
+ 
+   [ upstream ]
+   * New upstream release.
+ 
+   [ Jonas Smedegaard ]
+   * Update and improve get-orig-source target:
+     + Update to use github.com URLs in watch file and CDBS hints.
+     + Simplify to strip all *.a, .dll and *.Lib files (i.e. catch *.a
+       files also below windows dir, and skip lower-case *.lib files).
+     + Extend to strip waf file.
+     + Update copyright file Source and Excluded-Files fields.
+     + Add comment in rules file on how to do git snapshots.
+     + Drop obsolete make_tarball.sh script.
+   * Add patch to reapply stripped-from-source waflib as unpacked source
+     and add waf-light.
+   * Build-depend on libopus-dev.
+   * Use anonscm.debian.org for Vcs-Browser field.
+   * Drop pre-squeeze conffile cleanup in preinst.
+   * Tidy bash-completion file:
+     + Use tab indentation.
+     + Strip excess space.
+   * Remove debian/source/local-options: abort-on-upstream-changes and
+     unapply-patches are default in dpkg-source since 1.16.1.
+   * Rewrite copyright file using file format 1.0.
+     + Cover new/changed files, and extend some copyrights.
+ 
+  -- Jonas Smedegaard <dr at jones.dk>  Fri, 21 Dec 2012 04:42:40 +0100
+ 
 +jackd2 (1.9.9.5+20130127git15950eb1-1) experimental; urgency=low
 +
 +  * Imported Upstream version 1.9.9.5+20130127git15950eb1
 +  * Refresh no-selfconnect.patch
 +
 + -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Sun, 27 Jan 2013 13:50:55 +0100
 +
  jackd2 (1.9.8~dfsg.4+20121110git67ac4440-1) experimental; urgency=low
  
    * Imported Upstream version 1.9.8~dfsg.4+20121110git67ac4440
diff --combined debian/patches/series
index 16ef96d,60e5ab2..37e8079
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,2 +1,3 @@@
+ waf.patch
  no-selfconnect.patch
 +fix-ftbfs.patch

-- 
jackd2 packaging