[SCM] csound packaging branch, master, updated. debian/5.12.1.dfsg-2-9-g521fd60

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 521fd603e5c0d8dfdafca76ef8b9152d4901218a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Aug 1 16:20:52 2010 -0400

    Prepare release: Update changelog and control file.

diff --git a/debian/changelog b/debian/changelog
index df75ca0..5d01b3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+csound (1:5.12.1~dfsg-3) unstable; urgency=low
+
+  [ Felipe Sateler ]
+  * Disable csound5gui and cseditor
+  * Update my e-mail address
+  * Remove the DM-Upload-Allowed field
+  * Build depend against default-jdk, not default-jdk-builddep, which
+    was wrong
+  * Do not specify list for java, as it is available on all archs now.
+
+  [ Jonas Smedegaard ]
+  * Use Breaks (not Conflicts).
+  * Bump Policy compliance to Standards-Version 3.9.1.
+  * Comment out cseditor and csound5gui in menu file.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sun, 01 Aug 2010 16:20:08 -0400
+
 csound (1:5.12.1~dfsg-2) unstable; urgency=low
 
   * Revert unpatch hack: upsets build daemons.
diff --git a/debian/control b/debian/control
index 754b0d3..d7d228e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: csound
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Felipe Sateler <fsateler at gmail.com>, Jonas Smedegaard <dr at jones.dk>
+Uploaders: Felipe Sateler <fsateler at debian.org>, Jonas Smedegaard <dr at jones.dk>
 Build-Depends: cdbs (>= 0.4.73~),
  scons,
  debhelper (>= 6),
@@ -21,7 +21,7 @@ Build-Depends: cdbs (>= 0.4.73~),
  tcl-dev,
  python-all-dev (>= 2.3.5-11),
  puredata,
- default-jdk-builddep [alpha amd64 armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc],
+ default-jdk,
  libfltk1.1-dev,
  libfluidsynth-dev,
  liblo-dev,
@@ -36,17 +36,16 @@ Build-Depends: cdbs (>= 0.4.73~),
  doxygen,
  graphviz,
  ttf-dejavu
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/csound
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/csound.git;a=summary
 XS-Python-Version: current
-DM-Upload-Allowed: yes
 Homepage: http://www.csounds.com
 
 Package: csound
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libcsound64-5.1 (<< 1:5.08.2~dfsg-1)
+Breaks: libcsound64-5.1 (<< 1:5.08.2~dfsg-1)
 Recommends: csound-gui, csound-utils, csound-manpages
 Description: powerful and versatile sound synthesis software
  Csound is a sound and music synthesis system. Drawing from over 450
@@ -79,7 +78,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: csound
-Conflicts: csound (<< 1:5.07.0.dfsg-1)
+Breaks: csound (<< 1:5.07.0.dfsg-1)
 Description: main library for Csound
  This package contains the library which provides most of the Csound
  functionality. This library was built using 64-bit precision for the
@@ -88,7 +87,7 @@ Description: main library for Csound
  For more information on Csound, see the csound package.
 
 Package: libcsnd-java
-Architecture: alpha amd64 armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Architecture: any
 Section: java
 Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java2-runtime
 Recommends: csound

-- 
csound packaging