r13858 - in /desktop/unstable/libglademm2.4/debian: ./ patches/

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Fri Dec 14 12:54:09 UTC 2007 

Author: manphiz-guest
Date: Fri Dec 14 12:54:09 2007
New Revision: 13858

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13858
Log:
  + Suggests -doc in -dev with version for new doc path, and
    don't Suggests -dev in -doc.
* libglademm-2.4-doc.{docs,examples}:
  - Dropped in favor of libglademm-2.4-doc.install.
* libglademm-2.4-doc.install:
  + Add docs installation here.
* Add libglademm-2.4-doc.dirs for '/usr/share/doc/gnomemm-2.6', which
  helps symlink the original path of docs.
* Add libglademm-2.4-doc.links to symlink the original path of docs.
* debian/libglademm-2.4-doc.doc-base.libglademm2.4-reference:
  + Fix path for new doc path.
* debian/patches:
  + Add 10_devhelp_index_path_fix.patch
  + Replace most ':=' with '+=' to avoid overwriting existing values.
  + Install docs with original path hierarchy and drop the sed tricks.
  + Refine exclude rules.
  + Remove useless DEB_INSTALL_CHANGELOGS_ALL.
* debian/watch:
  + Use spaces instead of tabs for indentation.
  (Thanks Loïc Minier for reviewing and the suggestions)

Added:
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.dirs
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.links
    desktop/unstable/libglademm2.4/debian/patches/10_devhelp_index_path_fix.patch
Removed:
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.docs
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.examples
Modified:
    desktop/unstable/libglademm2.4/debian/changelog
    desktop/unstable/libglademm2.4/debian/control
    desktop/unstable/libglademm2.4/debian/control.in
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.doc-base.libglademm2.4-reference
    desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.install
    desktop/unstable/libglademm2.4/debian/rules
    desktop/unstable/libglademm2.4/debian/watch

Modified: desktop/unstable/libglademm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/changelog?rev=13858&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/changelog (original)
+++ desktop/unstable/libglademm2.4/debian/changelog Fri Dec 14 12:54:09 2007
@@ -3,6 +3,19 @@
   * debian/control, debian/control.in:
     + Bump standard version to 3.7.3. No change required.
     + Bump cdbs version to >= 0.4.41, reason given below.
+    + Suggests -doc in -dev with version for new doc path, and
+      don't Suggests -dev in -doc.
+  * libglademm-2.4-doc.{docs,examples}:
+    - Dropped in favor of libglademm-2.4-doc.install.
+  * libglademm-2.4-doc.install:
+    + Add docs installation here.
+  * Add libglademm-2.4-doc.dirs for '/usr/share/doc/gnomemm-2.6', which
+    helps symlink the original path of docs.
+  * Add libglademm-2.4-doc.links to symlink the original path of docs.
+  * debian/libglademm-2.4-doc.doc-base.libglademm2.4-reference:
+    + Fix path for new doc path.
+  * debian/patches:
+    + Add 10_devhelp_index_path_fix.patch
   * debian/rules:
     + Add LDFLAG "-Wl,--as-needed" to reduce unneeded shlibs dependencies.
     + Let examples be compressed.
@@ -11,8 +24,15 @@
       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
       information from .la files. Thanks Loïc Minier and Josselin Mouette.
+    + Replace most ':=' with '+=' to avoid overwriting existing values.
+    + Install docs with original path hierarchy and drop the sed tricks.
+    + Refine exclude rules.
+    + Remove useless DEB_INSTALL_CHANGELOGS_ALL.
+  * debian/watch:
+    + Use spaces instead of tabs for indentation.
+    (Thanks Loïc Minier for reviewing and the suggestions)
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Thu, 13 Dec 2007 09:23:10 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Fri, 14 Dec 2007 20:50:14 +0800
 
 libglademm2.4 (2.6.5-2) unstable; urgency=high
 

Modified: desktop/unstable/libglademm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/control?rev=13858&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/control (original)
+++ desktop/unstable/libglademm2.4/debian/control Fri Dec 14 12:54:09 2007
@@ -21,6 +21,7 @@
          libglademm-2.4-1c2a (= ${binary:Version}),
          libglade2-dev (>> 1:2.4.0),
          libgtkmm-2.4-dev (>= 1:2.6.5-1)
