[SCM] gsequencer/master: provide fix-doc-dir.patch since Makefile.am does wrong

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Mon Dec 11 07:28:06 UTC 2017


The following commit has been merged in the master branch:
commit 33b4e99c3455a27726d88dad48b8d59cb8af5613
Author: Joël Krähemann <jkraehemann at gmail.com>
Date:   Mon Dec 11 08:20:24 2017 +0100

    provide fix-doc-dir.patch since Makefile.am does wrong

diff --git a/debian/patches/fix-doc-dir.patch b/debian/patches/fix-doc-dir.patch
new file mode 100644
index 0000000..777e02f
--- /dev/null
+++ b/debian/patches/fix-doc-dir.patch
@@ -0,0 +1,44 @@
+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 08dcd94..8a6d26a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable-functional-tests.patch
 enable-integration-tests.patch
+fix-doc-dir.patch

-- 
gsequencer packaging



More information about the pkg-multimedia-commits mailing list