[SCM] gsequencer/master: deleted patches

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Mon May 23 14:03:14 UTC 2016


The following commit has been merged in the master branch:
commit eda3ad6edae3bc14aa672cdfc81249785587e275
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Mon May 23 15:53:53 2016 +0200

    deleted patches

diff --git a/debian/patches/automake-headers.diff b/debian/patches/automake-headers.diff
deleted file mode 100644
index 7eb3ded..0000000
--- a/debian/patches/automake-headers.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gsequencer/Makefile.am
-===================================================================
---- gsequencer.orig/Makefile.am
-+++ gsequencer/Makefile.am
-@@ -39,7 +39,7 @@ CLEANFILES += $(appdata_DATA)
- EXTRA_DIST += docs/reference/ags
- 
- otherincludedir = $(includedir)/ags
--nobase_include_HEADERS = $(libags_la_HEADERS) $(libags_thread_la_HEADERS) $(libags_server_la_HEADERS) $(libags_audio_la_HEADERS) $(libags_gui_la_HEADERS)
-+nobase_include_HEADERS = $(libags_la_HEADERS_0) $(libags_thread_la_HEADERS_0) $(libags_server_la_HEADERS_0) $(libags_audio_la_HEADERS_0) $(libags_gui_la_HEADERS_0)
- 
- docdir = $(datadir)/docs/gsequencer
- doc_DATA = README
-@@ -81,18 +81,18 @@ EXTRA_DIST += $(top_srcdir)/ags/file/ags
- 
- # libraries and gsequencer
- libags_la_SOURCES = $(libags_c_sources) $(libags_util_c_sources) $(libags_object_c_sources) $(libags_file_c_sources) $(libags_file_task_c_sources)
--libags_la_HEADERS = $(libags_h_sources) $(libags_util_h_sources) $(libags_object_h_sources) $(libags_file_h_sources) $(libags_file_task_h_sources)
-+libags_la_HEADERS_0 = $(libags_h_sources) $(libags_util_h_sources) $(libags_object_h_sources) $(libags_file_h_sources) $(libags_file_task_h_sources)
- libags_thread_la_SOURCES = $(libags_thread_c_sources) $(libags_thread_file_c_sources) $(libags_thread_task_c_sources)
--libags_thread_la_HEADERS = $(libags_thread_h_sources) $(libags_thread_file_h_sources) $(libags_thread_task_h_sources)
-+libags_thread_la_HEADERS_0 = $(libags_thread_h_sources) $(libags_thread_file_h_sources) $(libags_thread_task_h_sources)
- libags_server_la_SOURCES = $(libags_server_c_sources)
--libags_server_la_HEADERS = $(libags_server_h_sources)
-+libags_server_la_HEADERS_0 = $(libags_server_h_sources)
- libags_audio_la_SOURCES = $(libags_audio_c_sources) $(libags_audio_thread_c_sources) $(libags_audio_file_c_sources) $(libags_audio_midi_c_sources) $(libags_audio_jack_c_sources) $(libags_audio_task_c_sources) $(libags_audio_task_recall_c_sources) $(libags_audio_recall_c_sources)  $(libags_plugin_c_sources)
--libags_audio_la_HEADERS = $(libags_audio_h_sources) $(libags_audio_thread_h_sources) $(libags_audio_file_h_sources) $(libags_audio_midi_h_sources) $(libags_audio_jack_h_sources) $(libags_audio_task_h_sources) $(libags_audio_task_recall_h_sources) $(libags_audio_recall_h_sources)  $(libags_plugin_h_sources)
-+libags_audio_la_HEADERS_0 = $(libags_audio_h_sources) $(libags_audio_thread_h_sources) $(libags_audio_file_h_sources) $(libags_audio_midi_h_sources) $(libags_audio_jack_h_sources) $(libags_audio_task_h_sources) $(libags_audio_task_recall_h_sources) $(libags_audio_recall_h_sources)  $(libags_plugin_h_sources)
- libags_gui_la_SOURCES = $(libags_gui_c_sources)
--libags_gui_la_HEADERS = $(libags_gui_h_sources)
-+libags_gui_la_HEADERS_0 = $(libags_gui_h_sources)
- libgsequencer_la_SOURCES = $(libgsequencer_c_sources) $(libgsequencer_file_c_sources) $(libgsequencer_thread_c_sources) $(libgsequencer_task_c_sources) $(libgsequencer_import_c_sources) $(libgsequencer_machine_c_sources) $(libgsequencer_editor_c_sources)
--libgsequencer_la_HEADERS = $(libgsequencer_h_sources) $(libgsequencer_file_h_sources) $(libgsequencer_thread_h_sources) $(libgsequencer_task_h_sources) $(libgsequencer_import_h_sources) $(libgsequencer_machine_h_sources) $(libgsequencer_editor_h_sources)
--gsequencer_SOURCES = $(gsequencer_c_sources) $(gsequencerheaders) $(libags_la_HEADERS) $(libags_thread_la_HEADERS) $(libags_server_la_HEADERS) $(libags_audio_la_HEADERS) $(libags_gui_la_HEADERS) $(libgsequencer_la_HEADERS)
-+libgsequencer_la_HEADERS_0 = $(libgsequencer_h_sources) $(libgsequencer_file_h_sources) $(libgsequencer_thread_h_sources) $(libgsequencer_task_h_sources) $(libgsequencer_import_h_sources) $(libgsequencer_machine_h_sources) $(libgsequencer_editor_h_sources)
-+gsequencer_SOURCES = $(gsequencer_c_sources) $(gsequencerheaders) $(libags_la_HEADERS_0) $(libags_thread_la_HEADERS_0) $(libags_server_la_HEADERS_0) $(libags_audio_la_HEADERS_0) $(libags_gui_la_HEADERS_0) $(libgsequencer_la_HEADERS_0)
- 
- # library libags
- libags_la_CFLAGS = $(CFLAGS) $(COMPILER_FLAGS) $(WARN_FLAGS) -O -I./ -I/usr/include $(UUID_CFLAGS) $(LIBAO_CFLAGS) $(LIBASOUND2_CFLAGS) $(LIBXML2_CFLAGS) $(SNDFILE_CFLAGS) $(LIBINSTPATCH_CFLAGS) $(GOBJECT_CFLAGS) $(GIO_CFLAGS)
diff --git a/debian/patches/gtk-doc.diff b/debian/patches/gtk-doc.diff
deleted file mode 100644
index 4273251..0000000
--- a/debian/patches/gtk-doc.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: gsequencer/configure.ac
-===================================================================
---- gsequencer.orig/configure.ac
-+++ gsequencer/configure.ac
-@@ -121,13 +121,6 @@ AC_FUNC_REALLOC
- AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify atexit clock_gettime floor getcwd localeconv mblen mbrlen memchr mempcpy memset munmap nl_langinfo setlocale socket sqrt stpcpy strcasecmp strchr strcspn strdup strstr strtol strtoul])
- 
- # check for gtk-doc
--m4_ifdef([GTK_DOC_CHECK], [
--GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
--],[
--AM_CONDITIONAL([ENABLE_GTK_DOC], false)
--])
--
--AM_EXTRA_RECURSIVE_TARGETS([ags-docs])
--AC_CONFIG_FILES([Makefile docs/reference/ags/Makefile])
-+AC_CONFIG_FILES([Makefile])
- 
- AC_OUTPUT
diff --git a/debian/patches/htmlhelp-path.diff b/debian/patches/htmlhelp-path.diff
deleted file mode 100644
index dbf8388..0000000
--- a/debian/patches/htmlhelp-path.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gsequencer/Makefile.am
-===================================================================
---- gsequencer.orig/Makefile.am
-+++ gsequencer/Makefile.am
-@@ -1388,7 +1388,7 @@ gsequencer.desktop: gsequencer.desktop.i
- 
- html:
- 	mkdir -p html/
--	xsltproc --output html/ --xinclude /usr/share/xml/docbook/stylesheet/docbook-xsl/htmlhelp/htmlhelp.xsl $(top_srcdir)/doc/usersBook.xml
-+	xsltproc --output html/ --xinclude /usr/share/xml/docbook/stylesheet/docbook-xsl/htmlhelp/htmlhelp.xsl $(top_srcdir)/docs/usersBook.xml
- 
- install-data-local:
- 	mkdir -p $(DESTDIR)/$(datadir)/doc-base
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 91281cc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-gtk-doc.diff
-htmlhelp-path.diff
-automake-headers.diff

-- 
gsequencer packaging



More information about the pkg-multimedia-commits mailing list