+Suggests: libglademm-2.4-doc
 Description: C++ wrappers for libglade2 (development files)
  Libglade is a library which enables an application to build its graphical
  interface from an XML file (generated by Glade) at runtime. libglademm is
@@ -62,7 +63,7 @@
 Depends: ${misc:Depends},
          doc-base,
          lynx | www-browser
-Suggests: libglibmm-2.4-doc, libgtkmm-2.4-doc, libglademm-2.4-dev
+Suggests: libglibmm-2.4-doc, libgtkmm-2.4-doc
 Conflicts: libglademm-2.4-dev (<< 2.6.5-1)
 Replaces: libglademm-2.4-dev (<< 2.6.5-1)
 Description: C++ wrappers for libglade2 (documentation)

Modified: desktop/unstable/libglademm2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/control.in?rev=13858&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/control.in (original)
+++ desktop/unstable/libglademm2.4/debian/control.in Fri Dec 14 12:54:09 2007
@@ -21,6 +21,7 @@
          libglademm-2.4-1c2a (= ${binary:Version}),
          libglade2-dev (>> 1:2.4.0),
          libgtkmm-2.4-dev (>= 1:2.6.5-1)
+Suggests: libglademm-2.4-doc
 Description: C++ wrappers for libglade2 (development files)
  Libglade is a library which enables an application to build its graphical
  interface from an XML file (generated by Glade) at runtime. libglademm is
@@ -62,7 +63,7 @@
 Depends: ${misc:Depends},
          doc-base,
          lynx | www-browser
-Suggests: libglibmm-2.4-doc, libgtkmm-2.4-doc, libglademm-2.4-dev
+Suggests: libglibmm-2.4-doc, libgtkmm-2.4-doc
 Conflicts: libglademm-2.4-dev (<< 2.6.5-1)
 Replaces: libglademm-2.4-dev (<< 2.6.5-1)
 Description: C++ wrappers for libglade2 (documentation)

Added: desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.dirs?rev=13858&op=file
==============================================================================
--- desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.dirs (added)
+++ desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.dirs Fri Dec 14 12:54:09 2007
@@ -1,0 +1,1 @@
+usr/share/doc/gnomemm-2.6

