r13848 - in /desktop/unstable/glibmm2.4/debian: changelog libglibmm-2.4-doc.doc-base.glibmm2.4-reference libglibmm-2.4-doc.docs libglibmm-2.4-doc.examples libglibmm-2.4-doc.install libglibmm-2.4-doc.links rules watch
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Fri Dec 14 05:29:23 UTC 2007
Author: manphiz-guest
Date: Fri Dec 14 05:29:20 2007
New Revision: 13848
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13848
Log:
Thanks Guus Sliepen.
* Add debian/libglibmm-2.4-doc.links to provide symlink to original doc
path. By doing this, the reference path in external doc packages can
remain intact, so stop doing the sed tricks.
+ Include clean-la.mk from gnome-pkg-tools to remove dependency_libs
+ Drop DEB_AUTO_UPDATE_DEBIAN_CONTROL as cdbs dependency is written by
hand, and avoiding generating debian/control twice by a single clean.
+ Replace most ':=' with '+=' to avoid overwriting existing values.
+ Install docs with original path hierarchy and drop the sed tricks.
+ Refine exclude rules.
* debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference
+ Fix path to the original place.
* debian/watch
+ Use spaces instead of tabs when indent.
(Thanks Loïc Minier for reviewing and the suggestions.)
Added:
desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.install
desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.links
Removed:
desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.docs
desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.examples
Modified:
desktop/unstable/glibmm2.4/debian/changelog
desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference
desktop/unstable/glibmm2.4/debian/rules
desktop/unstable/glibmm2.4/debian/watch
Modified: desktop/unstable/glibmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/changelog?rev=13848&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/changelog (original)
+++ desktop/unstable/glibmm2.4/debian/changelog Fri Dec 14 05:29:20 2007
@@ -2,17 +2,31 @@
* debian/control, debian/control.in:
+ Bump standard version to 3.7.3. No change required.
+ Thanks Guus Sliepen.
+ Bump cdbs version to >= 0.4.41, reason given below.
+ * Add debian/libglibmm-2.4-doc.links to provide symlink to original doc
+ path. By doing this, the reference path in external doc packages can
+ remain intact, so stop doing the sed tricks.
* debian/rules:
+ Add LDFLAGS "-Wl,--as-needed" to reduce unneeded shlibs dependencies.
+ Let examples be compressed.
+ Directly specify LDFLAG instead of using DEB_CONFIGURE_SCRIPT_ENV
which might override existing LDFLAGS settings, which is supported
since cdbs >= 0.4.41, hence bump its dependency. Thanks Loïc Minier.
- + Include clean-la.mk from gnome-pkg-tools to remove dependency_libs
+ + Include clean-la.mk from gnome-pkg-tools to remove dependency_libs
information from .la files. Thanks Loïc Minier and Josselin Mouette.
-
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Mon, 10 Dec 2007 19:15:12 +0800
+ + Drop DEB_AUTO_UPDATE_DEBIAN_CONTROL as cdbs dependency is written by
+ hand, and avoiding generating debian/control twice by a single clean.
+ + Replace most ':=' with '+=' to avoid overwriting existing values.
+ + Install docs with original path hierarchy and drop the sed tricks.
+ + Refine exclude rules.
+ * debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference
+ + Fix path to the original place.
+ * debian/watch
+ + Use spaces instead of tabs when indent.
+ (Thanks Loïc Minier for reviewing and the suggestions.)
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Fri, 14 Dec 2007 13:23:36 +0800
glibmm2.4 (2.14.2-2) unstable; urgency=high
Modified: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference?rev=13848&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference (original)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.doc-base.glibmm2.4-reference Fri Dec 14 05:29:20 2007
@@ -5,5 +5,5 @@
Section: Apps/Programming
Format: HTML
-Index: /usr/share/doc/libglibmm-2.4-doc/reference/html/index.html
-Files: /usr/share/doc/libglibmm-2.4-doc/reference/html/*.html
+Index: /usr/share/doc/libglibmm-2.4-doc/docs/reference/html/index.html
+Files: /usr/share/doc/libglibmm-2.4-doc/docs/reference/html/*.html
Added: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.install?rev=13848&op=file
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.install (added)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.install Fri Dec 14 05:29:20 2007
@@ -1,0 +1,1 @@
+debian/tmp/usr/share/doc/glibmm-2.4 usr/share/doc/libglibmm-2.4-doc
Added: desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.links?rev=13848&op=file
==============================================================================
--- desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.links (added)
+++ desktop/unstable/glibmm2.4/debian/libglibmm-2.4-doc.links Fri Dec 14 05:29:20 2007
@@ -1,0 +1,1 @@
+usr/share/doc/libglibmm-2.4-doc usr/share/doc/glibmm-2.4
Modified: desktop/unstable/glibmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/rules?rev=13848&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/rules (original)
+++ desktop/unstable/glibmm2.4/debian/rules Fri Dec 14 05:29:20 2007
@@ -1,6 +1,4 @@
#!/usr/bin/make -f
-
-DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
@@ -14,21 +12,16 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --enable-static
+
+DEB_DH_ALWAYS_EXCLUDE += \
+ "-XDoxyfile -Xdoxygen_tags -Xfragment -X.in -X.deps -X.libs -X.o -X.am"
DEB_DH_MAKESHLIBS_ARGS_libglibmm-2.4-1c2a := -V"libglibmm-2.4-1c2a (>= 2.14.0)"
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
+DEB_INSTALL_CHANGELOGS_ALL += ChangeLog
-DEB_INSTALL_DOCS_ALL := -XMakefile -XDoxyfile -X.in -Xdoxygen_tags -Xfragment
-
-DEB_INSTALL_EXAMPLES_libglibmm-2.4-doc := -X.deps -X.libs -X.o -X.in -X.am
-
-binary-post-install/libglibmm-2.4-doc::
- # fix external doc paths
- for file in debian/libglibmm-2.4-doc/usr/share/doc/libglibmm-2.4-doc/reference/html/*.html; do \
- sed 's/\.\.\/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \
- mv $$file.fixed $$file; \
- sed 's/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\//g;' $$file > $$file.fixed; \
- mv $$file.fixed $$file; \
- done
+#binary-post-install/libglibmm-2.4-doc::
+# fix external doc paths
+# sed -i 's#\.\.\/\.\.\/\.\.\/\.\.\/gtkmm-2\.4\/docs\/#\.\.\/\.\.\/\.\.\/libgtkmm-2.4-doc\/#g;' debian/libglibmm-2.4-doc/usr/share/doc/libglibmm-2.4-doc/reference/html/*.html
Modified: desktop/unstable/glibmm2.4/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/watch?rev=13848&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/watch (original)
+++ desktop/unstable/glibmm2.4/debian/watch Fri Dec 14 05:29:20 2007
@@ -4,5 +4,5 @@
# Site Directory Pattern Version Script
version=2
http://download.gnome.org/sources/glibmm/([\d\.]+)[02468]/ \
- glibmm-(.*)\.tar\.gz \
- debian uupdate
+ glibmm-(.*)\.tar\.gz \
+ debian uupdate
More information about the pkg-gnome-commits
mailing list