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

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Tue Oct 26 15:03:36 UTC 2010


Update changelog (just bumping timestamp, to indicate that previous commit should be suppressed: generally use 'git dch last-commit-touching-changelog' is the way to go.
Fix relax inclusion of CDBS snippet utils.mk: only required when in DEB_MAINTAINER_MODE; not wanted in backports to Debian stable.
Update changelog.
Merge commit 'upstream/1.9.6_dfsg'
Imported Upstream version 1.9.6~dfsg
Update changelog, control file and copyright hints.
Avoid (when upstream source next (re)packaged) unneeded and possibly sourceless binary ./macosx/libcelt.a.
Update copyright file: Extend some copyright years.
Ease building with git-buildpackage: Git-ignore quilt .pc dir, and add source local-options.
Drop superfluous supression of build-dependency resolving applying only to now obsolete test releases of CDBS.
Unfuzz patches.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 89371fa82a5293601170e35b3fb415f3a22c4998
X-Git-Newrev: 82fdd6f0b83182bd9e5ad6e941e3afdc3c29ceb2

The following commit has been merged in the master branch:
commit a66701eb3c331491e2ae7dc030b078cf66f66d4f
Merge: 402805cf8932ce1dbe53300aa0b88f7e66b22a95 89371fa82a5293601170e35b3fb415f3a22c4998
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Oct 25 16:18:45 2010 +0200

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

diff --combined debian/control
index 9750ff0,693c545..ce51bca
--- a/debian/control
+++ b/debian/control
@@@ -5,6 -5,7 +5,7 @@@ Maintainer: Debian Multimedia Maintaine
  Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>, Jonas Smedegaard <dr at jones.dk>, Reinhard Tartler <siretart at tauware.de>
  Build-Depends: cdbs,
   debhelper (>= 6),
+  dh-buildinfo,
   d-shlibs,
   python,
   libsamplerate-dev,
@@@ -36,7 -37,7 +37,7 @@@ Conflicts: jack-daemon
  Depends: ${shlibs:Depends},
   ${misc:Depends},
   coreutils (>= 4.0),
 - python,
 + python-dbus,
   debconf | debconf-2.0,
   libjack-jackd2-0 (= ${binary:Version})
  Recommends: qjackctl,

-- 
jackd2 packaging



More information about the pkg-multimedia-commits mailing list