[SCM] supercollider/master: Combine three -dev packages into one

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

The following commit has been merged in the master branch:
commit 0cac2a80da37992f5e999d8cc12c9e5179d20aae
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Fri Apr 29 19:46:50 2011 +0100

    Combine three -dev packages into one

diff --git a/debian/changelog b/debian/changelog
index 9f3d01f..0fe023a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ supercollider (1:3.4.3-1) UNRELEASED; urgency=low
   * Can build against jack2 as well as jack1
   * Update copyright to match rearranged folders and stripped linux
     source tgz
+  * Combine -dev packages into one supercollider-dev
 
  -- Dan Stowell <danstowell at users.sourceforge.net>  Fri, 15 Apr 2011 13:17:38 +0100
 
diff --git a/debian/control b/debian/control
index 57b68db..08248a6 100644
--- a/debian/control
+++ b/debian/control
@@ -82,45 +82,19 @@ Description: SuperCollider synthesis server library
  .
  This package contains the shared library for the synthesis server.
 
-Package: supercollider-common-dev
-Architecture: any
-Depends: ${misc:Depends}, libsndfile1-dev (>= 1.0.16)
-Description: common development files for SuperCollider
- SuperCollider is an environment and programming language for real time
- audio synthesis and algorithmic composition. It provides an interpreted
- object-oriented language which functions as a network client
- to a state of the art, realtime sound synthesis server.
- .
- This package contains the common development files and headers.
-
 Package: supercollider-dev
 Architecture: any
 Depends: ${misc:Depends},
   supercollider (= ${binary:Version}),
-  supercollider-server-dev (= ${binary:Version})
-Description: development files for SuperCollider
- SuperCollider is an environment and programming language for real time
- audio synthesis and algorithmic composition. It provides an interpreted
- object-oriented language which functions as a network client
- to a state of the art, realtime sound synthesis server.
- .
- This package contains the development files and headers
- (for the language client, sclang).
-
-Package: supercollider-server-dev
-Architecture: any
-Depends: ${misc:Depends},
-  supercollider-server (= ${binary:Version}),
-  supercollider-common-dev (= ${binary:Version}),
   libsndfile1-dev (>= 1.0.16)
-Description: development files for SuperCollider server
+Provides: supercollider-common-dev, supercollider-server-dev
+Description: development files for SuperCollider
  SuperCollider is an environment and programming language for real time
  audio synthesis and algorithmic composition. It provides an interpreted
  object-oriented language which functions as a network client
  to a state of the art, realtime sound synthesis server.
  .
- This package contains the development files and headers
- (for the audio synthesis server, scsynth).
+ This package contains the development files and headers.
 
 Package: supercollider-doc
 Section: doc
diff --git a/debian/supercollider-common-dev.install b/debian/supercollider-common-dev.install
deleted file mode 100644
index c77e50a..0000000
--- a/debian/supercollider-common-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/SuperCollider/common
-usr/lib/libscsynth.so
diff --git a/debian/supercollider-dev.install b/debian/supercollider-dev.install
index dfe937b..9befa19 100644
--- a/debian/supercollider-dev.install
+++ b/debian/supercollider-dev.install
@@ -1,3 +1,10 @@
+usr/include/SuperCollider/common
 usr/include/SuperCollider/lang
-usr/lib/pkgconfig/libsclang.pc
+usr/include/SuperCollider/server
+usr/include/SuperCollider/plugin_interface
 usr/lib/libsclang.so
+usr/lib/libscsynth.so
+usr/lib/libscsynth.a
+usr/lib/pkgconfig/libsclang.pc
+usr/lib/pkgconfig/libscsynth.pc
+usr/lib/pkgconfig/libscplugin.pc
diff --git a/debian/supercollider-server-dev.install b/debian/supercollider-server-dev.install
deleted file mode 100644
index 7c07a75..0000000
--- a/debian/supercollider-server-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/SuperCollider/plugin_interface
-usr/include/SuperCollider/server
-usr/lib/libscsynth.a
-usr/lib/pkgconfig/libscplugin.pc
-usr/lib/pkgconfig/libscsynth.pc

-- 
supercollider packaging