r14737 - in /desktop/experimental/glibmm2.4/debian: changelog libglibmm-2.4-doc.examples rules

[manphiz-guest at users.alioth.debian.org]

Author: manphiz-guest
Date: Sun Feb 24 15:17:12 2008
New Revision: 14737

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14737
Log:
Revert r14736, as there's no real difference, and examples might be able to disable from build in the future.

Added:
    desktop/experimental/glibmm2.4/debian/libglibmm-2.4-doc.examples
Modified:
    desktop/experimental/glibmm2.4/debian/changelog
    desktop/experimental/glibmm2.4/debian/rules

Modified: desktop/experimental/glibmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/changelog?rev=14737&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/changelog (original)
+++ desktop/experimental/glibmm2.4/debian/changelog Sun Feb 24 15:17:12 2008
@@ -3,10 +3,6 @@
   * Refined debian/rules to set variables SHARD_PKG and DOC_PKG by sed
     from debian/control and use variable SHVER for shlibs version, and
     refine and reformat corresponding rules accordingly.
-  * Remove debian/libglibmm-2.4-doc.examples, as examples are installed by
-    default when `make install`.  Comment out examples exclude rules for
-    now, as they should be useful when glibmm introduces a way to disable
-    examples builds.
 
  -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Tue, 19 Feb 2008 17:58:12 +0800
 

Added: desktop/experimental/glibmm2.4/debian/libglibmm-2.4-doc.examples
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/libglibmm-2.4-doc.examples?rev=14737&op=file
==============================================================================
--- desktop/experimental/glibmm2.4/debian/libglibmm-2.4-doc.examples (added)
+++ desktop/experimental/glibmm2.4/debian/libglibmm-2.4-doc.examples Sun Feb 24 15:17:12 2008
@@ -1,0 +1,1 @@
+examples/*

Modified: desktop/experimental/glibmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glibmm2.4/debian/rules?rev=14737&op=diff
==============================================================================
--- desktop/experimental/glibmm2.4/debian/rules (original)
+++ desktop/experimental/glibmm2.4/debian/rules Sun Feb 24 15:17:12 2008
@@ -12,7 +12,7 @@
 GNOME_MODULE := glibmm
 
 SHARED_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libglibmm-[0-9\.]+-[0-9ca]+)[[:space:]]*$$/\1/p' debian/control | head -n 1)
-#DOC_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libglibmm-[0-9\.]+-doc)[[:space:]]*$$/\1/p' debian/control | head -n 1)
+DOC_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libglibmm-[0-9\.]+-doc)[[:space:]]*$$/\1/p' debian/control | head -n 1)
 SHVER := 2.15.5
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
@@ -20,4 +20,4 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
-#DEB_INSTALL_EXAMPLES_$(DOC_PKG) += -XMakefile -X.deps -X.libs -X.o
+DEB_INSTALL_EXAMPLES_$(DOC_PKG) += -XMakefile -X.deps -X.libs -X.o