[SCM] supercollider/master: Switch from CDBS to short-form dh

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Wed Nov 16 23:33:21 UTC 2016 

The following commit has been merged in the master branch:
commit 018100f15c4629b68b9e90f81d0118bb827265b4
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Nov 16 19:44:54 2016 -0300

    Switch from CDBS to short-form dh

diff --git a/debian/control b/debian/control
index 4668c2b..dce39cd 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Maintainer: Debian Multimedia Packages Maintainers <pkg-multimedia-maintainers at l
 Uploaders: Alexandre Quessy <alexandre at quessy.net>,
  Dan Stowell <danstowell at users.sourceforge.net>,
  Felipe Sateler <fsateler at debian.org>
-Build-Depends: cdbs (>= 0.4.73~),
+Build-Depends:
  cmake (>= 2.8.12),
- debhelper,
+ debhelper (>= 10~),
  emacs | emacsen,
  libasound2-dev [linux-any],
  libavahi-client-dev,
diff --git a/debian/rules b/debian/rules
index fd0c32c..135dd28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,39 +1,23 @@
 #! /usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/upstream-tarball.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/dpkg/architecture.mk
 
-DEB_DH_INSTALL_SOURCEDIR=debian/tmp
-
-# # Add here any variable or target overrides you need.
+ifeq ("$(DEB_HOST_ARCH_CPU)","ppc64el")
+	DEB_CFLAGS_MAINT_APPEND = -mno-altivec -mno-vsx
+	DEB_CXXFLAGS_MAINT_APPEND = -mno-altivec -mno-vsx
+endif
 
-DEB_INSTALL_DOCS_supercollider-language    = README_LINUX.md README.md
-DEB_INSTALL_DOCS_supercollider-server      = README_LINUX.md README.md
-DEB_INSTALL_DOCS_supercollider-emacs       = editors/scel/README.md
-DEB_INSTALL_DOCS_supercollider-vim         = editors/scvim/README.md editors/scvim/SCVim.scd
-DEB_INSTALL_DOCS_supercollider-gedit       = editors/sced/README.md
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
 
-DEB_INSTALL_MANPAGES_supercollider-server  = debian/scsynth.1
-DEB_INSTALL_MANPAGES_supercollider-supernova = debian/supernova.1
-DEB_INSTALL_MANPAGES_supercollider-language  = debian/sclang.1
-DEB_INSTALL_MANPAGES_supercollider-vim     = debian/scvim.1 debian/sclangpipe_app.1
-DEB_INSTALL_MANPAGES_supercollider-ide     = debian/scide.1
+%:
+	dh $@
 
 # supernova (optional alternative to scsynth) uses fancy simd things which fail to build on non-target architectures
-ifeq (,$(findstring supercollider-supernova,$(DEB_ARCH_PACKAGES)))
-	DEB_BUILD_SUPERNOVA=off
-else
-	DEB_BUILD_SUPERNOVA=on
-endif
-
-ifeq ("$(DEB_HOST_ARCH_CPU)","ppc64el")
-	CFLAGS=-mno-altivec -mno-vsx
-	CXXFLAGS=-mno-altivec -mno-vsx
-endif
+DEB_BUILD_SUPERNOVA = $(shell dh_listpackages -a | grep -q supercollider-supernova && echo on || echo off)
 
 DEB_CMAKE_EXTRA_FLAGS = \
+	-DCMAKE_SKIP_RPATH=on \
 	-DDSO_VISIBILITY=on \
 	-DSC_EL_BYTECOMPILE=off \
 	-DSYSTEM_BOOST=on \
@@ -42,35 +26,25 @@ DEB_CMAKE_EXTRA_FLAGS = \
 	-DSYSTEM_YAMLCPP=off \
 	-DSUPERNOVA="$(DEB_BUILD_SUPERNOVA)"
 
-# Exclude external libs from the source package if unused on linux or using system-supplied
-DEB_UPSTREAM_REPACKAGE_EXCLUDES = \
-				  external_libraries/boost/ \
-				  external_libraries/libsndfile/ \
-				  external_libraries/simplejson-*/ \
-				  external_libraries/icu \
-				  external_libraries/portaudio/bindings/cpp/build \
-				  HelpSource/prettify.js
-DEB_UPSTREAM_URL = https://github.com/supercollider/supercollider/releases/download/Version-$(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/~[^~]*$$//')
-DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/supercollider(.*)/SuperCollider$$1-Source-linux/
-DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
-DEB_UPSTREAM_TARBALL_SRCDIR = SuperCollider-Source
-DEB_UPSTREAM_TARBALL_MD5 = 5caa1321478c0659b9de8496e89bc4ff
-DEB_UPSTREAM_REPACKAGE_TAG = repack
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
+
 
 # Do not enable tests, they only test the supernova component, which only works on x86
