[SCM] Debian packaging for clanlib2 branch, master, updated. 2a66ff5ec11e5e62ca52031768191f6102127888
Andreas Moog
amoog at ubuntu.com
Sun Mar 4 17:15:49 UTC 2012
The following commit has been merged in the master branch:
commit 2a66ff5ec11e5e62ca52031768191f6102127888
Author: Andreas Moog <amoog at ubuntu.com>
Date: Sun Mar 4 18:15:36 2012 +0100
Add a doc-package, build and install documentation in -indep targets
diff --git a/control b/control
index dd6d399..f498a08 100644
--- a/control
+++ b/control
@@ -5,6 +5,7 @@ Uploaders: Andreas Moog <amoog at ubuntu.com>, Fabien Givors <f+debian at chezlefab.ne
Build-Depends:
autotools-dev,
debhelper (>= 9),
+ doxygen,
libasound2-dev [!kfreebsd-any !hurd-any],
libfontconfig1-dev,
libfreetype6-dev,
@@ -27,7 +28,7 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/libclanlib2.git;a=summary
Package: libclanlib-2.3-dbg
Section: debug
Architecture: any
-Depends: libclanlib-2.3-1 (= ${binary:Version})
+Depends: libclanlib-2.3-1 (= ${binary:Version}), ${misc:Depends}
Description: ClanLib game SDK debug symbols
This package contains the debug symbols for the ClanLib game SDK.
.
@@ -36,12 +37,21 @@ Description: ClanLib game SDK debug symbols
Package: libclanlib-2.3-dev
Section: libdevel
Architecture: any
-Depends: libclanlib-2.3-1 (= ${binary:Version})
+Depends: libclanlib-2.3-1 (= ${binary:Version}), ${misc:Depends}
Description: ClanLib game SDK development files
This package contains the development files for the ClanLib game SDK.
.
It is needed to develop and build applications.
+Package: libclanlib-2.3-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: ClanLib game SDK documentation
+ This package contains the documentation for the ClanLib game SDK.
+ .
+ It includes manpages as well as the documentation in html, latex and xml.
+
Package: libclanlib-2.3-1
Section: libs
Architecture: any
diff --git a/libclanlib-2.3-doc.doc-base b/libclanlib-2.3-doc.doc-base
new file mode 100644
index 0000000..ca493b5
--- /dev/null
+++ b/libclanlib-2.3-doc.doc-base
@@ -0,0 +1,10 @@
+Document: libclanlib-2.3
+Title: Debian libclanlib2.3 API
+Author: The ClanLib Team
+Abstract: This manual describes ClanLib 2.2 API
+ and give a lot of examples of how it can be used
+Section: Programming/C++
+
+Format: HTML
+Index: /usr/share/doc/libclanlib-2.3-doc/html/index.html
+Files: /usr/share/doc/libclanlib-2.3-doc/html/*.html
diff --git a/libclanlib-2.3-doc.docs b/libclanlib-2.3-doc.docs
new file mode 100644
index 0000000..46b83ad
--- /dev/null
+++ b/libclanlib-2.3-doc.docs
@@ -0,0 +1,3 @@
+Documentation/Reference/doxyoutput/html
+Documentation/Reference/doxyoutput/xml
+Documentation/Reference/doxyoutput/latex
diff --git a/libclanlib-2.3-doc.manpages b/libclanlib-2.3-doc.manpages
new file mode 100644
index 0000000..37b9727
--- /dev/null
+++ b/libclanlib-2.3-doc.manpages
@@ -0,0 +1 @@
+Documentation/Reference/doxyoutput/man/man3/*
diff --git a/patches/libdir_pkgconfig.patch b/patches/libdir_pkgconfig.patch
new file mode 100644
index 0000000..4d77bf6
--- /dev/null
+++ b/patches/libdir_pkgconfig.patch
@@ -0,0 +1,171 @@
+Description: For multiarch, the value of libdir in the pkg-config file
+ should not be hardcoded. Instead, it should follow the value passed in
+ --libdir to configure.
+Author: Andreas Moog <amoog at ubuntu.com>
+Forwarded: no
+
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanSound.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanSound.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanSound
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanApp.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanApp.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanApp
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanCore.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanCore.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanCore
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanGL1.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanGL1.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanGL1
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanCSSLayout.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanCSSLayout.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanCSSLayout
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanSWRender.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanSWRender.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanSWRender
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanRegExp.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanRegExp.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanRegExp
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanMikMod.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanMikMod.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanMikMod
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanNetwork.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanNetwork.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanNetwork
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanDisplay.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanDisplay.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanDisplay
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanDatabase.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanDatabase.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanDatabase
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanGL.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanGL.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanGL
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanGUI.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanGUI.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanGUI
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanVorbis.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanVorbis.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanVorbis
+--- clanlib2-2.3.5.orig/Setup/pkgconfig/clanSqlite.pc.in
++++ clanlib2-2.3.5/Setup/pkgconfig/clanSqlite.pc.in
+@@ -2,7 +2,7 @@
+
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include/ClanLib- at LT_RELEASE@
+
+ Name: clanSqlite
diff --git a/patches/noreftest b/patches/noreftest
new file mode 100644
index 0000000..e27cae6
--- /dev/null
+++ b/patches/noreftest
@@ -0,0 +1,73 @@
+Description: Disable automatic build of "reftest" html documentation.
+Author: Fabien Givors <f+debian at chezlefab.net>
+Forwarded: not-needed
+
+ * "reftest" documentation need clanlib to be installed in order to be
+ generated.
+ * "doxygen" documentation is generated and shipped with the -doc package.
+ * Upstream developers are aware of the problems fixed by the patch
+
+Index: ClanLib-2.3.5/Documentation/Reference/Makefile.am
+===================================================================
+--- ClanLib-2.3.5.orig/Documentation/Reference/Makefile.am 2009-03-27 11:25:47.000000000 +0100
++++ ClanLib-2.3.5/Documentation/Reference/Makefile.am 2012-03-04 15:31:48.745633384 +0100
+@@ -8,10 +8,10 @@
+ if [ -d doxyoutput ]; then rm -rf doxyoutput; fi
+ if [ -d reftest ]; then rm -rf reftest; fi
+ mkdir doxyoutput;
+- mkdir reftest
++# mkdir reftest
+ doxygen ./clanlib.doxygen
+- make -C ../Utilities/ReferenceDocs
+- ../Utilities/ReferenceDocs/ReferenceDocs
++# make -C ../Utilities/ReferenceDocs
++# ../Utilities/ReferenceDocs/ReferenceDocs
+
+ install-html:
+ $(INSTALL) -d $(DESTDIR)$(HTML_PREFIX)
+@@ -20,11 +20,11 @@
+ $(INSTALL) -d $(DESTDIR)$(HTML_PREFIX)/Reference/html
+ $(INSTALL) -m 0644 $(srcdir)/images/*.png $(DESTDIR)$(HTML_PREFIX)/Reference/images
+
+- find reftest/ -name "*.html" -exec $(INSTALL) -m 0644 {} $(DESTDIR)$(HTML_PREFIX)/Reference/html \;
++# find reftest/ -name "*.html" -exec $(INSTALL) -m 0644 {} $(DESTDIR)$(HTML_PREFIX)/Reference/html \;
+
+ clean-local:
+ rm -rf doxyoutput
+- rm -rf reftest
++# rm -rf reftest
+
+ # EOF #
+
+Index: ClanLib-2.3.5/Documentation/Reference/Makefile.in
+===================================================================
+--- ClanLib-2.3.5.orig/Documentation/Reference/Makefile.in 2012-02-23 12:28:57.000000000 +0100
++++ ClanLib-2.3.5/Documentation/Reference/Makefile.in 2012-03-04 15:31:48.749633384 +0100
+@@ -416,10 +416,10 @@
+ if [ -d doxyoutput ]; then rm -rf doxyoutput; fi
+ if [ -d reftest ]; then rm -rf reftest; fi
+ mkdir doxyoutput;
+- mkdir reftest
++# mkdir reftest
+ doxygen ./clanlib.doxygen
+- make -C ../Utilities/ReferenceDocs
+- ../Utilities/ReferenceDocs/ReferenceDocs
++# make -C ../Utilities/ReferenceDocs
++# ../Utilities/ReferenceDocs/ReferenceDocs
+
+ install-html:
+ $(INSTALL) -d $(DESTDIR)$(HTML_PREFIX)
+@@ -428,11 +428,11 @@
+ $(INSTALL) -d $(DESTDIR)$(HTML_PREFIX)/Reference/html
+ $(INSTALL) -m 0644 $(srcdir)/images/*.png $(DESTDIR)$(HTML_PREFIX)/Reference/images
+
+- find reftest/ -name "*.html" -exec $(INSTALL) -m 0644 {} $(DESTDIR)$(HTML_PREFIX)/Reference/html \;
++# find reftest/ -name "*.html" -exec $(INSTALL) -m 0644 {} $(DESTDIR)$(HTML_PREFIX)/Reference/html \;
+
+ clean-local:
+ rm -rf doxyoutput
+- rm -rf reftest
++# rm -rf reftest
+
+ # EOF #
+
diff --git a/patches/series b/patches/series
new file mode 100644
index 0000000..7b4719e
--- /dev/null
+++ b/patches/series
@@ -0,0 +1,2 @@
+noreftest
+libdir_pkgconfig.patch
diff --git a/rules b/rules
index e5c1598..7ea0cdf 100755
--- a/rules
+++ b/rules
@@ -7,13 +7,22 @@
# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
%:
- dh $@ --parallel
+ dh $@ --parallel --with autotools_dev
+
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-docs
override_dh_makeshlibs:
dh_makeshlibs -- -c0
override_dh_strip:
dh_strip --dbg-package=libclanlib-2.3-dbg
+
+override_dh_auto_build-indep:
+ $(MAKE) html
+
+override_dh_auto_install-indep:
+ $(MAKE) install-html DESTDIR=$(CURDIR)/debian/tmp
--
Debian packaging for clanlib2
More information about the Pkg-games-commits
mailing list