[SCM] xwax/master: Imported Debian patch 1.3-1

Thu Jan 17 08:59:24 UTC 2013

Imported Upstream version 1.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8f419b317284e0c0a1a5d175001212db9d24864a
X-Git-Newrev: c1a15e31a1868de8cf502468d6579178f1f719c3

The following commit has been merged in the master branch:
commit c1a15e31a1868de8cf502468d6579178f1f719c3
Merge: 8f419b317284e0c0a1a5d175001212db9d24864a 3f9742738377aabf2691f8c2a03caf332e7b9109
Author: Mitchell Smith <mjs at mjsprojects.net>
Date:   Thu Jan 17 10:17:03 2013 +1000

    Imported Debian patch 1.3-1

diff --combined debian/changelog
index 833ec66,0000000..8fc8ce3
mode 100644,000000..100644

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,97 -1,0 +1,118 @@@
++xwax (1.3-1) unstable; urgency=low
++
++  * New upstream release. (Closes: #637207)
++  * Moved to Debian Multimedia Maintainers team.
++  * debian/patches/01-fix-libexec-dir-in-makefile.patch: dropped.
++  * debian/patches/02-remove-redundant-copyright-notice.patch: dropped,
++    override dh_install instead.
++  * debian/control:
++    - use [linux-any]. (Closes: #634480)
++    - bump Standards-Version to 3.9.2.
++    - bump debhelper Build-Depends to 7.0.50~.
++    - Changed maintainer to Debian Multimedia Maintainers.
++  * debian/rules:
++    - port to dh7.
++    - install upstream changelog.
++    - set EXECDIR.
++    - move clean bits to debian/clean.
++  * debian/copyright: use DEP 5.
++
++ -- Mitchell Smith <mjs at mjsprojects.net>  Thu, 17 Jan 2013 10:17:03 +1000
++
 +xwax (0.9-2) unstable; urgency=low
 +
 +  * Removed quilt related stuff from debian/rules
 +  * Updated copyright notice
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Sat, 23 Apr 2011 04:30:14 +1000
 +
 +xwax (0.9-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Updated package dependencies for import script
 +  * manpage patch no longer required
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Tue, 19 Apr 2011 16:29:05 +1000
 +
 +xwax (0.8-3) unstable; urgency=low
 +
 +  * Include patch to stop installation of redundant copyright notice
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Thu, 20 Jan 2011 09:12:02 +1100
 +
 +xwax (0.8-2) unstable; urgency=low
 +
 +  * Include patch to set EXECDIR correctly in Makefile
 +
 + -- Mitchell Smith <mjs at kryptonite.mjsprojects.net>  Thu, 20 Jan 2011 08:38:20 +1100
 +
 +xwax (0.8-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #603011)
 +  * Included manpage patch from Daniel Holbach
 +  * Switch to dpkg-source 3.0 (quilt) format
 +  * Updated standards version to 3.9.1
 +  * Changed configure options to only use alsa on Linux (Closes: #597892)
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Tue, 18 Jan 2011 11:48:01 +1100
 +
 +xwax (0.7-5) unstable; urgency=low
 +
 +  * Added dependency on ttf-dejavu-extra which provides 
 +    DejaVuSans-Oblique.ttf (Closes: #587569)
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Fri, 02 Jul 2010 12:08:00 +1000
 +
 +xwax (0.7-4) unstable; urgency=low
 +
 +  * Fixed kfreebsd build issue with help from Petr Salinger (Closes: #573809)
 +  * Fixed problem with the way configure was being called as reported by upstream author
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Mon, 12 Apr 2010 10:08:52 +1000
 +
 +xwax (0.7-3) unstable; urgency=low
 +
 +  * Fixes to debian/rules (Closes: #573552)
 +  * Cleaned up a couple of Lintian warnings
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Sun, 14 Mar 2010 07:15:30 +1000
 +
 +xwax (0.7-2) unstable; urgency=low
 +
 +  * Removed man page, now included in upstream release
 +  * Verified build with binutils-gold (Closes: #556764)
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Mon, 08 Mar 2010 00:48:01 +0000
 +
 +xwax (0.7-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Mon, 01 Mar 2010 08:49:31 +1000
 +
 +xwax (0.6-3) unstable; urgency=low
 +
 +  * Correction of license details, should be GPL version 2 only
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Mon, 26 Oct 2009 10:40:27 +1000
 +
 +xwax (0.6-2) unstable; urgency=low
 +
 +  * Using mpg123 instead of mpg321
 +  * Updated xwax version in man page
 +  * Some cosmetic changes to debian/control file
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Fri, 23 Oct 2009 04:07:38 +0000
 +
 +xwax (0.6-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Added README.debian file documenting changes from upstream source
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Sat, 12 Sep 2009 06:31:22 +0000
 +
 +xwax (0.5-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #535031)
 +
 + -- Mitchell Smith <mjs at mjsprojects.net>  Sun, 05 Jul 2009 21:57:19 +0000
diff --combined debian/clean
index 0000000,0000000..60fd604
new file mode 100644
--- /dev/null
+++ b/debian/clean
@@@ -1,0 -1,0 +1,3 @@@
++.config
++test-*.d
++test-*.o
diff --combined debian/control
index 577d35b,0000000..3761e78
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,22 -1,0 +1,23 @@@
 +Source: xwax
 +Section: sound
 +Priority: extra
- Maintainer: Mitchell Smith <mjs at mjsprojects.net>
- Build-Depends: debhelper (>= 7), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsdl-ttf2.0-dev
- Standards-Version: 3.9.1
++Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
++XSBC-Original-Maintainer: Mitchell Smith <mjs at mjsprojects.net>
++Build-Depends: debhelper (>= 7.0.50~), libasound2-dev [linux-any], libsdl-ttf2.0-dev
++Standards-Version: 3.9.3
 +Homepage: http://www.xwax.co.uk/
 +
 +Package: xwax
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu-extra
 +Recommends: cdparanoia, mpg123, ffmpeg
 +Description: open-source vinyl emulation software for Linux
 + xwax is open-source vinyl emulation software for Linux. It allows DJs and 
 + turntablists to playback digital audio files (MP3, Ogg Vorbis, FLAC, AAC and 
 + more), controlled using a normal pair of turntables via timecoded vinyls.
 + .
 + It's designed for both beat mixing and scratch mixing. Needle drops, pitch 
 + changes, scratching, spinbacks and rewinds are all supported, and feel just 
 + like the audio is pressed onto the vinyl itself.
 + .
 + The focus is on an accurate vinyl feel which is efficient, stable and fast.
diff --combined debian/copyright
index ff2a59c,0000000..ca25409
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,41 -1,0 +1,16 @@@
- This work was packaged for Debian by:
- 
-     Mitchell Smith <mjs at mjsprojects.net> on Sun, 05 Jul 2009 21:57:19 +0000
- 
- It was downloaded from:
- 
-     http://www.xwax.co.uk/
- 
- Upstream Author(s):
- 
-     Mark Hills mark at pogo.org.uk
- 
- Copyright:
- 
-     Copyright (C) 2011 Mark Hills
- 
- License:
- 
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2 as
-    published by the Free Software Foundation.
- 
-     This package is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
- 
-     You should have received a copy of the GNU General Public License
-     along with this program. If not, see <http://www.gnu.org/licenses/>
- 
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
- 
- The Debian packaging is:
- 
-     Copyright (C) 2011 Mitchell Smith <mjs at mjsprojects.net>
- 
- 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.
++Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=523
++Upstream-Name: xwax
++Upstream-Maintainer: mark at pogo.org.uk
++Upstream-Source: https://xwax.co.uk/download.html
++
++Files: *
++Copyright: 2011 Mark Hills
++License: GPL-2
++ The full text of the GPL is distributed as in
++ /usr/share/common-licenses/GPL-2 on Debian systems.
++
++Files: debian/*
++Copyright: 2010 2011 Mitchell Smith
++License: GPL-2+
++ The full text of the GPL is distributed as in
++ /usr/share/common-licenses/GPL-2 on Debian systems.
diff --combined debian/rules
index 6849542,0000000..baeb426
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,102 -1,0 +1,38 @@@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
- # Sample debian/rules that uses debhelper.
- # This file was originally written by Joey Hess and Craig Small.
- # As a special exception, when this file is copied by dh-make into a
- # dh-make output file, you may use that output file without restriction.
- # This special exception was added by Craig Small in version 0.37 of dh-make.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
- 
 +# These are used for cross-compiling and for saving the configure script
 +# from having to guess our platform (since we know it already)
 +DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 +DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 +CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 +else
 +CROSS= --build $(DEB_BUILD_GNU_TYPE)
 +endif
 +
++%:
++	dh $@
 +
- 
- config.status: configure
- 	dh_testdir
- 	# Add here commands to configure the package.
++override_dh_auto_configure:
 +ifneq ($(DEB_HOST_ARCH_OS),linux)
- 	 ./configure --prefix /usr --enable-oss
++	./configure --prefix /usr --enable-oss
 +else
- 	 ./configure --prefix /usr --enable-alsa
++	./configure --prefix /usr --enable-alsa
 +endif
 +
- build: build-stamp
- 
- build-stamp:  config.status 
- 	dh_testdir
- 
- 	# Add here commands to compile the package.
- 	$(MAKE)
- 	#docbook-to-man debian/xwax.sgml > xwax.1
- 
- 	touch $@
- 
- clean: 
- 	dh_testdir
- 	dh_testroot
- 	rm -f build-stamp 
- 
- 	# Add here commands to clean up after the build process.
- 	[ ! -f Makefile ] || $(MAKE) clean
- 	rm -f config.sub config.guess
- 
- 	dh_clean 
- 
- install: build
- 	dh_testdir
- 	dh_testroot
- 	dh_prep 
- 	dh_installdirs
- 
- 	# Add here commands to install the package into debian/xwax.
- 	$(MAKE) PREFIX=$(CURDIR)/debian/xwax/usr install
- 
++override_dh_auto_build:
++	$(MAKE) PREFIX=/usr EXECDIR=/usr/share/xwax
 +
- # Build architecture-independent files here.
- binary-indep: build install
- # We have nothing to do by default.
++override_dh_auto_install:
++	$(MAKE) PREFIX=$(CURDIR)/debian/xwax/usr EXECDIR=$(CURDIR)/debian/xwax/usr/share/xwax install
 +
- # Build architecture-dependent files here.
- binary-arch: build install
- 	dh_testdir
- 	dh_testroot
- 	dh_installchangelogs CHANGES
- 	dh_installdocs
- 	dh_installexamples
- #	dh_install
- #	dh_installmenu
- #	dh_installdebconf	
- #	dh_installlogrotate
- #	dh_installemacsen
- #	dh_installpam
- #	dh_installmime
- #	dh_python
- #	dh_installinit
- #	dh_installcron
- #	dh_installinfo
- 	dh_installman
- 	dh_link
- 	dh_strip
- 	dh_compress
- 	dh_fixperms
- #	dh_perl
- #	dh_makeshlibs
- 	dh_installdeb
- 	dh_shlibdeps
- 	dh_gencontrol
- 	dh_md5sums
- 	dh_builddeb
++override_dh_install:
++	dh_install
++	rm -f $(CURDIR)/debian/xwax/usr/share/doc/xwax/COPYING
 +
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install 
++override_dh_installchangelogs:
++	dh_installchangelogs -k CHANGES

-- 
xwax packaging

