[SCM] rosegarden packaging branch, master, updated. debian/1.7.3-1.1-11-g20345eb
themill-guest at users.alioth.debian.org
themill-guest at users.alioth.debian.org
Wed Mar 31 17:31:21 UTC 2010
The following commit has been merged in the master branch:
commit 72664fc846aefae4b645865f4e74d4575ef509a1
Author: Stuart Prescott <stuart+debian at nanonanonano.net>
Date: Wed Mar 31 12:21:40 2010 +0100
Update packaging for new upstream version
* update build-deps and package depends/recommends/suggests as per new
upstream preferences
* drop rosegarden-data package as it would only include the icons in with
the new upstream version
* convert debian/rules to dh7 style
* update debian/copyright with new years, maintainer information
* move lintian and manpage installation into debhelper preferred locations
diff --git a/debian/control b/debian/control
index 194aa1c..40323da 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,15 @@ Section: sound
Priority: extra
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: Mike O'Connor <stew at debian.org>,
- Free Ekanayaka <freee at debian.org>
-Build-Depends: debhelper (>> 5.0.0),
- cmake,
- kdelibs4-dev,
+ Free Ekanayaka <freee at debian.org>,
+ Stuart Prescott <stuart+debian at nanonanonano.net>
+Build-Depends: debhelper (>= 7.0.50~),
+ automake,
+ pkg-config,
+ xutils-dev,
+ libx11-dev,
+ libsm-dev,
+ libqt4-dev,
libasound2-dev (>= 1.0.0),
libjack-dev,
ladspa-sdk,
@@ -14,9 +19,9 @@ Build-Depends: debhelper (>> 5.0.0),
liblircclient-dev,
dssi-dev (>= 0.4),
liblo-dev,
- libxft-dev,
- dpatch,
- fftw3-dev
+ fftw3-dev,
+ libsndfile1-dev,
+ libsamplerate-dev
Standards-Version: 3.8.4
Homepage: http://www.rosegardenmusic.com/
Vcs-Git: git://git.debian.org/pkg-multimedia/rosegarden.git
@@ -25,38 +30,29 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/rosegarden.git
Package: rosegarden
Architecture: any
Depends: ${shlibs:Depends},
- rosegarden-data (= ${source:Version}),
+ ${misc:Depends},
libxml-twig-perl,
sndfile-programs,
- xterm | x-terminal-emulator,
- kdebase-bin,
- konqueror | www-browser,
flac
-Replaces: rosegarden4,rosegarden2
-Provides: rosegarden4,rosegarden2
+Replaces: rosegarden4,
+ rosegarden2,
+ rosegarden-data
+Provides: rosegarden4,
+ rosegarden2
Conflicts: rosegarden4 (<< 1:1.2.3),
- rosegarden2 (<< 1:1.2.3)
+ rosegarden2 (<< 1:1.2.3),
+ rosegarden-data
Recommends: jackd,
lilypond,
+ ghostscript,
+ okular | pdf-viewer,
+ cups-bsd | lpr,
swh-plugins | ladspa-plugin,
- khelpcenter
+ konqueror | www-browser
Suggests: qjackctl
Description: music editor and MIDI/audio sequencer
- Rosegarden is a KDE application which provides a mixed Audio/MIDI
+ 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.
-Package: rosegarden-data
-Architecture: all
-Recommends: rosegarden
-Priority: optional
-Conflicts: rosegarden4 (<< 1:1.2.3),
- rosegarden2 (<< 1:1.2.3)
-Description: music editor and MIDI/audio sequencer data files
- Rosegarden is a KDE 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 data files necessary for running Rosegarden
diff --git a/debian/copyright b/debian/copyright
index df2a7e7..fbe0fe4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,6 @@
-This package was debianized by Mike O'Connor <stew at vireo.org> on
-Thu, 16 Feb 2006 02:44:01 +0500.
-
-It had originally been debianized by Enrique Robledo Arnuncio <era at debian.org>
-on Sat, 26 Jan 2002 00:00:36 +0100.
-
This package was originally downloaded from:
-http://prdownloads.sourceforge.net/rosegarden/rosegarden-4-1.2.3.tar.bz2?download
+http://downloads.sourceforge.net/project/rosegarden/rosegarden/10.02/rosegarden-10.02.1.tar.bz2
You can find the home page of the Rosegarden project at:
@@ -14,7 +8,7 @@ You can find the home page of the Rosegarden project at:
Copyright:
----------
- This program is Copyright 2000-2006
+ This program is Copyright 2000-2010 The Rosegarden Development Team
Guillaume Laurent <glaurent at telegraph-road.org>,
Chris Cannam <cannam at all-day-breakfast.com>,
Richard Bown <bownie at bownie.com>
@@ -32,15 +26,30 @@ Adjunct developers:
D. Michael McIntyre <dmmcintyr at users.sourceforge.net>
-See the AUTHORS file for a list of contributors.
+See http://rosegardenmusic.com/resources/authors/ for a list of contributors.
License:
-----------
+--------
-Rosegarden is covered by the GNU General Public License. Individual
-files from the kde build system are covered by the GNU Library General
-Public License and by a MIT license shown below.
+Rosegarden is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+
+Parts of Rosegarden are available under the terms of the GNU Lesser General
+Public License as published by the Free Software Foundation; either version
+2.1 of the License, or (at your option) any later version.
On Debian GNU/Linux systems, the complete texts of the GNU General
Public License and the GNU Library General Public License are
available at /usr/share/common-licenses/{GPL,LGPL}.
+
+
+Debian packaging:
+-----------------
+
+The Debian packging is
+ Copyright (c) Stuart Prescott <stuart+debian at nanonanonano.net> 2010
+ Copyright (c) Mike O'Connor <stew at debian.org> 2006-2009
+ Copyright (c) Enrique Robledo Arnuncio <era at debian.org> 2002
+
diff --git a/debian/patches/make-clean.patch b/debian/patches/make-clean.patch
new file mode 100644
index 0000000..ec60295
--- /dev/null
+++ b/debian/patches/make-clean.patch
@@ -0,0 +1,15 @@
+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>
+
+--- rosegarden.orig/Makefile.in
++++ rosegarden/Makefile.in
+@@ -137,6 +137,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 e69de29..59070f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+make-clean.patch
diff --git a/debian/lintianoverrides b/debian/rosegarden.lintian-overrides
similarity index 100%
copy from debian/lintianoverrides
copy to debian/rosegarden.lintian-overrides
diff --git a/debian/rosegarden.manpages b/debian/rosegarden.manpages
new file mode 100644
index 0000000..2dae671
--- /dev/null
+++ b/debian/rosegarden.manpages
@@ -0,0 +1 @@
+debian/rosegarden.1
diff --git a/debian/rules b/debian/rules
index 6802273..c60273d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,9 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
-DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture)
+DEB_BUILD_ARCH := $(shell dpkg --print-architecture)
ARCH=$(DEB_BUILD_ARCH)
ifeq ($(ARCH),alpha)
@@ -24,85 +20,14 @@ endif
###
-configure: configure-stamp
-
-configure-stamp:
- dh_testdir
- cmake . -DCMAKE_INSTALL_PREFIX=`kde-config --prefix`
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp patch-stamp
- dh_testdir
- make
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
-
- [ ! -f Makefile ] || make clean
- rm -rf RGbuild
- rm -rf CMakeCache.txt
- rm -rf CMakeFiles
- rm -f build-stamp
- rm -f configure-stamp
- rm -f install-stamp
- rm -f config.log
- dh_clean
-
-install-stamp:
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- make install DESTDIR=`pwd`/debian/tmp
- find debian/tmp/usr/share -type f -exec chmod 644 {} \;
- dh_installexamples
- find debian/rosegarden/usr/share/doc/rosegarden -type f -exec chmod 644 {} \;
-
- dh_installdirs
- dh_installdocs
- dh_installmenu
- dh_installmime
- dh_installchangelogs
-
- touch install-stamp
-
-install: install-stamp
- dh_installman debian/rosegarden.1 debian/rosegarden-lilypondview.1 debian/rosegarden-project-package.1 debian/rosegarden-audiofile-importer.1
- dh_desktop
- cp debian/lintianoverrides debian/rosegarden/usr/share/lintian/overrides/rosegarden
-
- dh_install -a
- dh_link -a
- dh_strip -a
+%:
+ dh $@
-install-data: install-stamp
- dh_install -i
+override_dh_auto_configure:
+ sh ./bootstrap.sh
+ dh_auto_configure
-# Build architecture-independent files here.
-binary-indep: build install-data
- dh_compress -i -X.rg -X.wav -X.docbook
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
+override_dh_auto_test:
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_compress -a -X.rg -X.wav -X.docbook
- dh_fixperms -a
- dh_desktop -a
- dh_makeshlibs -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+.PHONY: override_dh_auto_test override_dh_auto_configure
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
--
rosegarden packaging
More information about the pkg-multimedia-commits
mailing list