[SCM] gsequencer/master: removed patches since applied upstream
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Tue Jun 13 12:52:53 UTC 2017
The following commit has been merged in the master branch:
commit 5565c6f8ffbcd3a5571a0b8038cd96939dbf78fc
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date: Tue Jun 13 14:47:13 2017 +0200
removed patches since applied upstream
diff --git a/debian/patches/fix-gtk-doc.patch b/debian/patches/fix-gtk-doc.patch
deleted file mode 100644
index 7e828c0..0000000
--- a/debian/patches/fix-gtk-doc.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Description: remove ags-docs make target
- Use install-html target to install ags-docs in order to avoid
- problems as doing recursive make.
-Author: Joël Krähemann
-Origin: upstream
-Applied-Upstream: http://git.savannah.nongnu.org/cgit/gsequencer.git/commit/?h=0.8.x&id=1d3bb6b365306ddc8b8ef51c685e0d03beaff333
-Last-Update: 2017-06-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1649,16 +1649,6 @@
- ags-integration-test:
- $(MAKE) -C $(top_srcdir) -f functional-system-tests.mk ags-check-system
-
--ags-docs-local:
-- $(MAKE) -C $(top_srcdir)/docs/reference/libags
-- cd $(top_srcdir)
-- $(MAKE) -C $(top_srcdir)/docs/reference/libags-audio
-- cd $(top_srcdir)
-- $(MAKE) -C $(top_srcdir)/docs/reference/libags-gui
-- cd $(top_srcdir)
-- $(MAKE) -C $(top_srcdir)/docs/reference/libgsequencer
-- cd $(top_srcdir)
--
- libtool: $(LIBTOOL_DEPS)
- $(SHELL) ./config.status libtool
-
-@@ -1676,6 +1666,14 @@
- mkdir -p $(top_builddir)/html/{developer-docs,user-docs}
- xsltproc --output $(top_builddir)/html/user-docs/ --xinclude /usr/share/xml/docbook/stylesheet/docbook-xsl/htmlhelp/htmlhelp.xsl $(top_srcdir)/docs/usersBook.xml
- xsltproc --output $(top_builddir)/html/developer-docs/ --xinclude /usr/share/xml/docbook/stylesheet/docbook-xsl/htmlhelp/htmlhelp.xsl $(top_srcdir)/docs/developersBook.xml
-+ $(MAKE) -C $(top_srcdir)/docs/reference/libags
-+ cd $(top_srcdir)
-+ $(MAKE) -C $(top_srcdir)/docs/reference/libags-audio
-+ cd $(top_srcdir)
-+ $(MAKE) -C $(top_srcdir)/docs/reference/libags-gui
-+ cd $(top_srcdir)
-+ $(MAKE) -C $(top_srcdir)/docs/reference/libgsequencer
-+ cd $(top_srcdir)
-
- install-data-local:
- mkdir -p $(DESTDIR)/$(datadir)/doc-base
-@@ -1703,25 +1701,19 @@
- install -c -p -m 644 $(devdocimages) $(DESTDIR)/$(datadir)/doc/libags-audio-doc/images/
- install -c -p -m 644 $(top_builddir)/html/user-docs/* $(DESTDIR)/$(datadir)/doc/gsequencer/html/
- install -c -p -m 644 $(top_builddir)/html/developer-docs/* $(DESTDIR)/$(datadir)/doc/libags-audio-doc/html/
--
--install-ags-docs: ags-docs
- mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html
- mkdir -p $(DESTDIR)/$(datadir)/doc/libags-doc/api
- mkdir -p $(DESTDIR)/$(datadir)/doc/libags-audio-doc/api
- mkdir -p $(DESTDIR)/$(datadir)/doc/libags-gui-doc/api
- mkdir -p $(DESTDIR)/$(datadir)/doc/libgsequencer-doc/api
-- mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html/libags
-- mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html/libags_audio
-- mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html/libags_gui
-- mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html/libgsequencer-doc/api
-- install -c -p -m 644 $(top_srcdir)/docs/reference/libags/html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libags
-- install -c -p -m 644 $(top_srcdir)/docs/reference/libags-audio/html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libags_audio
-- install -c -p -m 644 $(top_srcdir)/docs/reference/libags-gui/html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libags_gui
-- install -c -p -m 644 $(top_srcdir)/docs/reference/libgsequencer/html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libgsequencer
- ln -s ../../gtk-doc/html/libags $(DESTDIR)/$(datadir)/doc/libags-doc/api
- ln -s ../../gtk-doc/html/libags_audio $(DESTDIR)/$(datadir)/doc/libags-audio-doc/api
- ln -s ../../gtk-doc/html/libags_gui $(DESTDIR)/$(datadir)/doc/libags-gui-doc/api
- ln -s ../../gtk-doc/html/libgsequencer $(DESTDIR)/$(datadir)/doc/libgsequencer-doc/api
-+ install -c -p -m 644 $(top_srcdir)/docs/reference/libags/html/* $(DESTDIR)/$(datadir)/doc/libags-doc/api
-+ install -c -p -m 644 $(top_srcdir)/docs/reference/libags-audio/html/* $(DESTDIR)/$(datadir)/doc/libags-audio-doc/api
-+ install -c -p -m 644 $(top_srcdir)/docs/reference/libags-gui/html/* $(DESTDIR)/$(datadir)/doc/libags-gui-doc/api
-+ install -c -p -m 644 $(top_srcdir)/docs/reference/libgsequencer/html/* $(DESTDIR)/$(datadir)/doc/libgsequencer-doc/api
-
- uninstall-hook:
- rm -rf $(DESTDIR)/$(datadir)/gsequencer
diff --git a/debian/patches/fix-lang.patch b/debian/patches/fix-lang.patch
deleted file mode 100644
index 5f14315..0000000
--- a/debian/patches/fix-lang.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: fix LC_ALL environment variable
- LC_CTYPE=C was not sufficient in order to keep ags_turtle.c working.
- Those the change was reverted.
-Author: Joël Krähemann
-Origin: upstream
-Applied-Upstream: http://git.savannah.nongnu.org/cgit/gsequencer.git/commit/?h=0.8.x&id=87ae9c30c913becfc7537bba5bef385bcf72eee1
-Last-Update: 2017-06-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/ags/gsequencer_main.c
-+++ b/ags/gsequencer_main.c
-@@ -1256,7 +1256,7 @@
- bindtextdomain(PACKAGE, LOCALEDIR);
- textdomain(PACKAGE);
-
-- putenv("LC_CTYPE=C");
-+ putenv("LANG=C");
-
- single_thread_enabled = FALSE;
- builtin_theme_disabled = FALSE;
diff --git a/debian/patches/fix-libags-audio-doc.patch b/debian/patches/fix-libags-audio-doc.patch
deleted file mode 100644
index 6fc5ab3..0000000
--- a/debian/patches/fix-libags-audio-doc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix missing ags_stream_get_type()
- The header ags_stream.h was removed since it is useless.
-Author: Joël Krähemann
-Origin: upstream
-Applied-Upstream: http://git.savannah.nongnu.org/cgit/gsequencer.git/commit/?h=0.8.x&id=7fbbb0daeab1f26089477ceb4dbdcd152b7bbd62
-Last-Update: 2017-06-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/docs/reference/libags-audio/libags_audio.types
-+++ b/docs/reference/libags-audio/libags_audio.types
-@@ -194,7 +194,6 @@
- ags_stream_audio_signal_get_type
- ags_stream_channel_get_type
- ags_stream_channel_run_get_type
--ags_stream_get_type
- ags_stream_recycling_get_type
- ags_switch_buffer_flag_get_type
- ags_synth_generator_get_type
diff --git a/debian/patches/fix-stream-h.patch b/debian/patches/fix-stream-h.patch
deleted file mode 100644
index 34120ac..0000000
--- a/debian/patches/fix-stream-h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix header
- The header file libags-audio.h contained a removed file.
-Author: Joël Krähemann
-Origin: upstream
-Applied-Upstream: http://git.savannah.nongnu.org/cgit/gsequencer.git/commit/?h=0.8.x&id=bc386b021e7a06a3eb49a5d2062a9d4ee11b8ee7
-Last-Update: 2017-06-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/ags/libags-audio.h
-+++ b/ags/libags-audio.h
-@@ -188,7 +188,6 @@
- #include <ags/audio/recall/ags_stream_audio_signal.h>
- #include <ags/audio/recall/ags_stream_channel.h>
- #include <ags/audio/recall/ags_stream_channel_run.h>
--#include <ags/audio/recall/ags_stream.h>
- #include <ags/audio/recall/ags_stream_recycling.h>
- #include <ags/audio/recall/ags_volume_audio_signal.h>
- #include <ags/audio/recall/ags_volume_channel.h>
diff --git a/debian/patches/series b/debian/patches/series
index e86c8a8..2e8c595 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
disable-functional-tests.patch
-fix-gtk-doc.patch
-fix-libags-audio-doc.patch
-fix-lang.patch
-fix-stream-h.patch
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list