[SCM] supercollider/master: Import and adapt debian packaging info updates for SC 3.5 from tim blechmann

danstowell-guest at users.alioth.debian.org danstowell-guest at users.alioth.debian.org
Sat Apr 7 15:20:56 UTC 2012


The following commit has been merged in the master branch:
commit 25aee806b9ce1aa367968767935080277e73cc22
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Sat Apr 7 13:00:23 2012 +0100

    Import and adapt debian packaging info updates for SC 3.5 from tim blechmann

diff --git a/debian/control b/debian/control
index 6196bf1..7d38278 100644
--- a/debian/control
+++ b/debian/control
@@ -9,18 +9,22 @@ Uploaders: Alexandre Quessy <alexandre at quessy.net>,
  Felipe Sateler <fsateler at debian.org>,
  Jonas Smedegaard <dr at jones.dk>
 Build-Depends: cdbs (>= 0.4.73~),
+ cmake,
  debhelper,
+ emacs23 | emacsen,
  libasound2-dev [linux-any],
  libavahi-client-dev,
  libcwiid-dev,
  libfftw3-dev,
  libicu-dev,
  libjack-dev,
+ libqt4-dev,
+ libqtwebkit-dev,
  libreadline-dev,
  libsndfile1-dev (>= 1.0.16),
  libxt-dev,
  python-all-dev (>= 2.6.6-3~),
- scons (>= 0.96)
+ qt4-dev-tools
 Standards-Version: 3.9.2
 Homepage: http://supercollider.sourceforge.net/
 
@@ -28,9 +32,10 @@ Package: supercollider
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
+ libscsynth1 (= ${binary:Version}),
  supercollider-common (= ${source:Version}),
- supercollider-server
-Suggests: subversion, supercollider-doc
+ supercollider-server (= ${binary:Version}),
+Suggests: subversion, rsync
 Description: real time audio synthesis programming language
  SuperCollider is an environment and programming language for real time
  audio synthesis and algorithmic composition. It provides an interpreted
@@ -39,21 +44,10 @@ Description: real time audio synthesis programming language
  .
  This package contains the language interpreter.
 
-Package: libsclang1
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: SuperCollider language interpreter library
- 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 shared library for the language interpreter.
-
 Package: supercollider-common
 Architecture: all
 Depends: ${misc:Depends}
+Replaces: supercollider-doc
 Description: common files for SuperCollider
  SuperCollider is an environment and programming language for real time
  audio synthesis and algorithmic composition. It provides an interpreted
@@ -73,6 +67,17 @@ Description: real time audio synthesis server
  .
  This package contains the synthesis server.
 
+Package: supercollider-supernova
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, jackd
+Description: real time audio synthesis server (multiprocessor version)
+ 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 multiprocessor aware synthesis server supernova.
+
 Package: libscsynth1
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -104,26 +109,12 @@ Description: development files for SuperCollider
  .
  This package contains the development files and headers.
 
-Package: supercollider-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: supercollider
-Description: documentation 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 HTML documentation for SuperCollider.
-
 Package: supercollider-emacs
 Architecture: all
 Depends: ${misc:Depends},
   supercollider (>= ${source:Version}),
   emacs23 | emacsen
-Recommends: supercollider-doc,
- w3m-el
+Recommends: w3m-el
 Description: SuperCollider mode for Emacs
  SuperCollider is an environment and programming language for real time
  audio synthesis and algorithmic composition. It provides an interpreted
@@ -131,9 +122,6 @@ Description: SuperCollider mode for Emacs
  to a state of the art, realtime sound synthesis server.
  .
  This package provides the SuperCollider mode for Emacs.
- .
- Package supercollider-doc is suggested so that the editor can show help
- documentation in context.
 
 Package: supercollider-vim
 Architecture: all
@@ -141,8 +129,7 @@ Depends: ${misc:Depends},
  supercollider (>= ${source:Version}),
  vim | gvim,
  ruby
-Recommends: supercollider-doc,
- unhtml | links,
+Recommends: unhtml | links,
  vim-addon-manager
 Suggests: unrtf
 Description: SuperCollider mode for Vim
@@ -152,7 +139,4 @@ Description: SuperCollider mode for Vim
  to a state of the art, realtime sound synthesis server.
  .
  This package provides the SuperCollider mode for Vim.
- .
- Package supercollider-doc is suggested so that the editor can show help
- documentation in context.
 
