Tags: patch User: [email protected] Usertags: origin-ubuntu quantal ubuntu-patch
Maybe in experimental xwax could be updated to 1.3~beta2 - I have been using it since it was released and it has been working great. The patch attached fixes: - Update to 1.3~beta2. - Use [linux-any] for libasound2-dev (Closes: #634480). - Use debhelper7. - Update debian/copyright to DEP5. - Drop all patches, everything's fixed upstream or is easily overridden in debian/rules. Have a great day, Daniel
diff -ruN xwax-0.9/debian/clean xwax-1.3~beta2/debian/clean --- xwax-0.9/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ xwax-1.3~beta2/debian/clean 2012-04-20 09:21:37.000000000 +0200 @@ -0,0 +1,3 @@ +.config +test-*.d +test-*.o diff -ruN xwax-0.9/debian/control xwax-1.3~beta2/debian/control --- xwax-0.9/debian/control 2011-04-22 20:22:38.000000000 +0200 +++ xwax-1.3~beta2/debian/control 2012-10-04 13:38:03.848081207 +0200 @@ -1,9 +1,10 @@ Source: xwax Section: sound Priority: extra -Maintainer: Mitchell Smith <[email protected]> -Build-Depends: debhelper (>= 7), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsdl-ttf2.0-dev -Standards-Version: 3.9.1 +Maintainer: Ubuntu Developers <[email protected]> +XSBC-Original-Maintainer: Mitchell Smith <[email protected]> +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 diff -ruN xwax-0.9/debian/copyright xwax-1.3~beta2/debian/copyright --- xwax-0.9/debian/copyright 2011-04-22 20:05:09.000000000 +0200 +++ xwax-1.3~beta2/debian/copyright 2012-04-20 09:00:33.000000000 +0200 @@ -1,41 +1,16 @@ -This work was packaged for Debian by: - - Mitchell Smith <[email protected]> on Sun, 05 Jul 2009 21:57:19 +0000 - -It was downloaded from: - - http://www.xwax.co.uk/ - -Upstream Author(s): - - Mark Hills [email protected] - -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 <[email protected]> - -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://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: xwax +Upstream-Contact: [email protected] +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 -ruN xwax-0.9/debian/patches/01-fix-libexec-dir-in-makefile.patch xwax-1.3~beta2/debian/patches/01-fix-libexec-dir-in-makefile.patch --- xwax-0.9/debian/patches/01-fix-libexec-dir-in-makefile.patch 2011-04-21 00:33:53.000000000 +0200 +++ xwax-1.3~beta2/debian/patches/01-fix-libexec-dir-in-makefile.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -## Description: Install external scripts in FHS friendly location. -## Origin/Author: Mitchell Smith <[email protected]> -Index: xwax-0.9/Makefile -=================================================================== ---- xwax-0.9.orig/Makefile 2011-04-16 19:19:28.000000000 +1000 -+++ xwax-0.9/Makefile 2011-04-21 08:32:59.315641837 +1000 -@@ -35,7 +35,7 @@ - # Installation paths - - BINDIR = $(PREFIX)/bin --EXECDIR = $(PREFIX)/libexec -+EXECDIR = $(PREFIX)/share/xwax - MANDIR = $(PREFIX)/share/man - DOCDIR = $(PREFIX)/share/doc - diff -ruN xwax-0.9/debian/patches/02-remove-redundant-copyright-notice.patch xwax-1.3~beta2/debian/patches/02-remove-redundant-copyright-notice.patch --- xwax-0.9/debian/patches/02-remove-redundant-copyright-notice.patch 2011-04-21 00:30:45.000000000 +0200 +++ xwax-1.3~beta2/debian/patches/02-remove-redundant-copyright-notice.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -## Description: Stop redundant copyright file from being installed. -## Origin/Author: Mitchell Smith <[email protected]> -Index: xwax-0.9/Makefile -=================================================================== ---- xwax-0.9.orig/Makefile 2011-04-16 19:19:28.000000000 +1000 -+++ xwax-0.9/Makefile 2011-04-21 08:28:05.147622116 +1000 -@@ -105,7 +105,6 @@ - $(INSTALL) -m 0644 xwax.1 $(MANDIR)/man1/xwax.1 - $(INSTALL) -d $(DOCDIR)/xwax - $(INSTALL) -m 0644 CHANGES $(DOCDIR)/xwax/CHANGES -- $(INSTALL) -m 0644 COPYING $(DOCDIR)/xwax/COPYING - $(INSTALL) -m 0644 README $(DOCDIR)/xwax/README - - # Distribution archive from Git source code diff -ruN xwax-0.9/debian/patches/series xwax-1.3~beta2/debian/patches/series --- xwax-0.9/debian/patches/series 2011-04-21 00:34:56.000000000 +0200 +++ xwax-1.3~beta2/debian/patches/series 2012-06-08 15:10:34.000000000 +0200 @@ -1,2 +0,0 @@ -01-fix-libexec-dir-in-makefile.patch -02-remove-redundant-copyright-notice.patch diff -ruN xwax-0.9/debian/rules xwax-1.3~beta2/debian/rules --- xwax-0.9/debian/rules 2011-04-22 20:34:39.000000000 +0200 +++ xwax-1.3~beta2/debian/rules 2012-06-09 18:51:13.000000000 +0200 @@ -1,15 +1,9 @@ #!/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) @@ -20,83 +14,25 @@ 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 +override_dh_auto_build: + $(MAKE) PREFIX=/usr EXECDIR=/usr/share/xwax -build-stamp: config.status - dh_testdir +override_dh_auto_install: + $(MAKE) PREFIX=$(CURDIR)/debian/xwax/usr EXECDIR=$(CURDIR)/debian/xwax/usr/share/xwax install - # 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 - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# 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
