[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master-devel, updated. debian/0.14.2-2-16-gd21c393
Iain Lane
laney at ubuntu.com
Sun Jun 14 15:53:24 UTC 2009
The following commit has been merged in the master-devel branch:
commit cb80a763ddfac1fdea39d55509a623005e1ebb9a
Merge: 38ea240d6b9ac2714841c2a052c83e2fcd7cb86e c75fc45d65aa5eccee5953e423b6f598d3bd35c3
Author: Iain Lane <laney at ubuntu.com>
Date: Sun Jun 14 16:37:28 2009 +0100
Merge branch 'master' into master-devel
Conflicts:
debian/changelog
debian/rules
diff --combined debian/changelog
index 9c474a0,75b7a9a..6260dad
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,47 -1,40 +1,84 @@@
+tomboy (0.15.1-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - New WebSync add-in syncs to any server that implements the Tomboy Web REST API,
+ such as Snowy [http://live.gnome.org/Snowy]. Baby-eating preview release.
+ - Require Mono 1.9.1 to *build* Tomboy. Should still run on older Mono.
+ - Prevent PATH problems on Windows from breaking Tomboy.
+ - Search for phrases by quoting search text.
+ - Fix drag&drop & middle-click paste of linked text.
+ - Save width of notebook pane in Search window.
+ - Disable sync menu items until backend configured.
+ - Close note find bar on escape, even when not focused.
+ - Support FUSE being built-in to kernel.
+ - Prevent crashes when reading unexpected note XML.
+ - Change "Open New Note Template" LinkButton to Button to prevent error.
+ - Focus search field every time Search window summoned.
+ - Only show Start Here note on first run if not running as applet.
+ - HIG compliance in Sync preferences.
+ - Use correct "info" icon in add-in info windows.
+ - Use relative path to load help.
+ - Cache frequently-used text tags in one place instead of five.
+ - Documentation updates.
+ - Translation updates: el, es, et, gl
+ * debian/control: Add help/ as GFDL 1.1+
+ * debian/rules: Remove --repack; not necessary as upstream is a .tar.gz and
+ could cause rule to be nondeterministic
+
+ -- Iain Lane <laney at ubuntu.com> Mon, 01 Jun 2009 22:08:22 +0100
+
+tomboy (0.15.0-0ubuntu1) karmic; urgency=low
+
+ * New upstream release
+ * debian/rules:
+ + Add get-orig-source rule
+ * debian/watch:
+ + Do not run "uupdate" as it does not permit preparing Debian
+ revision on Ubuntu
+ * debian/patches/02_configurable_compiler.patch:
+ + Deleted, merged upstream
+ * debian/patches/03_03_sm-name.patch:
+ + Deleted, no longer relevant
+
+ -- Jo Shields <directhex at apebox.org> Wed, 06 May 2009 23:37:55 +0100
+
+ tomboy (0.14.2-3) UNRELEASED; urgency=low
+
+ * Replace the tomboy icon misery with a proper method:
+ + debian/control: Replace b-p on shareutils with imagemagick.
+ + debian/rules: Convert the icons at build time.
+ + Delete tomboy.dirs and tomboy-{16/32}.xpm.uu.
+ + Add debian/tomboy.install to install the generated icons properly.
+
+ -- Stefan Ebner <sebner at ubuntu.com> Sat, 13 Jun 2009 18:24:29 +0200
+
+ tomboy (0.14.2-2) unstable; urgency=low
+
+ [ Mirco Bauer ]
+ * The "Squeeze it!" release
+ + The installed package size was reduced 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 (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.
+
+ [ Iain Lane ]
+ * debian/control: Update VCS info to point to git repo
+
+ -- Mirco Bauer <meebey at debian.org> Sat, 13 Jun 2009 02:10:01 +0200
+
tomboy (0.14.2-1) unstable; urgency=low
[ Jo Shields ]
diff --combined debian/control
index 6c08c6d,8960481..250a1a6
--- a/debian/control
+++ b/debian/control
@@@ -3,31 -3,31 +3,33 @@@ Section: gnom
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),
+ quilt (>= 0.46-7~),
autotools-dev,
+ libtool,
+ intltool,
+ pngquant,
mono-devel (>= 2.0),
- libgtk2.0-cil (>= 2.10.4-2),
+ libgtk2.0-cil (>= 2.10.4),
libgconf2.0-cil,
libgnome2.24-cil,
libgnomepanel2.24-cil,
libgtkspell-dev (>= 2.0.9),
- intltool,
libpanel-applet2-dev,
+ libgnomeprint2.2-dev,
+ libgnomeprintui2.2-dev,
cli-common-dev (>= 0.4.4),
- sharutils,
+ imagemagick,
libgtk2.0-dev (>= 2.10.0),
libatk1.0-dev (>= 1.2.4),
- libgmime2.2a-cil,
+ libgmime2.2a-cil,
gnome-doc-utils (>= 0.3.2),
scrollkeeper,
libmono-cairo2.0-cil,
libndesk-dbus1.0-cil (>= 0.4),
libndesk-dbus-glib1.0-cil (>= 0.3),
- libmono-addins0.2-cil (>= 0.3),
- libmono-addins-gui0.2-cil (>= 0.3)
+ libmono-addins0.2-cil (>= 0.2-4),
+ libmono-addins-gui0.2-cil (>= 0.2-4)
Standards-Version: 3.8.1
Homepage: http://www.gnome.org/projects/tomboy/
Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/tomboy.git
diff --combined debian/rules
index 75fe31a,d0ea791..42cec40
--- a/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,14 +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,29 -16,36 +16,36 @@@ DEB_SOURCE_NAME = $(shell dpkg-parsecha
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
-
- common-configure-indep::
- mkdir -p $(MONO_SHARED_DIR)/.wapi
-
- install/tomboy::
- 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
- mkdir -p debian/tomboy/usr/lib/tomboy/addins
+ 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 $@
+
+ override_dh_auto_configure: autoreconf-stamp
+ dh_auto_configure -- \
+ --disable-scrollkeeper \
+ LDFLAGS="$(LDFLAGS)" \
+ GMCS=/usr/bin/csc
+
+ override_dh_auto_install:
+ dh_auto_install -- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+ convert $(CURDIR)/data/icons/hicolor_apps_16x16_tomboy.png $(CURDIR)/debian/tomboy-16.xpm
+ convert $(CURDIR)/data/icons/hicolor_apps_32x32_tomboy.png $(CURDIR)/debian/tomboy-32.xpm
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
+ rm -rf debian/tomboy/usr/lib/tomboy/*.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 \
@@@ -44,4 -55,10 +55,9 @@@
--download-version $(VERSION) \
--destdir . \
--force-download \
- --rename \
- --repack
+ --rename
+
+ %:
+ dh $@
+
-.PHONY: autoreconf get-orig-source
++.PHONY: autoreconf get-orig-source
--
Tomboy - desktop note taking program using Wiki style links
More information about the Pkg-cli-apps-commits
mailing list