diff --git a/debian/libsclang1.install b/debian/libsclang1.install
deleted file mode 100644
index fe7641a..0000000
--- a/debian/libsclang1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libsclang.so.1
-
diff --git a/debian/libscsynth1.install b/debian/libscsynth1.install
index 2c6296f..7ee1fc6 100644
--- a/debian/libscsynth1.install
+++ b/debian/libscsynth1.install
@@ -1,2 +1 @@
-usr/lib/libscsynth.so.1
-
+usr/lib/libscsynth.so.1*
diff --git a/debian/rules b/debian/rules
index 8f4b7f9..f812529 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,62 +1,28 @@
 #! /usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/scons.mk
+include /usr/share/cdbs/1/class/cmake.mk
 
-DEB_BUILDDIR=common
+DEB_DH_INSTALL_SOURCEDIR=debian/tmp
 
-# Do not enable parallel building: scons cannot handle parallel
-# builds when the chdir option is used in any command
-# DEB_BUILD_PARALLEL = 1
+# # Add here any variable or target overrides you need.
 
-DEB_INSTALL_DOCS_supercollider             = "README LINUX" common/build/README
-DEB_INSTALL_DOCS_supercollider-server      = "README LINUX" common/build/README
+DEB_INSTALL_DOCS_supercollider             = README_LINUX.txt README.txt
+DEB_INSTALL_DOCS_supercollider-server      = README_LINUX.txt README.txt
 DEB_INSTALL_DOCS_supercollider-emacs       = editors/scel/README
 DEB_INSTALL_DOCS_supercollider-vim         = editors/scvim/README editors/scvim/SCVim.scd
-DEB_INSTALL_CHANGELOGS_ALL                 = common/build/ChangeLog
+DEB_INSTALL_DOCS_supercollider-gedit       = editors/sced/README
 
 DEB_INSTALL_MANPAGES_supercollider-server  = debian/scsynth.1
 DEB_INSTALL_MANPAGES_supercollider         = debian/sclang.1
