[SCM] gsequencer/master: Imported Debian patch 0.4.2-61-1

Tue Jun 16 10:47:54 UTC 2015

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

The following commit has been merged in the master branch:
commit 085661a1d4e523aaa3be8c66c5fe69ed95761fe1
Merge: aa942d661b9b7bf22013f6ea5a4476ca6e6b12a9 62b256f558610652de0f7ad9ae748b66e7a82817
Author: JoÃ«l KrÃ¤hemann <jkraehemann at gmail.com>
Date:   Thu Jun 11 11:52:06 2015 +0200

    Imported Debian patch 0.4.2-61-1

diff --combined debian/ags.menu
index 524ce6a,0000000..ea00afa
mode 100644,000000..100644

--- a/debian/ags.menu
+++ b/debian/ags.menu
@@@ -1,4 -1,0 +1,4 @@@
- ?package(gsequencer):needs="X11"\
++?package(ags):needs="X11"\
 +	section="Applications/Sound"\
 +	title="Advanced Gtk+ Sequencer" command="/usr/bin/ags"\
- 	icon="/usr/share/gsequencer/icons/ags.xpm"
++	icon="/usr/share/gsequencer/icons/jumper.png"
diff --combined debian/changelog
index 5c7eeb2,0000000..2d6e37e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- ags (0.4.2-63-1) unstable; urgency=low
++ags (0.4.2-61-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #788590)
 +
-  -- JoÃ«l KrÃ¤hemann (Maintainer of Advanced Gtk+ Sequencer) <jkraehemann at gmail.com>  Thu, 11 Jun 2015 11:52:06 +0200
++ -- JoÃ«l KrÃ¤hemann <jkraehemann at gmail.com>  Thu, 11 Jun 2015 11:52:06 +0200
diff --combined debian/patches/fixed-category
index 0000000,0000000..d3df502
new file mode 100644
--- /dev/null
+++ b/debian/patches/fixed-category
@@@ -1,0 -1,0 +1,34 @@@
++Description: changed from Synthesis to Audio
++ TODO: Put a short summary on the line above and replace this paragraph
++ with a longer explanation of this change. Complete the meta-information
++ with other relevant fields (see below for details). To make it easier, the
++ information below has been extracted from the changelog. Adjust it or drop
++ it.
++ .
++ ags (0.4.2-61-1) unstable; urgency=low
++ .
++   * Initial release (Closes: #788590)
++Author: JoÃ«l KrÃ¤hemann <jkraehemann at gmail.com>
++Bug-Debian: https://bugs.debian.org/788590
++
++---
++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: <YYYY-MM-DD>
++
++--- ags-0.4.2-61.orig/ags.desktop.in
+++++ ags-0.4.2-61/ags.desktop.in
++@@ -6,4 +6,4 @@ Terminal=false
++ Exec=ags
++ Icon=@datadir@/gsequencer/icons/jumper.png
++ Name=Advanced Gtk+ Sequencer
++-Categories=AudioVideo;Synthesis;
+++Categories=AudioVideo;Audio;
diff --combined debian/patches/fixed-desktop-file
index 0000000,0000000..74ebde9
new file mode 100644
--- /dev/null
+++ b/debian/patches/fixed-desktop-file
@@@ -1,0 -1,0 +1,34 @@@
++Description: fixes against ags.desktop
++ TODO: Put a short summary on the line above and replace this paragraph
++ with a longer explanation of this change. Complete the meta-information
++ with other relevant fields (see below for details). To make it easier, the
++ information below has been extracted from the changelog. Adjust it or drop
++ it.
++ .
++ ags (0.4.2-61-1) unstable; urgency=low
++ .
++   * Initial release (Closes: #788590)
++Author: JoÃ«l KrÃ¤hemann <jkraehemann at gmail.com>
++Bug-Debian: https://bugs.debian.org/788590
++
++---
++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: <YYYY-MM-DD>
++
++--- ags-0.4.2-61.orig/ags.desktop.in
+++++ ags-0.4.2-61/ags.desktop.in
++@@ -6,4 +6,4 @@ Terminal=false
++ Exec=ags
++ Icon=@datadir@/gsequencer/icons/jumper.png
++ Name=Advanced Gtk+ Sequencer
++-Categories=AudioVideo;Editor;
+++Categories=AudioVideo;Synthesis;
diff --combined debian/patches/fixed-hardening-flag
index 0000000,0000000..47f88bf
new file mode 100644
--- /dev/null
+++ b/debian/patches/fixed-hardening-flag
@@@ -1,0 -1,0 +1,66 @@@
++Description: import debian build flags
++ TODO: Put a short summary on the line above and replace this paragraph
++ with a longer explanation of this change. Complete the meta-information
++ with other relevant fields (see below for details). To make it easier, the
++ information below has been extracted from the changelog. Adjust it or drop
++ it.
++ .
++ ags (0.4.2-61-1) unstable; urgency=low
++ .
++   * Initial release (Closes: #788590)
++Author: JoÃ«l KrÃ¤hemann <jkraehemann at gmail.com>
++Bug-Debian: https://bugs.debian.org/788590
++
++---
++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: <YYYY-MM-DD>
++
++--- ags-0.4.2-61.orig/Makefile.am
+++++ ags-0.4.2-61/Makefile.am
++@@ -4,8 +4,9 @@ AUTOMAKE_OPTIONS = foreign
++ AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\"
++ 
++ # what flags you want to pass to the C compiler & linker
++-CFLAGS = 
++-LDFLAGS = 
+++CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+++CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+++LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
++ 
++ # this lists the binaries to produce, the (non-PHONY, binary) targets in
++ # the previous manual Makefile
++--- ags-0.4.2-61.orig/Makefile.in
+++++ ags-0.4.2-61/Makefile.in
++@@ -461,11 +461,11 @@ CAIRO_CFLAGS = @CAIRO_CFLAGS@
++ CAIRO_LIBS = @CAIRO_LIBS@
++ CC = @CC@
++ CCDEPMODE = @CCDEPMODE@
+++CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+++CPP = @CPP@
++ 
++ # what flags you want to pass to the C compiler & linker
++-CFLAGS = 
++-CPP = @CPP@
++-CPPFLAGS = @CPPFLAGS@
+++CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
++ CYGPATH_W = @CYGPATH_W@
++ DEFS = @DEFS@
++ DEPDIR = @DEPDIR@
++@@ -486,7 +486,7 @@ INSTALL_DATA = @INSTALL_DATA@
++ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++ INSTALL_SCRIPT = @INSTALL_SCRIPT@
++ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++-LDFLAGS = 
+++LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
++ LIBAO_CFLAGS = @LIBAO_CFLAGS@
++ LIBAO_LIBS = @LIBAO_LIBS@
++ LIBASOUND2_CFLAGS = @LIBASOUND2_CFLAGS@
diff --combined debian/patches/series
index 0000000,0000000..f4fb0d4
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,3 @@@
++fixed-desktop-file
++fixed-category
++fixed-hardening-flag

-- 
gsequencer packaging

