[SCM] schism/master: Imported Debian patch 2:20160521-1

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Fri Jan 20 14:27:30 UTC 2017 

Imported Upstream version 20160521
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6a91c12ca727ebd71634ff491f0091391fab5225
X-Git-Newrev: 44124db2efd36dd41d8b1718feca7e5ff7824f47

The following commit has been merged in the master branch:
commit 44124db2efd36dd41d8b1718feca7e5ff7824f47
Merge: 6a91c12ca727ebd71634ff491f0091391fab5225 13a8e812d0e37e7e1f8478c40942e34573d46eb5
Author: Gürkan Myczko <gurkan at phys.ethz.ch>
Date:   Tue Jul 26 09:53:37 2016 +0200

    Imported Debian patch 2:20160521-1

diff --combined debian/changelog
index 6c47f61,0000000..8a63558
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,170 -1,0 +1,183 @@@
++schism (2:20160521-1) unstable; urgency=low
++
++  * New upstream version. (Closes: #730571)
++  * Bump standards version to 3.9.8.
++  * Drop debian/patches, not needed anymore.
++  * Drop debian/schism.1 and manpages, upstream ships a better one.
++  * debian/rules: add debian hardening for schismtracker.
++  * Upstream renamed schism binary to schismtracker.
++  * Updated debian/menu.
++  * Change my name.
++
++ -- Gürkan Myczko <gurkan at phys.ethz.ch>  Tue, 26 Jul 2016 09:53:37 +0200
++
 +schism (2:0+20110101-1) unstable; urgency=low
 +
 +  * New upstream snapshot.
 +  * Refresh 01-binutils_gold.patch.
 +  * Update debian/copyright.
 +
 + -- Alessio Treglia <alessio at debian.org>  Fri, 18 Feb 2011 15:20:59 +0100
 +
 +schism (2:0+20100202-2) unstable; urgency=low
 +
 +  * Upload to unstable.
 +
 + -- Alessio Treglia <alessio at debian.org>  Wed, 09 Feb 2011 21:19:39 +0100
 +
 +schism (2:0+20100202-1) experimental; urgency=low
 +
 +  * New upstream release.
 +  * Build-Depends on Python.
 +  * debian/rules:
 +    - Create auto directory before calling dh_auto_build in order to prevent
 +      FTBFS.
 +    - Install NEWS file as upstream's changelog.
 +  * Refresh patches.
 +  * Update debian/gbp.conf file.
 +
 + -- Alessio Treglia <alessio at debian.org>  Sun, 05 Sep 2010 20:29:56 +0200
 +
 +schism (2:0+20090817-2) unstable; urgency=low
 +
 +  * Update Maintainer:
 +    - The Debian Multimedia team is currently merging with the Debian
 +       Multimedia Maintainers team (http://wiki.debian.org/DebianMultimedia).
 +    - Add myself as uploader.
 +  * debian/control:
 +    - Wrap long lines.
 +    - Add Vcs-* tags.
 +    - Update Standards to 3.9.0.
 +  * Drop automake from Build-Depends field.
 +  * Drop changes to upstream sources from the packaging.
 +  * Set format to 3.0 (quilt).
 +  * Switch to debhelper 7 + autoreconf add-on.
 +  * Add watch file.
 +  * Add debian/gbp.conf file.
 +  * Add .gitignore file.
 +  * debian/copyright: Fix copyright-refers-to-symlink-license warning.
 +  * Add patch to fix FTBFS with binutils-gold (Closes: #556337).
 +
 + -- Alessio Treglia <alessio at debian.org>  Sat, 10 Jul 2010 12:33:40 +0200
 +
 +schism (2:0+20090817-1.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Drop build-dependency on libxxf86misc-dev (closes: #559692)
 +
 + -- Julien Cristau <jcristau at debian.org>  Wed, 27 Jan 2010 14:44:42 +0100
 +
 +schism (2:0+20090817-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Bump standards version.
 +  * Drop dh_desktop call.
 +  * Updated homepage.
 +
 + -- Gürkan Sengün <gurkan at phys.ethz.ch>  Mon, 17 Aug 2009 21:42:51 +0200
 +
 +schism (2:0+20090126-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Bump debhelper version.
 +  * Update debian/copyright.
 +  * Removed build dependency libxkbsel-dev.
 +  * Changed recommends and updated it to suggests. (Closes: #476898)
 +
 + -- Gürkan Sengün <gurkan at phys.ethz.ch>  Thu, 29 Jan 2009 10:59:59 +0100
 +
 +schism (2:0+20080403-1.1) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Fix bashism in debian/rules (Closes: #478625)
 +  * Bump Standards-Version to 3.8.0.
 +
 + -- Chris Lamb <chris at chris-lamb.co.uk>  Sat, 07 Jun 2008 22:08:45 +0100
 +
 +schism (2:0+20080403-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Remove Simon from Uploaders.
 +  * Updated my email address.
 +  * Recommend xmms2-plugin-modplug instead of xmms-modplug, which is no longer
 +    available. (Closes: #473835)
 +
 + -- Gürkan Sengün <gurkan at phys.ethz.ch>  Sun, 06 Apr 2008 10:21:33 +0200
 +
 +schism (2:0+20080222-1) unstable; urgency=low
 +
 +  * New upstream.
 +  * Added Debian Multimedia to Uploaders.
 +  * debian/copyright: Updated years.
 +  * debian/control: Extended Recommends.
 +  * debian/rules: Call dh_desktop.
 +
 + -- Gürkan Sengün <gurkan at linuks.mine.nu>  Fri, 22 Feb 2008 12:19:06 +0100
 +
 +schism (2:0+20071208-1) unstable; urgency=low
 +
 +  * New upstream version, fixes GNU/kFreeBSD build problems.
 +  * debian/control:
 +    + Updated build-depends. (Closes: #453235)
 +    + Updated standards version.
 +
 + -- Gürkan Sengün <gurkan at linuks.mine.nu>  Sat, 08 Dec 2007 20:45:28 +0100
 +
 +schism (2:0+20071117-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * debian/copyright: Reformatted.
 +  * debian/rules: Install desktop and icon files.
 +  * debian/menu: Added font editor entry.
 +
 + -- Gürkan Sengün <gurkan at linuks.mine.nu>  Sat, 17 Nov 2007 14:22:42 +0100
 +
 +schism (2:0+20071026-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * debian/menu: Update for the new policy.
 +  * debian/compat: Bumped, no changes needed.
 +
 + -- Gürkan Sengün <gurkan at linuks.mine.nu>  Fri, 26 Oct 2007 21:30:25 +0200
 +
 +schism (1:0.5rc1-1) unstable; urgency=low
 +
 +  * New upstream version.
 +
 + -- Gürkan Sengün <gurkan at linuks.mine.nu>  Tue, 16 Jan 2007 15:41:29 +0100
 +
 +schism (2+20061221-1) unstable; urgency=low
 +
 +  * New upstream tarball.
 +
 + -- Gürkan Sengün <gurkan at linuks.mine.nu>  Fri, 22 Dec 2006 10:52:59 +0100
 +
 +schism (2+20061016-1) unstable; urgency=low
 +
 +  * New upstream version. (Closes: #376836)
 +  * New upstream author, updated homepage.
 +  * New maintainer, with Simons' approval.
 +  * Bump debian standards version.
 +  * Added to menu.
 +  * Updated FSF address in debian/copyright.
 +  * Created a manual page.
 +
 + -- Gürkan Sengün <gurkan at linuks.mine.nu>  Thu, 26 Oct 2006 12:51:21 +0200
 +
 +schism (0.2a-3) unstable; urgency=low
 +
 +  * Build with gcc 4.0+ fixed (Closes: #314816)
 +
 + -- Simon Richter <sjr at debian.org>  Thu, 19 Jan 2006 01:25:37 +0100
 +
 +schism (0.2a-2) unstable; urgency=low
 +
 +  * Using fixed SysV types instead of platform dependent ones
 +
 + -- Simon Richter <sjr at debian.org>  Sun, 22 May 2005 20:09:28 +0200
 +
 +schism (0.2a-1) unstable; urgency=low
 +
 +  * Initial release.
 +
 + -- Simon Richter <sjr at debian.org>  Sun, 22 May 2005 12:44:50 +0200
diff --combined debian/control
index cf35895,0000000..67c7792
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,33 -1,0 +1,33 @@@
 +Source: schism
 +Section: sound
 +Priority: optional
 +Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Uploaders: Alessio Treglia <alessio at debian.org>,
-  Gürkan Sengün <gurkan at phys.ethz.ch>
++ Gürkan Myczko <gurkan at phys.ethz.ch>
 +Build-Depends: debhelper (>= 7.0.50~),
 + python (>= 2.4),
 + dh-autoreconf,
 + libsdl1.2-dev,
 + autotools-dev,
 + libxext-dev,
 + libasound2-dev
- Standards-Version: 3.9.1
++Standards-Version: 3.9.8
 +Homepage: http://schismtracker.org/
 +Vcs-Git: git://git.debian.org/git/pkg-multimedia/schism.git
 +Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/schism.git
 +
 +Package: schism
 +Architecture: any
 +Depends: ${shlibs:Depends},
 + ${misc:Depends}
 +Suggests: opencubicplayer,
 + xmp,
 + goattracker,
 + milkytracker
 +Description: ImpulseTracker clone aiming at providing the same look&feel
 + This is an editor for "tracked" music, i.e. audio samples of instruments
 + pitch shifted according to the note data.
 + .
 + The Impulse Tracker is one of the most popular "tracker" programs at
 + present, and Schism Tracker attempts to follow their UI layout wherever
 + possible in order to make it easy for existing users to switch.
diff --combined debian/copyright
index f26bff9,0000000..f21def0
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,37 -1,0 +1,37 @@@
 +This package was debianized by:
 +
 +    Simon Richter <sjr at debian.org> on Sun, 22 May 2005 12:44:50 +0200.
 +
 +It was downloaded from:
 +
 +    http://schismtracker.org/
 +
 +Upstream Authors:
 +
 +    nimh: "Mrs. Brisby" <nimh at users.sourceforge.net>
 +    grabakskd: "Daniel Hyde" <grabakskd at users.sourceforge.net>
 +    gargaj: "Gargaj/CNS" <gargaj at users.sourceforge.net>
 +    storlek: "Storlek/chisel" <storlek at chisel.cjb.net>
 +    timdoug: "Tim Douglas" <timdoug at users.sourceforge.net>
 +
 +License:
 +
 +    Copyright (C) 2003-2011 Storlek/chisel <schism at chisel.cjb.net>
-     Copyright (C) 2005-2011 Mrs. Brisby <mrs.brisby at nimh.org>
++    Copyright (C) 2005-2016 Mrs. Brisby <mrs.brisby at nimh.org>
 +
 +    This package 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.
 +
 +    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 package; if not, write to the Free Software
 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 +
 +On Debian systems, the complete text of the GNU General
 +Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --combined debian/gbp.conf
index 5ab8223,0000000..bb72d4b
mode 100644,000000..100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,0 +1,4 @@@
 +[DEFAULT]
 +sign-tags = True
 +pristine-tar = True
- compression = bzip2
++compression = gzip
diff --combined debian/menu
index a80e812,0000000..05bb26e
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,5 -1,0 +1,5 @@@
 +?package(schism):needs="X11" section="Applications/Sound"\
-   title="Schism Tracker" command="/usr/bin/schism"
++  title="Schism Tracker" command="/usr/bin/schismtracker"
 +
 +?package(schism):needs="X11" section="Applications/Graphics"\
-   title="Schism Tracker Font Editor" command="/usr/bin/schism --font-editor"
++  title="Schism Tracker Font Editor" command="/usr/bin/schismtracker --font-editor"
diff --combined debian/patches/drop-macro-PE
index 0000000,0000000..ec9b204
new file mode 100644
--- /dev/null
+++ b/debian/patches/drop-macro-PE
@@@ -1,0 -1,0 +1,38 @@@
++Description: invalid macro PE
++ Drop the .PE macro since lintian doesn't like it.
++ .
++ schism (2:20160521-1) unstable; urgency=low
++ .
++   * New upstream version. (Closes: #730571)
++   * Bump standards version to 3.9.8.
++   * Drop debian/patches, not needed anymore.
++   * Drop debian/schism.1 and manpages, upstream ships a better one.
++   * Upstream renamed schism binary to schismtracker.
++   * Updated debian/menu.
++   * Change my name.
++Author: Gürkan Myczko <gurkan at phys.ethz.ch>
++Bug-Debian: https://bugs.debian.org/730571
++
++---
++The information above should follow the Patch Tagging Guidelines, please
++checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
++are templates for supplementary fields that you might want to add:
++
++Origin: <vendor|upstream|other>, <url of original patch>
++Bug: <url in upstream bugtracker>
++Bug-Debian: https://bugs.debian.org/<bugnumber>
++Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
++Forwarded: <no|not-needed|url proving that it has been forwarded>
++Reviewed-By: <name and email of someone who approved the patch>
++Last-Update: 2016-08-03
++
++--- schism-20160521.orig/sys/posix/schismtracker.1
+++++ schism-20160521/sys/posix/schismtracker.1
++@@ -113,7 +113,6 @@ with the keyboard as follows:
++                '--'--'--'--'--'--'--'--'--'--'--'--'--'--'--'--'--'
++     (Note)       C  D  E  F  G  A  B  C  D  E  F  G  A  B  C  D  E
++                 (Octave 0)           (Octave 1)           (Octave 2)
++-.PE
++ .\" this .P is for elvis, which gets very confused by the preceding diagram
++ .P
++ The "/" and "*" keys on the numeric keypad change octaves, and the current
diff --combined debian/patches/invalid-macro-PS
index 0000000,0000000..9e30ff3
new file mode 100644
--- /dev/null
+++ b/debian/patches/invalid-macro-PS
@@@ -1,0 -1,0 +1,38 @@@
++Description: invalid macro PS
++ Drop the .PS macro since lintian doesn't like it.
++ .
++ schism (2:20160521-1) unstable; urgency=low
++ .
++   * New upstream version. (Closes: #730571)
++   * Bump standards version to 3.9.8.
++   * Drop debian/patches, not needed anymore.
++   * Drop debian/schism.1 and manpages, upstream ships a better one.
++   * Upstream renamed schism binary to schismtracker.
++   * Updated debian/menu.
++   * Change my name.
++Author: Gürkan Myczko <gurkan at phys.ethz.ch>
++Bug-Debian: https://bugs.debian.org/730571
++
++---
++The information above should follow the Patch Tagging Guidelines, please
++checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
++are templates for supplementary fields that you might want to add:
++
++Origin: <vendor|upstream|other>, <url of original patch>
++Bug: <url in upstream bugtracker>
++Bug-Debian: https://bugs.debian.org/<bugnumber>
++Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
++Forwarded: <no|not-needed|url proving that it has been forwarded>
++Reviewed-By: <name and email of someone who approved the patch>
++Last-Update: 2016-08-03
++
++--- schism-20160521.orig/sys/posix/schismtracker.1
+++++ schism-20160521/sys/posix/schismtracker.1
++@@ -104,7 +104,6 @@ The four sub-columns of each channel are
++ effect. A list of effects is available in the pattern editor help, but you can
++ safely ignore that column for now. Assuming a US keymap, notes are entered
++ with the keyboard as follows:
++-.PS
++     (Note)        C# D#    F# G# A#    C# D#    F# G# A#    C# D#
++                | | || | | | || || | | | || | | | || || | | | || | |
++                | | || | | | || || | | | || | | | || || | | | || | |
diff --combined debian/patches/series
index 913fdce,0000000..54e5f57
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
- 01-binutils_gold.patch
++invalid-macro-PS
++drop-macro-PE
diff --combined debian/rules
index 90ef3f3,0000000..a329b38
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,21 -1,0 +1,22 @@@
 +#! /usr/bin/make -f
 +
++DPKG_EXPORT_BUILDFLAGS = 1
++include /usr/share/dpkg/buildflags.mk
++
 +%:
 +	dh --with=autoreconf $@
 +
 +override_dh_auto_clean:
 +	dh_auto_clean
 +	rm -rf auto
 +
 +override_dh_auto_build:
 +	mkdir auto
 +	dh_auto_build
 +
 +override_dh_auto_install:
 +	dh_auto_install
- 	mv $(CURDIR)/debian/schism/usr/bin/schismtracker \
- 		$(CURDIR)/debian/schism/usr/bin/schism
 +	dh_install icons/schism-icon-128.png usr/share/icons/
 +
 +override_dh_installchangelogs:
 +	dh_installchangelogs NEWS

-- 
schism packaging

More information about the pkg-multimedia-commits mailing list