[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master, updated. 06c53ea95e6009786238e7a124c6dcd531664745

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 06c53ea95e6009786238e7a124c6dcd531664745
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 13 13:27:37 2009 +0200

    - Pass GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 to "make install"
    - Clearified why updated gnome-doc-utils.make is nedded in the changelog

diff --git a/debian/changelog b/debian/changelog
index 3d43b65..a67093f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ tomboy (0.14.2-2) unstable; urgency=low
     debian/control:
     + Use pngquant to optimize the file size of the PNG files.
   * debian/rules:
-    + autoreconf, update gnome-doc-utils.make and put patched ltmain.sh in
-      place for --as-needed magic before build.
+    + autoreconf, update gnome-doc-utils.make (for symlinking the same
+      picture files) and put patched ltmain.sh in place for --as-needed
+      magic before build.
     + Removed --with-mono-addins parameter from configure call, as the
       parameter no longer exist.
 
diff --git a/debian/rules b/debian/rules
index 4fa421f..ddb2294 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ override_dh_auto_configure: autoreconf-stamp
 		GMCS=/usr/bin/csc
 
 override_dh_auto_install:
-	dh_auto_install
+	dh_auto_install -- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 	mkdir -p debian/tomboy/usr/share/pixmaps
 	uudecode debian/tomboy-16.xpm.uu && mv tomboy-16.xpm debian/tomboy/usr/share/pixmaps
 	uudecode debian/tomboy-32.xpm.uu && mv tomboy-32.xpm debian/tomboy/usr/share/pixmaps

-- 
Tomboy - desktop note taking program using Wiki style links