[SCM] gsequencer/master: removed patch since applied upstream

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Tue Dec 12 09:54:36 UTC 2017


The following commit has been merged in the master branch:
commit 14b05cbf7ce4f91353b882111a0025d59194b530
Author: Joël Krähemann <jkraehemann at gmail.com>
Date:   Tue Dec 12 10:53:46 2017 +0100

    removed patch since applied upstream

diff --git a/debian/patches/fix-doc-dir.patch b/debian/patches/fix-doc-dir.patch
deleted file mode 100644
index 777e02f..0000000
--- a/debian/patches/fix-doc-dir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: fix doc dir in Makefile.am
- In Makefile.am the docdir uses datadir prefix which is wrong.
-Author: Joël Krähemann
-Origin: upstream
-Last-Update: 2017-12-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1924,8 +1924,8 @@
- 	install -c -p -m 644 $(top_srcdir)/ags/file/ags_file.dtd $(DESTDIR)/$(datadir)/xml/gsequencer/schema/dtd/$(PACKAGE_VERSION)/
- 	install -c -p -m 644 $(top_srcdir)/ags.xsl $(DESTDIR)/$(datadir)/xml/gsequencer/stylesheet/ags-xsl/midi-xml/
- 	install -c -p -m 644 $(top_srcdir)/ags-simple.xsl $(DESTDIR)/$(datadir)/xml/gsequencer/stylesheet/ags-xsl/midi-xml/
--	mkdir -p $(DESTDIR)/$(datadir)/$(docdir)/
--	gzip -9 -c $(top_srcdir)/ChangeLog > $(DESTDIR)/$(datadir)/$(docdir)/changelog.gz
-+	mkdir -p $(DESTDIR)/$(docdir)/
-+	gzip -9 -c $(top_srcdir)/ChangeLog > $(DESTDIR)/$(docdir)/changelog.gz
- 
- fix-local-html: html
- 	find $(top_srcdir)/docs/reference/libags/libags-html -name "*.html" -type f -exec sed -i 's/\.\.\/gobject/\/usr\/share\/doc\/libglib2.0-doc\/gobject/g' {} \;
-@@ -1956,11 +1956,11 @@
- 	find $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html -name "*.html" -type f -exec sed -i 's/\.\.\/libags-gui-html/\.\.\/libags-gui/g' {} \;
- 
- install-html: fix-local-html 
--	mkdir -p $(DESTDIR)/$(datadir)/$(docdir)/{images,html}/
-+	mkdir -p $(DESTDIR)/$(docdir)/{images,html}/
- 	mkdir -p $(DESTDIR)/$(datadir)/doc/libags-audio-doc/{images,html}/
--	install -c -p -m 644 $(userdocimages) $(DESTDIR)/$(datadir)/$(docdir)/images/
-+	install -c -p -m 644 $(userdocimages) $(DESTDIR)/$(docdir)/images/
- 	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)/$(docdir)/html/
-+	install -c -p -m 644 $(top_builddir)/html/user-docs/* $(DESTDIR)/$(docdir)/html/
- 	install -c -p -m 644 $(top_builddir)/html/developer-docs/* $(DESTDIR)/$(datadir)/doc/libags-audio-doc/html/
- 	mkdir -p $(DESTDIR)/$(datadir)/gtk-doc/html
- 	mkdir -p $(DESTDIR)/$(datadir)/doc/libags-doc/api
-@@ -1978,7 +1978,7 @@
- 
- uninstall-hook:
- 	rm -rf $(DESTDIR)/$(datadir)/gsequencer
--	rm -rf $(DESTDIR)/$(datadir)/$(docdir)
-+	rm -rf $(DESTDIR)/$(docdir)
- 	rm -rf $(DESTDIR)/$(datadir)/xml/gsequencer
- 	rm -rf $(DESTDIR)/$(datadir)/doc/libags-doc
- 	rm -rf $(DESTDIR)/$(datadir)/doc/libags-audio-doc
diff --git a/debian/patches/series b/debian/patches/series
index 8a6d26a..08dcd94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 disable-functional-tests.patch
 enable-integration-tests.patch
-fix-doc-dir.patch

-- 
gsequencer packaging



More information about the pkg-multimedia-commits mailing list