Modified: desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.doc-base.libglademm2.4-reference
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.doc-base.libglademm2.4-reference?rev=13858&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.doc-base.libglademm2.4-reference (original)
+++ desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.doc-base.libglademm2.4-reference Fri Dec 14 12:54:09 2007
@@ -5,5 +5,5 @@
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/libglademm-2.4-doc/reference/html/index.html
-Files: /usr/share/doc/libglademm-2.4-doc/reference/html/*.html
+Index: /usr/share/doc/libglademm-2.4-doc/docs/reference/html/index.html
+Files: /usr/share/doc/libglademm-2.4-doc/docs/reference/html/*.html

Modified: desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.install?rev=13858&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.install (original)
+++ desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.install Fri Dec 14 12:54:09 2007
@@ -1,1 +1,2 @@
+debian/tmp/usr/share/doc/gnomemm-2.6/libglademm-2.4/* usr/share/doc/libglademm-2.4-doc
 debian/tmp/usr/share/devhelp/* usr/share/devhelp

Added: desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.links?rev=13858&op=file
==============================================================================
--- desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.links (added)
+++ desktop/unstable/libglademm2.4/debian/libglademm-2.4-doc.links Fri Dec 14 12:54:09 2007
@@ -1,0 +1,1 @@
+usr/share/doc/libglademm-2.4-doc usr/share/doc/gnomemm-2.6/libglademm-2.4

Added: desktop/unstable/libglademm2.4/debian/patches/10_devhelp_index_path_fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/patches/10_devhelp_index_path_fix.patch?rev=13858&op=file
==============================================================================
--- desktop/unstable/libglademm2.4/debian/patches/10_devhelp_index_path_fix.patch (added)
+++ desktop/unstable/libglademm2.4/debian/patches/10_devhelp_index_path_fix.patch Fri Dec 14 12:54:09 2007
@@ -1,0 +1,9 @@
+--- docs/reference/libglademm-2.4.devhelp	2007-09-25 23:56:05.000000000 +0800
++++ docs/reference/libglademm-2.4.devhelp.pathfix	2007-12-14 20:21:48.000000000 +0800
+@@ -1,5 +1,5 @@
+ <?xml version="1.0"?>
+-<book xmlns:fo="http://www.w3.org/1999/XSL/Format" title="libglademm 2.4 library Reference Manual" name="libglademm 2.4" link="../../../doc/gnomemm-2.6/libglademm-2.4/docs/reference/html/../../index.html">
++<book xmlns:fo="http://www.w3.org/1999/XSL/Format" title="libglademm 2.4 library Reference Manual" name="libglademm 2.4" link="../../../doc/gnomemm-2.6/libglademm-2.4/docs/reference/html/index.html">
+   <chapters>
+     <sub name="Classes" link="../../../doc/gnomemm-2.6/libglademm-2.4/docs/reference/html/classes.html">
+       <sub name="Glib::Exception" link="../../../doc/gnomemm-2.6/libglademm-2.4/docs/reference/html/classGlib_1_1Exception.html"/>

Modified: desktop/unstable/libglademm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/rules?rev=13858&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/rules (original)
+++ desktop/unstable/libglademm2.4/debian/rules Fri Dec 14 12:54:09 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,34 +12,9 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS += \
+	--enable-static \
 
-DEB_DH_MAKESHLIBS_ARGS_libglademm-2.4-1c2a := -V"libglademm-2.4-1c2a (>= 2.6.0)"
+DEB_DH_ALWAYS_EXCLUDE += Doxyfile:doxygen_tags:fragment:.deps:.libs:.o:.in:.am
 
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
-
-DEB_INSTALL_DOCS_ALL := \
-	-XMakefile -XDoxyfile -Xdevhelp -Xdoxygen_tags -Xfragment
-
-DEB_INSTALL_EXAMPLES_libglademm-2.4-doc := -X.deps -X.libs -X.o -X.in -X.am
-
-binary-post-install/libglademm-2.4-doc::
-	# fix external doc paths
-	for file in debian/libglademm-2.4-doc/usr/share/doc/libglademm-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/\.\.\/\.\.\/\.\.\/\.\.\/\.\.\/glibmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/libglibmm-2\.4-doc\//g' $$file > $$file.fixed; \
-		mv $$file.fixed $$file; \
-	done
-	for file in debian/libglademm-2.4-doc/usr/share/devhelp/books/libglademm-2.4/libglademm-2.4.devhelp; do \
-		sed 's/\.\.\/\.\.\/\.\.\/doc\/gnomemm-2\.6\/libglademm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/doc\/libglademm-2\.4-doc\//g' $$file > $$file.fixed; \
-		mv $$file.fixed $$file; \
-		sed 's/\.\.\/\.\.\/index\.html/index\.html/g' $$file > $$file.fixed; \
-		mv $$file.fixed $$file; \
-	done
-	for file in debian/libglademm-2.4-doc/usr/share/devhelp/books/libglademm-2.4/libglademm-2.4.devhelp; do \
-		sed 's/\.\.\/\.\.\/\.\.\/doc\/gnomemm-2\.6\/libglademm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/doc\/libglademm-2\.4-doc\//g' $$file > $$file.fixed; \
-		mv $$file.fixed $$file; \
-		sed 's/\.\.\/\.\.\/index\.html/index\.html/g' $$file > $$file.fixed; \
-		mv $$file.fixed $$file; \
-	done
+DEB_DH_MAKESHLIBS_ARGS_libglademm-2.4-1c2a += -V"libglademm-2.4-1c2a (>= 2.6.0)"

Modified: desktop/unstable/libglademm2.4/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/watch?rev=13858&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/watch (original)
+++ desktop/unstable/libglademm2.4/debian/watch Fri Dec 14 12:54:09 2007
@@ -4,5 +4,5 @@
 # Site		Directory		Pattern			Version	Script
 version=2
 http://download.gnome.org/sources/libglademm/([\d\.]+)[02468]/ \
-	libglademm-(.*)\.tar\.gz \
-	debian uupdate
+        libglademm-(.*)\.tar\.gz \
+        debian uupdate

More information about the pkg-gnome-commits mailing list