r13842 - in /desktop/unstable/gtkmm2.4/debian: changelog rules watch

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Thu Dec 13 15:57:18 UTC 2007 

Author: manphiz-guest
Date: Thu Dec 13 15:57:18 2007
New Revision: 13842

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13842
Log:
    Thanks Guus Sliepen.
  + 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.
  + Refine the sed scripts to be more concise and readable. 
* debian/watch
  + Use spaces instead of tabs when indent
  (Thanks Loïc Minier for reviewing and the suggestions.)

Modified:
    desktop/unstable/gtkmm2.4/debian/changelog
    desktop/unstable/gtkmm2.4/debian/rules
    desktop/unstable/gtkmm2.4/debian/watch

Modified: desktop/unstable/gtkmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/changelog?rev=13842&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/changelog (original)
+++ desktop/unstable/gtkmm2.4/debian/changelog Thu Dec 13 15:57:18 2007
@@ -4,6 +4,7 @@
   * debian/control, debian/control.in
     + Add Homepage, Vcs-Browser and Vcs-Svn entries.
     + Bump standard version to 3.7.3. No change required.
+      Thanks Guus Sliepen.
     + Bump cdbs version to >= 0.4.41, reason given below.
   * debian/patches
     + Rename 99_relibtoolize.patch to 70_relibtoolize.patch for consistency,
@@ -18,8 +19,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.
+    + 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.
+    + Refine the sed scripts to be more concise and readable. 
+  * 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>  Thu, 13 Dec 2007 09:22:54 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Thu, 13 Dec 2007 22:58:54 +0800
 
 gtkmm2.4 (1:2.12.1-1) unstable; urgency=low
 

Modified: desktop/unstable/gtkmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/rules?rev=13842&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/rules (original)
+++ desktop/unstable/gtkmm2.4/debian/rules Thu Dec 13 15:57:18 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
@@ -12,36 +10,27 @@
 
 GNOME_MODULE := gtkmm
 
-DEB_COMPRESS_EXCLUDE := \
+DEB_COMPRESS_EXCLUDE += \
 	txt map # Don't compress files in reference
 
-DEB_CONFIGURE_EXTRA_FLAGS := \
+DEB_CONFIGURE_EXTRA_FLAGS += \
 	--enable-static \
 	--disable-examples \
 	--disable-demos
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libgtkmm-2.4-1c2a := -V"libgtkmm-2.4-1c2a (>= 2.12.0)"
+DEB_DH_MAKESHLIBS_ARGS_libgtkmm-2.4-1c2a += -V"libgtkmm-2.4-1c2a (>= 2.12.0)"
 
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
+DEB_INSTALL_CHANGELOGS_ALL += ChangeLog
 
-DEB_INSTALL_DOCS_ALL := \
+DEB_INSTALL_DOCS_ALL += \
 	-XMakefile -XDoxyfile -Xdevhelp -Xdoxygen_tags -Xfragment
 
-DEB_INSTALL_EXAMPLES_libgtkmm-2.4-doc := -X.deps -X.libs -X.o -X.in -X.am
+DEB_INSTALL_EXAMPLES_libgtkmm-2.4-doc += -X.deps -X.libs -X.o -X.in -X.am
 
 binary-post-install/libgtkmm-2.4-doc::
 	# fix external doc paths
-	for file in `find debian/libgtkmm-2.4-doc/usr/share/doc/libgtkmm-2.4-doc/ -name "*.html"`; do \
-		sed 's/\.\.\/\.\.\/glibmm-2\.4\/docs\//\.\.\/libglibmm-2.4-doc\//g' $$file > $$file.fixed; \
-		mv $$file.fixed $$file; \
-	done
-	for file in `find debian/libgtkmm-2.4-doc/usr/share/doc/libgtkmm-2.4-doc/ -name "*.html"`; do \
-		sed 's/\.\.\/\.\.\/\.\.\/examples\//\.\.\/\.\.\/examples\//g' $$file > $$file.fixed; \
-		mv $$file.fixed $$file; \
-	done
-	for file in debian/libgtkmm-2.4-doc/usr/share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp; do \
-		sed 's/\.\.\/\.\.\/\.\.\/doc\/gtkmm-2\.4\/docs\//\.\.\/\.\.\/\.\.\/doc\/libgtkmm-2.4-doc\//g' $$file > $$file.fixed; \
-		mv $$file.fixed $$file; \
-	done
+	sed -i 's#\.\.\/\.\.\/glibmm-2\.4\/docs\/#\.\.\/libglibmm-2.4-doc\/#g' $$(find debian/libgtkmm-2.4-doc/usr/share/doc/libgtkmm-2.4-doc/ -name "*.html")
+	sed -i 's#\.\.\/\.\.\/\.\.\/examples\/#\.\.\/\.\.\/examples\/#g' $$(find debian/libgtkmm-2.4-doc/usr/share/doc/libgtkmm-2.4-doc/ -name "*.html")
+	sed -i 's#\.\.\/\.\.\/\.\.\/doc\/gtkmm-2\.4\/docs\/#\.\.\/\.\.\/\.\.\/doc\/libgtkmm-2.4-doc\/#g' debian/libgtkmm-2.4-doc/usr/share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp

Modified: desktop/unstable/gtkmm2.4/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/watch?rev=13842&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/watch (original)
+++ desktop/unstable/gtkmm2.4/debian/watch Thu Dec 13 15:57:18 2007
@@ -5,4 +5,4 @@
 version=2
 http://download.gnome.org/sources/gtkmm/([\d\.]+)[02468]/ \
         gtkmm-(.*)\.tar\.gz \
-	debian uupdate
+        debian uupdate

More information about the pkg-gnome-commits mailing list