-# DEB_MAKE_CHECK_TARGET = check
+override_dh_auto_test:
+	@echo "Tests disabled"
 
-install/supercollider-common::
+override_dh_auto_install:
+	dh_auto_install
 	install -m 644 debian/README.extensions \
-		$(DEB_DH_INSTALL_SOURCEDIR)/usr/share/SuperCollider/Extensions/README
+		$(CURDIR)/debian/tmp/usr/share/SuperCollider/Extensions/README
 # this needs to be an absolute not relative softlink,
 # because supercollider copies it around. hence not using dh_link for this.
-	ln -sf /usr/share/javascript/prettify/prettify.js $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/SuperCollider/HelpSource/prettify.js
-
-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
+	ln -sf /usr/share/javascript/prettify/prettify.js $(CURDIR)/debian/tmp/usr/share/SuperCollider/HelpSource/prettify.js
+	install -d $(CURDIR)/debian/tmp/usr/share/applications
+	install -m 644 debian/scel.desktop $(CURDIR)/debian/tmp/usr/share/applications
+	install -m 644 debian/scvim.desktop $(CURDIR)/debian/tmp/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
+override_dh_installdocs:
+	dh_installdocs -A AUTHORS
diff --git a/debian/supercollider-emacs.docs b/debian/supercollider-emacs.docs
new file mode 100644
index 0000000..d033758
--- /dev/null
+++ b/debian/supercollider-emacs.docs
@@ -0,0 +1 @@
+editors/scel/README.md
diff --git a/debian/supercollider-gedit.docs b/debian/supercollider-gedit.docs
new file mode 100644
index 0000000..205df92
--- /dev/null
+++ b/debian/supercollider-gedit.docs
@@ -0,0 +1 @@
+editors/sced/README.md
diff --git a/debian/supercollider-ide.manpages b/debian/supercollider-ide.manpages
new file mode 100644
index 0000000..6b2c1e2
--- /dev/null
+++ b/debian/supercollider-ide.manpages
@@ -0,0 +1 @@
+debian/scide.1
diff --git a/debian/supercollider-language.docs b/debian/supercollider-language.docs
new file mode 100644
index 0000000..4e10014
--- /dev/null
+++ b/debian/supercollider-language.docs
@@ -0,0 +1,2 @@
+README_LINUX.md
+README.md
diff --git a/debian/supercollider-language.manpages b/debian/supercollider-language.manpages
new file mode 100644
index 0000000..02843d5
--- /dev/null
+++ b/debian/supercollider-language.manpages
@@ -0,0 +1 @@
+debian/sclang.1
diff --git a/debian/supercollider-server.docs b/debian/supercollider-server.docs
new file mode 100644
index 0000000..4e10014
--- /dev/null
+++ b/debian/supercollider-server.docs
@@ -0,0 +1,2 @@
+README_LINUX.md
+README.md
diff --git a/debian/supercollider-server.manpages b/debian/supercollider-server.manpages
new file mode 100644
index 0000000..ce1fe5e
--- /dev/null
+++ b/debian/supercollider-server.manpages
@@ -0,0 +1 @@
+debian/scsynth.1
diff --git a/debian/supercollider-supernova.manpages b/debian/supercollider-supernova.manpages
new file mode 100644
index 0000000..3081379
--- /dev/null
+++ b/debian/supercollider-supernova.manpages
@@ -0,0 +1 @@
+debian/supernova.1
diff --git a/debian/supercollider-vim.docs b/debian/supercollider-vim.docs
new file mode 100644
index 0000000..5a7c85e
--- /dev/null
+++ b/debian/supercollider-vim.docs
@@ -0,0 +1,2 @@
+editors/scvim/README.md
+editors/scvim/SCVim.scd
diff --git a/debian/supercollider-vim.manpages b/debian/supercollider-vim.manpages
new file mode 100644
index 0000000..ba418be
--- /dev/null
+++ b/debian/supercollider-vim.manpages
@@ -0,0 +1 @@
+debian/scvim.1 debian/sclangpipe_app.1

-- 
supercollider packaging

More information about the pkg-multimedia-commits mailing list