-DEB_INSTALL_MANPAGES_supercollider-vim     = debian/scvim.1 debian/scvim_make_help.1 debian/sclangpipe_app.1
-
-# recent SVN revisions also install examples to $(DEB_DESTDIR)/usr/share
-DEB_INSTALL_EXAMPLES_supercollider         = common/build/examples/*
-DEB_INSTALL_DIRS_supercollider             = usr/share/SuperCollider/Extensions
-
-# SCVIM/SCED=0 here, because we install them by hand below
-# (so that the build won't break)
-# Also STRIP=0 since we let cdbs (dh_strip) decide whether to strip
-DEB_SCONS_OPTIONS = DEVELOPMENT=yes PREFIX=/usr CROSSCOMPILE=1 CURL=0 SCVIM=0 SCED=0 STRIP=0
-# Handle DEB_BUILD_OPTIONS (see policy 4.9.1)
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	DEB_SCONS_OPTIONS += "DEBUG=1"
-endif
-
-DEB_SCONS_INSTALL_TARGET = DESTDIR=$(DEB_DESTDIR) install
-
-# The build system apparently can't handle this
-CXXFLAGS =
-
-clean:: scons-clean
-scons-clean::
-	dh_testdir
-	scons -C common $(SCONS_FLAGS) --clean scrub
-	rm -f common/.sconsign.dblite
-	rm -f editors/scvim/.sconsign.dblite
-	rm -f editors/sced/.sconsign.dblite
-	# also remove some files, that SCons forgets about
-	rm -f editors/scel/el/sclang-vars.el
-	rm -f linux/libsclang.pc
-	rm -f linux/libscplugin.pc
-	rm -f linux/libscsynth.pc
-
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
-	scons --install-sandbox=$(DEB_DESTDIR) --directory=editors/scvim PREFIX=/usr VIMFILE_DIR=/usr/share/vim/addons install-all
-	scons --install-sandbox=$(DEB_DESTDIR) --directory=editors/sced PREFIX=/usr install
-	# fixing some executables in class library and docs for happier lintian
-	find $(DEB_DESTDIR)/usr/share/SuperCollider -type d -exec chmod 755 {} \;; \
-	find $(DEB_DESTDIR)/usr/share/SuperCollider -type f -exec chmod 644 {} \;; \
-
-	install -m 644 debian/README.extensions $(DEB_DESTDIR)/usr/share/SuperCollider/Extensions/README
+DEB_INSTALL_MANPAGES_supercollider-vim     = debian/scvim.1 debian/sclangpipe_app.1
+
+DEB_CMAKE_EXTRA_FLAGS = -DDSO_VISIBILITY=on -DSUPERNOVA=on -DSC_EL_BYTECOMPILE=OFF
+
+install/supercollider-emacs::
+	install -d $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/applications
+	install -m 644 debian/scel.desktop $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/applications
+
+install/supercollider-vim::
+	install -d $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/applications
+	install -m 644 debian/scvim.desktop $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/applications
diff --git a/debian/supercollider-common.install b/debian/supercollider-common.install
index 399e386..e346ff9 100644
--- a/debian/supercollider-common.install
+++ b/debian/supercollider-common.install
@@ -1,2 +1,3 @@
 usr/share/SuperCollider/SCClassLibrary
-linux/icons/* usr/share/pixmaps/
+usr/share/pixmaps/*
+
diff --git a/debian/supercollider-dev.install b/debian/supercollider-dev.install
index 9befa19..4e7bed0 100644
--- a/debian/supercollider-dev.install
+++ b/debian/supercollider-dev.install
@@ -1,10 +1,4 @@
 usr/include/SuperCollider/common
-usr/include/SuperCollider/lang
 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-emacs.install b/debian/supercollider-emacs.install
index 2b00e27..e526b56 100644
--- a/debian/supercollider-emacs.install
+++ b/debian/supercollider-emacs.install
@@ -1,3 +1,3 @@
 usr/share/emacs
 usr/share/SuperCollider/Extensions/scide_scel
-debian/scel.desktop usr/share/applications/
+usr/share/applications/scel.desktop
diff --git a/debian/supercollider-server.install b/debian/supercollider-server.install
index d3a4db6..edcdf8f 100644
--- a/debian/supercollider-server.install
+++ b/debian/supercollider-server.install
@@ -1,28 +1,3 @@
 usr/bin/scsynth
-usr/lib/SuperCollider/plugins/BinaryOpUGens.so
-usr/lib/SuperCollider/plugins/ChaosUGens.so
-usr/lib/SuperCollider/plugins/DelayUGens.so
-usr/lib/SuperCollider/plugins/DemandUGens.so
-usr/lib/SuperCollider/plugins/DiskIO_UGens.so
-usr/lib/SuperCollider/plugins/DynNoiseUGens.so
-usr/lib/SuperCollider/plugins/FFT_UGens.so
-usr/lib/SuperCollider/plugins/FilterUGens.so
-usr/lib/SuperCollider/plugins/GendynUGens.so
-usr/lib/SuperCollider/plugins/GrainUGens.so
-usr/lib/SuperCollider/plugins/IOUGens.so
-usr/lib/SuperCollider/plugins/KeyboardUGens.so 
-usr/lib/SuperCollider/plugins/LFUGens.so
-usr/lib/SuperCollider/plugins/ML_UGens.so
-usr/lib/SuperCollider/plugins/MouseUGens.so
-usr/lib/SuperCollider/plugins/MulAddUGens.so
-usr/lib/SuperCollider/plugins/NoiseUGens.so
-usr/lib/SuperCollider/plugins/OscUGens.so
-usr/lib/SuperCollider/plugins/PanUGens.so
-usr/lib/SuperCollider/plugins/PhysicalModelingUGens.so
-usr/lib/SuperCollider/plugins/PV_ThirdParty.so
-usr/lib/SuperCollider/plugins/ReverbUGens.so
-usr/lib/SuperCollider/plugins/TestUGens.so
-usr/lib/SuperCollider/plugins/TriggerUGens.so
-usr/lib/SuperCollider/plugins/UnaryOpUGens.so
-usr/lib/SuperCollider/plugins/UnpackFFTUGens.so
-usr/share/SuperCollider/Extensions/README
+usr/lib/SuperCollider/plugins/*
+debian/README.extensions usr/share/SuperCollider/Extensions/README
diff --git a/debian/supercollider-supernova.install b/debian/supercollider-supernova.install
new file mode 100644
index 0000000..a7a079f
--- /dev/null
+++ b/debian/supercollider-supernova.install
@@ -0,0 +1,2 @@
+usr/bin/supernova
+usr/lib/supernova/plugins/*
diff --git a/debian/supercollider-vim.install b/debian/supercollider-vim.install
index 6f984a1..9ffc908 100644
--- a/debian/supercollider-vim.install
+++ b/debian/supercollider-vim.install
@@ -1,8 +1,7 @@
 usr/bin/sclangpipe_app
 usr/bin/scvim
-usr/bin/scvim_make_help
 usr/share/vim
 usr/share/scvim
 usr/share/SuperCollider/Extensions/scvim
-debian/supercollider-vim.yaml usr/share/vim/registry/
-debian/scvim.desktop usr/share/applications/
+#debian/supercollider-vim.yaml usr/share/vim/registry/
+usr/share/applications/scvim.desktop

-- 
supercollider packaging



More information about the pkg-multimedia-commits mailing list