[SCM] rosegarden/master: Change to cmake build system

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 641f03d494af311f20709d73a484de993cb17438
Author: Stuart Prescott <stuart at debian.org>
Date:   Wed Jan 6 16:44:48 2016 +1100

    Change to cmake build system
    
    * use cmake
    * drop dbg package
    * clean up d/rules

diff --git a/debian/control b/debian/control
index dfcc87a..8f9d146 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders:
  Free Ekanayaka <freee at debian.org>,
  Stuart Prescott <stuart at debian.org>
 Build-Depends:
+ cmake,
  debhelper (>= 9),
- dh-autoreconf,
  dssi-dev (>= 0.4),
  fftw3-dev,
  ladspa-sdk,
@@ -58,18 +58,3 @@ Description: music editor and MIDI/audio sequencer
  sequencer (for playback and recording), a multi-track editor, music
  editing using both piano-roll and score notation, MIDI file IO,
  lilypond and Csound files export, etc.
-
-Package: rosegarden-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- rosegarden (= ${binary:Version}),
- ${misc:Depends}
-Description: Debugging symbols for Rosegarden
- Rosegarden is a Qt application which provides a mixed Audio/MIDI
- sequencer (for playback and recording), a multi-track editor, music
- editing using both piano-roll and score notation, MIDI file IO,
- lilypond and Csound files export, etc.
- .
- This package provides the debugging symbols.
diff --git a/debian/patches/linker-binutils-gold.patch b/debian/patches/linker-binutils-gold.patch
deleted file mode 100644
index 8ade50b..0000000
--- a/debian/patches/linker-binutils-gold.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: explicitly link against used libraries for binutils-gold
- The rosegarden source makes use of symbols without directly linking to the
- libraries that provide these symbols. This causes an FTBFS with binutils-gold.
- .
- Missing symbols:
-   src/document/GzipFile.o:
-      gzopen, gzwrite, gzclose, gzgets, gzeof => -lz
-   src/sound/DSSIPluginFactory.o:
-      dlsym, dlopen, dlclose, dlerror         => -ldl
-   src/gui/application/main.o:
-      XGetErrorText                           => -lX11
-Author: Stuart Prescott <stuart+debian at nanonanonano.net>
----
- Makefile.in |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -53,6 +53,9 @@
- 		   @fftw3f_LIBS@ \
- 		   @samplerate_LIBS@ \
- 		   @sndfile_LIBS@ \
-+		   -lz \
-+		   -ldl \
-+		   -lX11 \
- 		   @LIBS@
- 
- INSTBINDIR	:= $(DESTDIR)$(PREFIX)/bin
diff --git a/debian/patches/make-clean.patch b/debian/patches/make-clean.patch
deleted file mode 100644
index 0a02d2b..0000000
--- a/debian/patches/make-clean.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: clean up all generated files in clean target
- The generated Makefile doesn't remove translations or the final binary,
- thus causing an FTBFS if built twice in a row.
-Author: Stuart Prescott <stuart+debian at nanonanonano.net>
-
----
- Makefile.in |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -139,6 +139,7 @@
- 
- clean:
- 	rm -f $(QSOURCES) $(UIHEADERS) $(UISOURCES) $(UIMOC) $(OBJECTS) $(LIBRARIES) $(EXECUTABLES) data/data.o data/data.cpp
-+	rm -f $(TRANSLATIONSQM) rosegarden
- 
- distclean:	clean
- 	rm -rf autom4te.cache/
diff --git a/debian/patches/series b/debian/patches/series
index 19d2715..722dd0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-make-clean.patch
-linker-binutils-gold.patch
 fix-mime-types.patch
diff --git a/debian/rosegarden.install b/debian/rosegarden.install
index 4910695..d9cc4f6 100644
--- a/debian/rosegarden.install
+++ b/debian/rosegarden.install
@@ -1,2 +1 @@
 debian/rosegarden.xpm usr/share/pixmaps
-usr
diff --git a/debian/rules b/debian/rules
index 57e4252..eeb773a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,42 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_BUILD_ARCH := $(shell dpkg --print-architecture)
-ARCH=$(DEB_BUILD_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-# Enable hardening
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-include /usr/share/dpkg/buildflags.mk
-CFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=$(CPPFLAGS)
-
-ifeq ($(ARCH),alpha)
-CXXFLAGS+=-O0 -mieee
-else
-CXXFLAGS+=-O2
-endif
-
-# DEBUGGING FLAGS.
-# CXXFLAGS+=-g3 -gstabs+ -fexceptions
-# DEB_BUILD_OPTIONS+=nostrip
-# export CXXFLAGS
-# export DEB_BUILD_OPTIONS
-
-###
-
 %:
-	dh $@ --parallel --with autoreconf
-
-override_dh_clean:
-	dh_clean -Xautom4te.cache
-
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		--enable-debug \
-		--with-qtlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
-
-override_dh_auto_test:
+	dh $@ --parallel
 
 override_dh_strip:
-	dh_strip --dbg-package=rosegarden-dbg
+	dh_strip --ddeb-migration='rosegarden-dbg (<< 1:15.12.1-1~)'

-- 
rosegarden packaging