[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.9.5-1ubuntu1
Iain Lane
laney at debian.org
Mon Feb 6 14:36:20 UTC 2012
The following commit has been merged in the ubuntu branch:
commit 9df5c6b8b57d23bf95e3b50a0fc9acf6b9179345
Merge: 04f8d8eb183e17c715fc39eb9fea0502bb1e60aa 9e016b3b15183fa22d2e68259bb52e9d413d1777
Author: Iain Lane <laney at debian.org>
Date: Mon Feb 6 14:12:18 2012 +0000
Merge branch 'experimental' into ubuntu
Conflicts:
debian/gbp.conf
debian/rules
diff --combined debian/changelog
index 9c37033,ce786e6..62dfb81
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,40 +1,82 @@@
+ tomboy (1.9.5-1) experimental; urgency=low
+
+ * [ceb1079] Update watchfile to look for xz tarballs
+ * [ef866ec] Imported Upstream version 1.9.5 (note: no pristine-tar data for
+ this yet, due to missing pristine-xz)
+ * Fix validation errors in docs
+ * Fix delayed logouts with GnomeSession (Closes: #645990)
+ * Sync thread improvements
+ * Add missing commandline options to man pages (#665532)
+ * Add 256x256 icon for GNOME 3
+ * [fcde26a] Drop deprecated cli.make and use --with cli directly
+
+ -- Iain Lane <laney at debian.org> Wed, 18 Jan 2012 13:16:27 +0000
+
+ tomboy (1.9.3-1) experimental; urgency=low
+
+ * [7e76896] Imported Upstream version 1.9.3
+ + Translation updates
+
+ -- Iain Lane <laney at debian.org> Tue, 22 Nov 2011 14:49:18 +0000
+
+ tomboy (1.9.2-1) experimental; urgency=low
+
+ * [72d7885] Update gbp.conf for experimental
+ * [fca59c6] Imported Upstream version 1.9.2
+ + Add support for latest versions of Firefox
+ + Translation updates
+
+ -- Iain Lane <laney at debian.org> Wed, 16 Nov 2011 16:02:47 +0000
+
+ tomboy (1.8.3-1) unstable; urgency=low
+
+ * [6d2edf9] Imported Upstream version 1.8.3
+ + Translation updates
+
+ -- Iain Lane <laney at debian.org> Wed, 16 Nov 2011 15:58:39 +0000
+
+tomboy (1.8.0-1ubuntu1.2) precise; urgency=low
+
+ * debian/patches/git_logout_delay.patch: upstream fix, should fix the issue
+ where tomboy is delaying the session logout (lp: #880299)
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Mon, 16 Jan 2012 18:39:47 +0100
+
+tomboy (1.8.0-1ubuntu1.1) oneiric-proposed; urgency=low
+
+ [ Iain Lane ]
+ * debian/control: Remove syncdaemon BD which is no longer required due to
+ the dropping of the SSO patch in 1.8.0-1ubuntu1
+
+ [ Ken VanDine ]
+ * debian/patches/02_sync_save_button_sensitive.patch
+ - Set save button sensitive when needed (LP: #845321)
+
+ -- Ken VanDine <ken.vandine at canonical.com> Fri, 14 Oct 2011 09:38:21 -0400
+
+tomboy (1.8.0-1ubuntu1) oneiric; urgency=low
+
+ [ Iain Lane ]
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ [ Rodrigo Moya ]
+ * [a6712fc] Disable U1 SSO patch & refresh u1_as_default_sync_source patch
+ * debian/patches/06_use_ubuntu_sso.patch:
+ - Disabled SSO patch, as it's not working on Oneiric, and also allows
+ to remove the dependency on libubuntuone.
+ * debian/patches/03_u1_as_default_sync.patch:
+ - Rebased
+
+ -- Iain Lane <laney at debian.org> Mon, 26 Sep 2011 23:39:59 +0100
+
tomboy (1.8.0-1) unstable; urgency=low
* Upload to unstable
@@@ -50,21 -45,6 +87,21 @@@
-- Iain Lane <laney at debian.org> Mon, 26 Sep 2011 22:26:48 +0100
+tomboy (1.7.6-1ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Use Ubuntu One SSO
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ -- Iain Lane <laney at debian.org> Tue, 06 Sep 2011 17:28:04 +0100
+
tomboy (1.7.6-1) experimental; urgency=low
* [e29c8c1] Imported Upstream version 1.7.6
@@@ -72,24 -52,6 +109,24 @@@
-- Iain Lane <laney at debian.org> Tue, 06 Sep 2011 17:04:32 +0100
+tomboy (1.7.4-1ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Use Ubuntu One SSO
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+ * [268e4a9] Update 03_u1_as_default_sync to apply against new source
+ * [26f26a0] Update gbp.conf for Ubuntu branch
+ * [c61756e] Update 06_ubuntu_sso.patch for new SyncService interface
+
+ -- Iain Lane <laney at debian.org> Tue, 23 Aug 2011 22:47:32 +0100
+
tomboy (1.7.4-1) experimental; urgency=low
* [aae3ba7] Delete debian/ltmain-as-needed.sh. Not necessary any more.
@@@ -108,21 -70,6 +145,21 @@@
-- Iain Lane <laney at debian.org> Tue, 23 Aug 2011 22:09:33 +0100
+tomboy (1.7.3-1ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations instead of manually stripping schemas
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Use Ubuntu One SSO
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+ * Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ -- Iain Lane <laney at debian.org> Mon, 15 Aug 2011 23:09:48 +0100
+
tomboy (1.7.3-1) experimental; urgency=low
* [25db012] Imported Upstream version 1.7.3
@@@ -132,22 -79,6 +169,22 @@@
-- Iain Lane <laney at debian.org> Mon, 15 Aug 2011 22:20:55 +0100
+tomboy (1.7.2-1ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations instead of manually stripping schema
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Use Ubuntu One SSO
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+ * Refresh patches that don't apply cleanly
+ * Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ -- Iain Lane <laney at debian.org> Wed, 27 Jul 2011 10:46:04 +0100
+
tomboy (1.7.2-1) experimental; urgency=low
* [6a8551d] Imported Upstream version 1.7.2
@@@ -158,20 -89,6 +195,20 @@@
-- Iain Lane <laney at debian.org> Tue, 26 Jul 2011 16:44:05 +0100
+tomboy (1.7.1-1ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian experimental, remaning changes:
+ + Use dh-translations instead of manually stripping schema
+ + Ubuntu patches:
+ - Add Launchpad integration
+ - Use Ubuntu One SSO
+ - Add app indicator support
+ - Use Ubuntu One as default sync server
+ - Add initial note about Ubuntu One
+ + autoreconf for some of the above changes
+
+ -- Iain Lane <laney at ubuntu.com> Wed, 06 Jul 2011 10:06:49 +0100
+
tomboy (1.7.1-1) experimental; urgency=low
* [dbee52f] Imported Upstream version 1.7.1
diff --combined debian/gbp.conf
index 0af4a0d,c499001..a716ccb
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,4 +1,4 @@@
[DEFAULT]
-debian-branch = experimental
+debian-branch = ubuntu
- upstream-branch = upstream
- compression = bzip2
+ upstream-branch = upstream-experimental
+ compression = xz
diff --combined debian/rules
index f3b20e9,e5b42a6..9773445
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,5 +1,5 @@@
#!/usr/bin/make -f
- include /usr/share/cli-common/cli.make
-
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
MAKEFILE = $(firstword $(MAKEFILE_LIST))
@@@ -10,9 -8,6 +8,9 @@@ 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.*//')
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
+
override_dh_auto_configure:
dh_auto_configure -- \
--disable-scrollkeeper \
@@@ -45,6 -40,6 +43,6 @@@ get-orig-source
--rename
%:
- dh --with autoreconf,translations $@
- dh $@ --with cli
++ dh $@ --with autoreconf,cli,translations
.PHONY: get-orig-source
--
Tomboy - desktop note taking program using Wiki style links
More information about the Pkg-cli-apps-commits
mailing list