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

Mirco Bauer meebey at meebey.net
Sat Jun 13 00:30:16 UTC 2009 

The following commit has been merged in the master branch:
commit b782342fcf964fd1633293b9e15d765988a67491
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 13 02:18:39 2009 +0200

      * The "Squeeze it!" release
        + The installed package size was shrinked from 13MB to 8MB.
      * debian/rules
        debian/control
        debian/compat:
        + Rewrote for dh7 (automatically uses dh_clistrip).
      * debian/paches/*
        debian/control:
        + Switched to quilt.
      * debian/rules:
        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.
        + Removed --with-mono-addins parameter from configure call, as the
          parameter no longer exist.

diff --git a/debian/changelog b/debian/changelog
index 194de2c..ba1e233 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,28 @@
 tomboy (0.14.2-2) UNRELEASED; urgency=low
 
+  [ Mirco Bauer ]
+  * The "Squeeze it!" release
+    + The installed package size was shrinked from 13MB to 8MB.
+  * debian/rules
+    debian/control
+    debian/compat:
+    + Rewrote for dh7 (automatically uses dh_clistrip).
+  * debian/paches/*
+    debian/control:
+    + Switched to quilt.
+  * debian/rules:
+    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.
+    + Removed --with-mono-addins parameter from configure call, as the
+      parameter no longer exist.
+
+  [ Iain Lane ]
   * debian/control: Update VCS info to point to git repo
 
- -- Iain Lane <laney at ubuntu.com>  Thu, 28 May 2009 01:06:20 +0100
+ -- Mirco Bauer <meebey at debian.org>  Sat, 13 Jun 2009 02:10:01 +0200
 
 tomboy (0.14.2-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 0e6121e..a3d9095 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: gnome
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>
-Build-Depends: cdbs, 
-               debhelper (>= 5),
+Build-Depends: debhelper (>= 7.0.50)
                autotools-dev,
+               pngquant,
                mono-devel (>= 2.0),
                libgtk2.0-cil (>= 2.10.4-2),
                libgconf2.0-cil,
diff --git a/ltmain.sh b/debian/ltmain-as-needed.sh
similarity index 99%
copy from ltmain.sh
copy to debian/ltmain-as-needed.sh
index b36c4ad..a834070 100755
--- a/ltmain.sh
+++ b/debian/ltmain-as-needed.sh
@@ -4716,6 +4716,11 @@ func_mode_link ()
 	arg=$func_stripname_result
 	;;
 
+      -Wl,--as-needed)
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
       -Wl,*)
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
@@ -5067,6 +5072,15 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
+	-Wl,--as-needed)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	  fi
+	  continue
+	  ;;
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
diff --git a/debian/patches/01_dllmaps.patch b/debian/patches/01_dllmaps.patch
index d6a8a20..3992041 100644
--- a/debian/patches/01_dllmaps.patch
+++ b/debian/patches/01_dllmaps.patch
@@ -1,5 +1,5 @@
---- Tomboy/Tomboy.exe.config.in.old	2008-02-29 08:26:11.000000000 +0100
-+++ Tomboy/Tomboy.exe.config.in	2008-02-29 08:26:18.000000000 +0100
+--- git.orig/Tomboy/Tomboy.exe.config.in
++++ git/Tomboy/Tomboy.exe.config.in
 @@ -2,6 +2,6 @@
    <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
    <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>	
diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/patches/99_ltmain_as-needed.patch
deleted file mode 100644
index 7a8a274..0000000
--- a/debian/patches/99_ltmain_as-needed.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- ltmain.sh.old	2007-10-09 07:38:25.000000000 +0200
-+++ ltmain.sh	2007-10-09 07:39:25.000000000 +0200
-@@ -1794,6 +1794,11 @@
- 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
- 	;;
- 
-+      -Wl,--as-needed)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       -Wl,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- 	arg=
-@@ -2137,6 +2142,15 @@
- 	lib=
- 	found=no
- 	case $deplib in
-+	-Wl,--as-needed)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	  fi
-+	  continue
-+	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b0814fc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_dllmaps.patch
diff --git a/debian/rules b/debian/rules
index 2ab360d..4fa421f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,14 @@
 #!/usr/bin/make -f
 
-export MONO_SHARED_DIR=$(CURDIR)
+include /usr/share/quilt/quilt.make
+include /usr/share/cli-common/cli.make
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/gnome.mk
+DH_VERBOSE := 1
+DH_OPTIONS += --with=quilt
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+export DH_VERBOSE
+export DH_OPTIONS
 
 MAKEFILE = $(firstword $(MAKEFILE_LIST))
 DEBIAN_DIR = $(dir $(MAKEFILE))
@@ -12,15 +16,22 @@ DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^
 DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)   
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
-LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
-DEB_INSTALL_DOCS_ALL := README NEWS
-DEB_CONFIGURE_EXTRA_FLAGS += --with-mono-addins=system GMCS=/usr/bin/csc
+autoreconf: autoreconf-stamp
+autoreconf-stamp:
+	cp /usr/share/gnome-doc-utils/gnome-doc-utils.make $(CURDIR)
+	autoreconf -f -i -s
+	# replace ltmain.sh with our patched one that supports --as-needed
+	install --mode=755 $(CURDIR)/debian/ltmain-as-needed.sh $(CURDIR)/ltmain.sh
+	touch $@
 
-common-configure-indep::
-	mkdir -p $(MONO_SHARED_DIR)/.wapi
+override_dh_auto_configure: autoreconf-stamp
+	dh_auto_configure -- \
+		--disable-scrollkeeper \
+		LDFLAGS="$(LDFLAGS)" \
+		GMCS=/usr/bin/csc
 
-install/tomboy::
+override_dh_auto_install:
+	dh_auto_install
 	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
@@ -28,13 +39,16 @@ install/tomboy::
 	cp debian/PrintNotes.dll.config debian/tomboy/usr/lib/tomboy/addins
 	rm -rf debian/tomboy/usr/lib/tomboy/libprintnotes.la
 	rm -rf debian/tomboy/usr/lib/tomboy/libtomboy.la
+	# crush it good
+	find $(CURDIR)/debian/tomboy/usr/share/gnome/help/tomboy -type f -name "*.png" -exec sh -c 'pngquant 256 < {} > {}.crushed; mv {}.crushed {}' \;
 
-common-binary-predeb-arch::
-	dh_clifixperms
-	dh_clideps -d
+override_dh_clean:
+	dh_clean
+	rm -rf autoreconf-stamp configure config.sub config.guess ltmain.sh gnome-doc-utils.make aclocal.m4 autom4te.cache/
+	find . -name "Makefile.in" -delete
 
-clean::
-	rm -rf $(MONO_SHARED_DIR)/.wapi
+# disable tests
+override_dh_auto_test:
 
 get-orig-source:
 	uscan \
@@ -46,3 +60,8 @@ get-orig-source:
 		--force-download \
 		--rename \
 		--repack
+
+%:
+	dh $@
+
+.PHONY: autoreconf get-orig-source
diff --git a/debian/tomboy.docs b/debian/tomboy.docs
new file mode 100644
index 0000000..9eafbe1
--- /dev/null
+++ b/debian/tomboy.docs
@@ -0,0 +1,2 @@
+README
+NEWS

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

More information about the Pkg-cli-apps-commits mailing list