[SCM] gsequencer/master: fixed split package
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Sat Aug 20 01:08:15 UTC 2016
The following commit has been merged in the master branch:
commit c8c43ca2980ba753d7e7d7997f1b4b1cc1fcf956
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date: Sat Aug 20 02:07:09 2016 +0200
fixed split package
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
index 4baccb8..6857a8d 100644
--- a/.pc/.quilt_patches
+++ b/.pc/.quilt_patches
@@ -1 +1 @@
-patches
+debian/patches
diff --git a/.pc/applied-patches b/.pc/applied-patches
index 8a11f75..1e0ac80 100644
--- a/.pc/applied-patches
+++ b/.pc/applied-patches
@@ -1 +1 @@
-fixed-destination-directories.diff
+fixed-documentation-targets.patch
diff --git a/NEWS b/.pc/fixed-documentation-targets.patch/.timestamp
similarity index 100%
copy from NEWS
copy to .pc/fixed-documentation-targets.patch/.timestamp
diff --git a/.pc/fixed-destination-directories.diff/Makefile.am b/.pc/fixed-documentation-targets.patch/Makefile.am
similarity index 100%
rename from .pc/fixed-destination-directories.diff/Makefile.am
rename to .pc/fixed-documentation-targets.patch/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index c3a4b96..ce0ce2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1476,18 +1476,15 @@ install-html: html
cp html/developer-docs/* $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x/html/
install-ags-docs: ags-docs
- mkdir -p $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x-doc/ags
- cp docs/reference/ags/* $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x-doc/ags/
- ln -s $(DESTDIR)/$(datadir)libgsequencer-0.7.x-doc/ags ../../gtk-doc/html/ags
+ mkdir -p $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x-doc/ags/
+ cp -rv docs/reference/ags/* $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x-doc/ags/
+ ln -s $(DESTDIR)/$(datadir)/gtk-doc/html/ags ../../doc/libgsequencer-0.7.x-doc/ags/
uninstall-hook:
rm -rf $(DESTDIR)/$(datadir)/gsequencer
rm -rf $(DESTDIR)/$(datadir)/doc/gsequencer
rm -rf $(DESTDIR)/$(datadir)/xml/gsequencer
rm -f $(DESTDIR)/$(datadir)/doc-base/gsequencer-documentation
- rm -rf $(DESTDIR)/$(datadir)/libgsequencer-0.7.x
- rm -rf $(DESTDIR)/$(datadir)/libgsequencer-0.7.x-doc
- rm -f $(DESTDIR)/$(datadir)/../../gtk-doc/html/ags
clean-local:
rm -rf html
diff --git a/debian/patches/fixed-destination-directories.diff b/debian/patches/fixed-destination-directories.diff
deleted file mode 100644
index cf256d7..0000000
--- a/debian/patches/fixed-destination-directories.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: <short summary of the patch>
- fixed Makefile.am to have correct destinations of documentation and to include
- API reference build.
- .
- gsequencer (0.7.47-1) UNRELEASED; urgency=medium
- .
- [ Joël Krähemann ]
- * Imported Upstream version 0.7.47
-Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
-
----
-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: 2016-08-19
-
---- gsequencer-0.7.47.orig/Makefile.am
-+++ gsequencer-0.7.47/Makefile.am
-@@ -46,7 +46,7 @@ EXTRA_DIST += docs/reference/ags
- otherincludedir = $(includedir)/ags
- nobase_include_HEADERS = $(libags_1_0_la_HEADERS_0) $(libags_thread_1_0_la_HEADERS_0) $(libags_server_0_7_la_HEADERS_0) $(libags_audio_1_0_la_HEADERS_0) $(libags_gui_0_7_la_HEADERS_0) $(libgsequencer_0_7_la_HEADERS_0)
-
--docdir = $(datadir)/docs/gsequencer
-+docdir = $(datadir)/doc/gsequencer
- doc_DATA = README ags_example.xml
-
- # documentation
-@@ -1471,15 +1471,23 @@ install-html: html
- mkdir -p $(DESTDIR)/$(datadir)/doc/gsequencer/{images,html}/
- mkdir -p $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x/{images,html}/
- cp $(userdocimages) $(DESTDIR)/$(datadir)/doc/gsequencer/images/
-- cp $(userdocimages) $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x/images/
-+ cp $(devdocimages) $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x/images/
- cp html/user-docs/* $(DESTDIR)/$(datadir)/doc/gsequencer/html/
- cp html/developer-docs/* $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x/html/
-
-+install-ags-docs: ags-docs
-+ mkdir -p $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x-doc/ags
-+ cp docs/reference/ags/* $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x-doc/ags/
-+ ln -s $(DESTDIR)/$(datadir)libgsequencer-0.7.x-doc/ags $(DESTDIR)/$(datadir)/../../gtk-doc/html/ags
-+
- uninstall-hook:
- rm -rf $(DESTDIR)/$(datadir)/gsequencer
- rm -rf $(DESTDIR)/$(datadir)/doc/gsequencer
- rm -rf $(DESTDIR)/$(datadir)/xml/gsequencer
- rm -f $(DESTDIR)/$(datadir)/doc-base/gsequencer-documentation
-+ rm -rf $(DESTDIR)/$(datadir)/libgsequencer-0.7.x
-+ rm -rf $(DESTDIR)/$(datadir)/libgsequencer-0.7.x-doc
-+ rm -f $(DESTDIR)/$(datadir)/../../gtk-doc/html/ags
-
- clean-local:
- rm -rf html
diff --git a/debian/patches/fixed-documentation-targets.patch b/debian/patches/fixed-documentation-targets.patch
new file mode 100644
index 0000000..e544f8b
--- /dev/null
+++ b/debian/patches/fixed-documentation-targets.patch
@@ -0,0 +1,28 @@
+fixed documentation targets in Makefile.am and included API reference build.--- a/Makefile.am
++++ b/Makefile.am
+@@ -46,7 +46,7 @@
+ otherincludedir = $(includedir)/ags
+ nobase_include_HEADERS = $(libags_1_0_la_HEADERS_0) $(libags_thread_1_0_la_HEADERS_0) $(libags_server_0_7_la_HEADERS_0) $(libags_audio_1_0_la_HEADERS_0) $(libags_gui_0_7_la_HEADERS_0) $(libgsequencer_0_7_la_HEADERS_0)
+
+-docdir = $(datadir)/docs/gsequencer
++docdir = $(datadir)/doc/gsequencer
+ doc_DATA = README ags_example.xml
+
+ # documentation
+@@ -1471,10 +1471,15 @@
+ mkdir -p $(DESTDIR)/$(datadir)/doc/gsequencer/{images,html}/
+ mkdir -p $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x/{images,html}/
+ cp $(userdocimages) $(DESTDIR)/$(datadir)/doc/gsequencer/images/
+- cp $(userdocimages) $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x/images/
++ cp $(devdocimages) $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x/images/
+ cp html/user-docs/* $(DESTDIR)/$(datadir)/doc/gsequencer/html/
+ cp html/developer-docs/* $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x/html/
+
++install-ags-docs: ags-docs
++ mkdir -p $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x-doc/ags/
++ cp -rv docs/reference/ags/* $(DESTDIR)/$(datadir)/doc/libgsequencer-0.7.x-doc/ags/
++ ln -s $(DESTDIR)/$(datadir)/gtk-doc/html/ags ../../doc/libgsequencer-0.7.x-doc/ags/
++
+ uninstall-hook:
+ rm -rf $(DESTDIR)/$(datadir)/gsequencer
+ rm -rf $(DESTDIR)/$(datadir)/doc/gsequencer
diff --git a/debian/patches/series b/debian/patches/series
index 8a11f75..1e0ac80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fixed-destination-directories.diff
+fixed-documentation-targets.patch
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list