[SCM] csound/master: Update changelog and control file.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 83884d5570d61c6f70f2df20d26cbcae43793288
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jan 12 13:52:38 2011 +0100

    Update changelog and control file.

diff --git a/debian/changelog b/debian/changelog
index a251af6..712951a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+csound (1:5.12.1~dfsg-7) UNRELEASED; urgency=low
+
+  * Let CDBS resolve if parallel build is enabled.
+  * Ease building with git-buildpackage:
+    + Git-ignore quilt .pc dir.
+    + Add dpkg-source local-options.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Wed, 12 Jan 2011 13:51:58 +0100
+
 csound (1:5.12.1~dfsg-6) unstable; urgency=low
 
   * Acquire lock before using it on chnclear opcode (Closes: #603321)
diff --git a/debian/control b/debian/control
index d7d228e..9a3a7f3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Uploaders: Felipe Sateler <fsateler at debian.org>, Jonas Smedegaard <dr at jones.dk>
 Build-Depends: cdbs (>= 0.4.73~),
  scons,
  debhelper (>= 6),
+ dh-buildinfo,
  python-central,
  devscripts (>= 2.10.7~),
- dh-buildinfo,
  libsndfile1-dev,
  libasound2-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
  libjack-dev,

-- 
csound packaging