[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.11.1-1ubuntu1
Iain Lane
laney at debian.org
Thu May 3 22:55:50 UTC 2012
The following commit has been merged in the ubuntu branch:
commit d0162de0c2e52c1be296f5a5f1a5c21410c795da
Author: Iain Lane <laney at ubuntu.com>
Date: Wed Mar 28 22:49:23 2012 +0100
Imported Debian patch 1.10.0-1ubuntu1
diff --git a/ChangeLog b/ChangeLog
index d91a7bf..e791ef5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,59 @@
# Generated by Makefile. Do not edit.
+commit 9e057a215e8056b90c3ee1f28f59c6b5a8848e9e
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Mar 26 10:23:01 2012 -0700
+
+ Update NEWS for 1.10.0
+
+ NEWS | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit ff9f3a6b9725f97aa970934ddb4f9207fbdaa755
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Mar 26 10:22:37 2012 -0700
+
+ Bump version to 1.10.0
+
+ Tomboy/Defines.WIN32.cs | 2 +-
+ configure.in | 2 +-
+ osx/Contents/Info.plist | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 01de79adb9dd019bbe7c71ea93e7408102ce5e7e
+Merge: f25f254 bd054c1
+Author: Jared Jennings <jjennings at src.gnome.org>
+Date: Mon Mar 26 10:57:32 2012 -0400
+
+ Merge branch 'bgo#672482'
+
+commit f25f2542962da2736d744dc96de788be33be047c
+Author: Bruno Brouard <annoa.b at gmail.com>
+Date: Mon Mar 26 12:33:00 2012 +0200
+
+ Updated French doc translation
+
+ help/fr/fr.po | 16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+commit bd054c1cf46e815dce6af33fb9d4cd9cd5c57968
+Author: Jared Jennings <jjennings at src.gnome.org>
+Date: Sat Mar 24 02:21:52 2012 -0400
+
+ Addresses Bug 672482 - After crashing Tomboy does not remember open notes
+
+ Tomboy/NoteManager.cs | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 852c7450a3780dccddae9889b6bd6d9057593d6c
+Author: Aaron Borden <adborden at live.com>
+Date: Mon Mar 19 08:16:48 2012 -0700
+
+ Update NEWS for 1.9.10
+
+ NEWS | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
commit 0118c589f070958ea2e8540773cfc303bee1c7ba
Author: Mario Blättermann <mario.blaettermann at gmail.com>
Date: Sat Mar 17 22:32:35 2012 +0100
diff --git a/NEWS b/NEWS
index d5f2d12..20da1bb 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ Please send questions and suggestions to
Please report bugs using http://bugzilla.gnome.org/
(http://bugzilla.gnome.org/enter_bug.cgi?product=Tomboy).
+Version 1.10.0
+* Remember last open notes on hard shutdown (#672482)
+* Updated Translations: fr
+
Version 1.9.10
* Fix doc errors for sync (#636539, Tiffany Antopolski)
* New Doc Translation: lv
diff --git a/Tomboy/NoteManager.cs b/Tomboy/NoteManager.cs
index 034091e..c5fe290 100644
--- a/Tomboy/NoteManager.cs
+++ b/Tomboy/NoteManager.cs
@@ -380,7 +380,6 @@ Ciao!");
if (startup_notes_enabled)
note.Window.Show ();
- note.IsOpenOnStartup = false;
note.QueueSave (ChangeType.NoChange);
}
}
@@ -423,6 +422,8 @@ Ciao!");
// next startup
if (note.HasWindow && note.Window.Visible)
note.IsOpenOnStartup = true;
+ else
+ note.IsOpenOnStartup = false; /* bgo #672482 */
note.Save ();
}
diff --git a/configure b/configure
index 280d0aa..9e03651 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for tomboy 1.9.10.
+# Generated by GNU Autoconf 2.68 for tomboy 1.10.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='tomboy'
PACKAGE_TARNAME='tomboy'
-PACKAGE_VERSION='1.9.10'
-PACKAGE_STRING='tomboy 1.9.10'
+PACKAGE_VERSION='1.10.0'
+PACKAGE_STRING='tomboy 1.10.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1451,7 +1451,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures tomboy 1.9.10 to adapt to many kinds of systems.
+\`configure' configures tomboy 1.10.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1525,7 +1525,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tomboy 1.9.10:";;
+ short | recursive ) echo "Configuration of tomboy 1.10.0:";;
esac
cat <<\_ACEOF
@@ -1692,7 +1692,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tomboy configure 1.9.10
+tomboy configure 1.10.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2057,7 +2057,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tomboy $as_me 1.9.10, which was
+It was created by tomboy $as_me 1.10.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2873,7 +2873,7 @@ fi
# Define the identity of the package.
PACKAGE='tomboy'
- VERSION='1.9.10'
+ VERSION='1.10.0'
cat >>confdefs.h <<_ACEOF
@@ -16746,7 +16746,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tomboy $as_me 1.9.10, which was
+This file was extended by tomboy $as_me 1.10.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16812,7 +16812,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-tomboy config.status 1.9.10
+tomboy config.status 1.10.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index 55ea69d..834c828 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(tomboy, 1.9.10)
+AC_INIT(tomboy, 1.10.0)
AC_CONFIG_SRCDIR(Tomboy/Tomboy.cs)
AM_INIT_AUTOMAKE([foreign tar-ustar])
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 1fb41e8..c35b063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,59 @@
+tomboy (1.10.0-1ubuntu1) precise; urgency=low
+
+ * Merge from unstable, remaining 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
+ - Set save button sensitive when needed
+ + autoreconf for some of the above changes
+ + Run dh_autoreconf with --as-needed to enable support in ltmain.sh
+
+ -- Iain Lane <laney at ubuntu.com> Wed, 28 Mar 2012 22:49:23 +0100
+
+tomboy (1.10.0-1) unstable; urgency=low
+
+ * [277fd7f] Imported Upstream version 1.10.0
+ - Remember last open notes on hard shutdown
+ * [b863565] Stable release; update gbp.conf branches
+
+ -- Iain Lane <laney at debian.org> Wed, 28 Mar 2012 11:32:48 +0100
+
+tomboy (1.9.10-1) unstable; urgency=low
+
+ * [91a0237] Imported Upstream version 1.9.10
+ - Fix doc errors for sync
+ - New and updated (doc) translations
+
+ -- Iain Lane <laney at debian.org> Tue, 20 Mar 2012 22:34:39 +0000
+
tomboy (1.9.10-0ubuntu1) precise; urgency=low
* New upstream version
-- Sebastien Bacher <seb128 at ubuntu.com> Tue, 20 Mar 2012 15:28:51 +0100
+tomboy (1.9.9-2) experimental; urgency=low
+
+ * Merge from unstable
+ * [b6e36a3] Use GMime 2.6 instead of 2.4; the latter is being dropped.
+ (Closes: #663216)
+ * [934f580] Use dh sequence explicitly instead of via deprecated cli.make
+ include
+ * [7cb46e3] Standards-Version → 3.9.3, no changes required
+
+ -- Iain Lane <laney at debian.org> Mon, 12 Mar 2012 21:44:18 +0000
+
+tomboy (1.9.9-1) experimental; urgency=low
+
+ * New upstream release 1.9.9 (still no pristine-tar)
+ - Fix link names after HTML export
+ - fix Export All to HTML
+
+ -- Iain Lane <laney at debian.org> Tue, 06 Mar 2012 19:00:41 +0000
+
tomboy (1.9.9-0ubuntu1) precise; urgency=low
* New upstream version
@@ -80,6 +130,15 @@ tomboy (1.9.2-1) experimental; urgency=low
-- Iain Lane <laney at debian.org> Wed, 16 Nov 2011 16:02:47 +0000
+tomboy (1.8.3-2) unstable; urgency=low
+
+ * [b6e36a3] Use GMime 2.6 instead of 2.4; the latter is being dropped.
+ (Closes: #663216)
+ * [934f580] Use dh sequence explicitly instead of via deprecated cli.make include
+ * [7cb46e3] Standards-Version → 3.9.3, no changes required
+
+ -- Iain Lane <laney at debian.org> Mon, 12 Mar 2012 21:28:55 +0000
+
tomboy (1.8.3-1) unstable; urgency=low
* [6d2edf9] Imported Upstream version 1.8.3
diff --git a/debian/control b/debian/control
index 10804ca..d2fb56a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders: Sebastian Dröge <slomo at debian.org>, Iain Lane <laney at debian.org>
Build-Depends: debhelper (>= 7.0.50),
dh-autoreconf,
dh-translations,
+ gnome-common,
intltool,
pngquant,
mono-devel (>= 2.4.3),
@@ -18,7 +19,7 @@ Build-Depends: debhelper (>= 7.0.50),
imagemagick,
libgtk2.0-dev (>= 2.14.0),
libatk1.0-dev (>= 1.2.4),
- libgmime2.4-cil-dev,
+ libgmime2.6-cil-dev,
gnome-doc-utils (>= 0.3.2),
scrollkeeper,
libdbus1.0-cil-dev (>= 0.4),
@@ -28,7 +29,7 @@ Build-Depends: debhelper (>= 7.0.50),
liblaunchpad-integration-cil-dev,
libappindicator0.1-cil-dev (>= 0.4.90),
libproxy-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.gnome.org/projects/tomboy/
Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/tomboy.git
Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/tomboy.git
diff --git a/debian/gbp.conf b/debian/gbp.conf
index a716ccb..821625e 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
[DEFAULT]
debian-branch = ubuntu
-upstream-branch = upstream-experimental
+upstream-branch = upstream
compression = xz
diff --git a/debian/patches/40_use_gmime_2.6.patch b/debian/patches/40_use_gmime_2.6.patch
new file mode 100644
index 0000000..667b5a7
--- /dev/null
+++ b/debian/patches/40_use_gmime_2.6.patch
@@ -0,0 +1,19 @@
+Description: Use gmime 2.6 instead of 2.4
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663216
+
+Index: tomboy/configure.in
+===================================================================
+--- tomboy.orig/configure.in 2012-03-28 22:24:39.729137053 +0100
++++ tomboy/configure.in 2012-03-28 22:24:39.793134536 +0100
+@@ -238,8 +238,8 @@
+ # Evolution.dll needs GMime#
+ #
+ if test "x$ENABLE_GNOME" != "xno"; then
+- if pkg-config --exists gmime-sharp-2.4; then
+- PKG_CHECK_MODULES(EVOLUTION, gmime-sharp-2.4, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
++ if pkg-config --exists gmime-sharp-2.6; then
++ PKG_CHECK_MODULES(EVOLUTION, gmime-sharp-2.6, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
+ else
+ PKG_CHECK_MODULES(EVOLUTION, gmime-sharp >= 2.2.7, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 3b0bdec..51b2a89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
20_remove_pcfile_requires
30_fix_manpage_syntax
31_prevent_inadvertent_deletion_of_notes.patch
+40_use_gmime_2.6.patch
diff --git a/debian/rules b/debian/rules
index 9773445..a337aef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Vers
VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
override_dh_autoreconf:
- dh_autoreconf --as-needed
+ NOCONFIGURE=1 dh_autoreconf /usr/bin/gnome-autogen.sh
override_dh_auto_configure:
dh_auto_configure -- \
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 1085328..814b692 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -1,12 +1,12 @@
# French translation of tomboy documentation.
-# Copyright (C) 2006-2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the tomboy
# documentation package.
#
# Claude Paroz <claude at 2xlibre.net>, 2006-2011.
# Jonathan Ernst <jonathan at ernstfamily.ch>, 2007.
# Robert-André Mauchin <zebob.m at pengzone.org>, 2007.
-# Bruno Brouard <annoa.b at gmail.com>, 2007.
+# Bruno Brouard <annoa.b at gmail.com>, 2007,2010,2012.
# Frédéric Péters <fpeters at 0d.be>, 2008.
# Rémi Peixoto <remi.peixoto at gmail.com>, 2009.
# Laurent Coudeur <laurentc at iol.ie>, 2010.
@@ -15,7 +15,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tomboy documentation\n"
-"POT-Creation-Date: 2012-02-03 21:19+0000\n"
+"POT-Creation-Date: 2012-03-08 22:08+0000\n"
"PO-Revision-Date: 2012-02-04 00:29+0200\n"
"Last-Translator: Luc Pionchon <pionchon.luc at gmail.com>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
@@ -190,8 +190,8 @@ msgstr ""
#: C/sync-setup.page:70(p)
msgid ""
-"<gui>Replace my local note with the server's update. </gui>. If you have "
-"selected this option, when you sync Tomboy will overwrite and replace your "
+"<gui>Replace my local note with the server's update.</gui> If you have "
+"selected this option, when you sync, Tomboy will overwrite and replace your "
"note stored on your computer with a copy from the remote computer."
msgstr ""
"<gui>Remplacer ma note locale avec celle du serveur</gui>. Si vous avez "
@@ -246,14 +246,14 @@ msgid ""
"FUSE file system, also called <app>sshfs</app> installed. Follow the "
"documentation for your operating system to set up FUSE for your user. You "
"will also need an SSH key for your SSH server account that can be provided "
-"by the <app>GNOME Seahorse</app> application, which is also known as "
+"by the <app>Seahorse</app> application, which is also known as "
"<app>Passwords and Encryption Keys</app>."
msgstr ""
"Pour synchroniser vos notes avec un serveur SSH, vous devez avoir installé "
"le système de fichiers FUSE, aussi appelé <app>sshfs</app>. Référez-vous à "
"la documentation de votre système d'exploitation pour paramétrer FUSE pour "
"votre compte utilisateur. Vous avez également besoin d'une clé SSH pour "
-"votre compte serveur SSH, qui peut être fournie par l'application <app>GNOME "
+"votre compte serveur SSH, qui peut être fournie par l'application <app>"
"Seahorse</app>, aussi connue sous le nom de <app>Mots de passe et clés de "
"chiffrement</app>."
@@ -1468,7 +1468,7 @@ msgstr ""
"Claude Paroz <claude at 2xlibre.net>, 2006-2011\n"
"Jonathan Ernst <jonathan at ernstfamily.ch>, 2007\n"
"Robert-André Mauchin <zebob.m at pengzone.org>, 2007\n"
-"Bruno Brouard <annoa.b at gmail.com>, 2007,2010\n"
+"Bruno Brouard <annoa.b at gmail.com>, 2007,2010,2012\n"
"Frédéric Péters <fpeters at 0d.be>, 2008\n"
"Rémi Peixoto <remi.peixoto at gmail.com>, 2009\n"
"Laurent Coudeur <laurentc at iol.ie>,2010\n"
diff --git a/help/fr/sync-setup.page b/help/fr/sync-setup.page
index 2b1a041..77da235 100644
--- a/help/fr/sync-setup.page
+++ b/help/fr/sync-setup.page
@@ -41,10 +41,7 @@
<item><p><gui>Renommer ma note locale</gui>. Si cette option est sélectionnée, Tomboy remplace automatiquement la note par une copie de celle de l'ordinateur distant et renomme la note sur votre ordinateur pour que vous ne perdiez pas les informations qu'elle contient.</p>
</item>
- <item><p><gui>Replace my local note with the server's update.</gui>
- If you have selected this option, when you sync,
- Tomboy will overwrite and replace your note stored on your
- computer with a copy from the remote computer.</p>
+ <item><p><gui>Remplacer ma note locale avec celle du serveur</gui>. Si vous avez sélectionné cette option, quand vous synchronisez, Tomboy remplace la note stockée sur votre ordinateur par celle de l'ordinateur distant.</p>
<note style="warning">
<p>Remplacer la note automatiquement est définitif. Votre note locale est remplacée par une copie de celle présente sur l'ordinateur distant et vous perdez toutes les informations qui étaient stockées dans cette note avant la synchronisation.</p>
@@ -70,13 +67,7 @@
<title>Configuration de la synchronisation avec SSH</title>
- <p>In order to synchronize your notes with an SSH server, you will need
- the FUSE file system, also called <app>sshfs</app> installed. Follow the
- documentation for your operating system to set up FUSE for your user.
- You will also need an SSH key for your SSH server account that can be
- provided by the <app>Seahorse</app> application, which is also known as
- <app>Passwords and Encryption Keys</app>.
- </p>
+ <p>Pour synchroniser vos notes avec un serveur SSH, vous devez avoir installé le système de fichiers FUSE, aussi appelé <app>sshfs</app>. Référez-vous à la documentation de votre système d'exploitation pour paramétrer FUSE pour votre compte utilisateur. Vous avez également besoin d'une clé SSH pour votre compte serveur SSH, qui peut être fournie par l'application <app>Seahorse</app>, aussi connue sous le nom de <app>Mots de passe et clés de chiffrement</app>.</p>
<p>Il est conseillé d'utiliser un troisième ordinateur ou serveur comme ordinateur distant pour stocker les notes qui doivent être synchronisées entre plusieurs postes.</p>
diff --git a/tomboy.spec b/tomboy.spec
index 1b7852b..673ccbe 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
Name: tomboy
-Version: 1.9.10
+Version: 1.10.0
Release: 1
Epoch: 0
Summary: Tomboy is a desktop note-taking application for Linux and Unix.
--
Tomboy - desktop note taking program using Wiki style links
More information about the Pkg-cli-apps-commits
mailing list