diff -u tomboy-1.0.0/debian/rules tomboy-1.0.0/debian/rules --- tomboy-1.0.0/debian/rules +++ tomboy-1.0.0/debian/rules @@ -3,13 +3,8 @@ include /usr/share/quilt/quilt.make include /usr/share/cli-common/cli.make -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)) DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2) @@ -28,20 +23,22 @@ dh_auto_configure -- \ --disable-scrollkeeper \ LDFLAGS="$(LDFLAGS)" \ - GMCS=/usr/bin/csc + GMCS=/usr/bin/mono-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 + convert $(CURDIR)/data/icons/hicolor_apps_16x16_tomboy.png $(CURDIR)/debian/tomboy/usr/share/pixmaps/tomboy-16.xpm + convert $(CURDIR)/data/icons/hicolor_apps_32x32_tomboy.png $(CURDIR)/debian/tomboy/usr/share/pixmaps/tomboy-32.xpm cp debian/PrintNotes.dll.config debian/tomboy/usr/lib/tomboy/addins 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 {}' \; + # create pot file for Ubuntu - doesn't affect built debs for Debian + cd po; intltool-update --pot override_dh_clean: dh_clean - rm -rf autoreconf-stamp configure config.sub config.guess ltmain.sh gnome-doc-utils.make aclocal.m4 autom4te.cache/ + rm -rf autoreconf-stamp configure config.sub config.guess ltmain.sh gnome-doc-utils.make aclocal.m4 autom4te.cache/ po/*.pot find . -name "Makefile.in" -delete # disable tests @@ -61,3 +58,3 @@ - dh $@ + dh --with=quilt $@ -.PHONY: autoreconf get-orig-source \ No newline at end of file +.PHONY: autoreconf get-orig-source diff -u tomboy-1.0.0/debian/changelog tomboy-1.0.0/debian/changelog --- tomboy-1.0.0/debian/changelog +++ tomboy-1.0.0/debian/changelog @@ -1,3 +1,77 @@ +tomboy (1.0.0-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #481657), remaining changes: + + * debian/control: + - Added BZR link + * debian/patches/03_u1_as_default_sync.patch + Added patch to make ubuntuone.com the default sync server (LP: #416865) + + -- Manny Vindiola Sat, 14 Nov 2009 00:25:03 -0500 + +tomboy (1.0.0-2) unstable; urgency=low + + [ Iain Lane ] + * debian/rules: Update the translation template after the build, doesn't + affect Debian but is required for Ubuntu. Reduces the delta. + * debian/patches/02_support_oauth_1.0a.patch: Add upstream/Ubuntu patch to + support new OAuth protocol required by some services such as U1. + + [ Stefan Ebner ] + * debian/rules: + + Directly convert and install the icon + + Remove debian/clean + + Remove debian/tomboy.install + * Added debian/dirs + * debian/watch: Bump version to 3 + + -- Iain Lane Wed, 07 Oct 2009 16:01:38 +0100 + +tomboy (1.0.0-1) unstable; urgency=low + + * New upstream version 1.0.0: + - Fix crash when showing Search from panel applet + - Redirect complete applet output to ~/.config/tomboy/tomboy-panel.log. + - Every patch contributor goes in the About dialog now. + - Add Underline add-in to Windows/Mac builds. + - WebSync fixes on Windows. + * New upstream version 0.15.7: + - Update for latest (hopefully final) REST API spec (Rodrigo Moya). + - Initial support for OAuth 1.0a servers + - Drop heavy System.Web dependency by bundling HttpUtility class. + - Fix parsing bug that caused Tomboy to upload empty notes to the server. + - More streamlined initial auth procedure (less clicks). + - Fix error when connecting before logged in to Snowy + - Prevent crash on PPC and ARM when showing menus + - Don't connect to session manager when running as applet + - When closing search window, do not quit if Tomboy icon is visible + * New upstream version 0.15.6: + - Migrate notes from ~/.tomboy, following Free Desktop standards on Linux + and appropriate conventions on Windows and Mac OS X + - Don't force port 22 when no port is specified for SSH sync + - Add preference in GConf for maximum width of note menu Jeff Tickle). + * New upstream version 0.15.5: + - Option to sync from Tomboy icon's contextual menu (#468459, Buchner + Johannes). + - Rename notebooks from the Search window (#435734). + - Clean up wasted space in Search and Preferences windows + - Maintain scroll position when notes change while Search window open + - Fix Notebook toolbar button appearance with 'text beside icons' setting. + * New upstream version 0.15.4: + - Improved behavior when changing font sizes (Stefan Schweizer). + - Builds fixes on Windows and Mac OS X (Matt Johnston, Sandy Armstrong). + - Require gtk+ 2.14 and stop using obsolete libgnome APIs. + * debian/control: Bump gtk build-dep to 2.14.0 per configure + * debian/rules: Remove some unnecessary variables and exports + * debian/README.source: Add, thanks Lintian + * debian/control: Add myself to Uploaders + * debian/control: Update standards-version to 3.8.3, no changes + * debian/control: Use mono-csc instead of csc as compiler, bump mono-devel + build-dep version for this + * debian/control: Update Vcs-Browser to point to new correct URL + + -- Iain Lane Fri, 25 Sep 2009 20:55:58 +0100 + tomboy (1.0.0-0ubuntu2) karmic; urgency=low * debian/patches/02_support_oauth_1.0a.patch diff -u tomboy-1.0.0/debian/watch tomboy-1.0.0/debian/watch --- tomboy-1.0.0/debian/watch +++ tomboy-1.0.0/debian/watch @@ -1,3 +1,3 @@ # watch file for tomboy -version=2 +version=3 http://download.gnome.org/sources/tomboy/([0-9.]+)/tomboy-([0-9.]+)\.tar\.gz debian reverted: --- tomboy-1.0.0/debian/clean +++ tomboy-1.0.0.orig/debian/clean @@ -1,2 +0,0 @@ -debian/tomboy-16.xpm -debian/tomboy-32.xpm reverted: --- tomboy-1.0.0/debian/tomboy.install +++ tomboy-1.0.0.orig/debian/tomboy.install @@ -1,2 +0,0 @@ -debian/tomboy-16.xpm usr/share/pixmaps -debian/tomboy-32.xpm usr/share/pixmaps diff -u tomboy-1.0.0/debian/control tomboy-1.0.0/debian/control --- tomboy-1.0.0/debian/control +++ tomboy-1.0.0/debian/control @@ -3,13 +3,14 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian CLI Applications Team +Uploaders: Sebastian Dröge , Iain Lane Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~), autotools-dev, libtool, intltool, pngquant, - mono-devel (>= 2.0), + mono-devel (>= 2.4.2.3), libgtk2.0-cil (>= 2.10.4), libgconf2.0-cil, libgnome2.24-cil, @@ -28,7 +29,7 @@ libndesk-dbus-glib1.0-cil (>= 0.3), libmono-addins0.2-cil (>= 0.3), libmono-addins-gui0.2-cil (>= 0.3) -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Homepage: http://www.gnome.org/projects/tomboy/ Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/tomboy/ubuntu diff -u tomboy-1.0.0/debian/patches/02_support_oauth_1.0a.patch tomboy-1.0.0/debian/patches/02_support_oauth_1.0a.patch --- tomboy-1.0.0/debian/patches/02_support_oauth_1.0a.patch +++ tomboy-1.0.0/debian/patches/02_support_oauth_1.0a.patch @@ -1,8 +1,8 @@ -diff --git a/Tomboy/Addins/WebSyncService/Api/OAuth.cs b/Tomboy/Addins/WebSyncService/Api/OAuth.cs -index 781886e..6d2c6f7 100644 ---- a/Tomboy/Addins/WebSyncService/Api/OAuth.cs -+++ b/Tomboy/Addins/WebSyncService/Api/OAuth.cs -@@ -45,7 +45,7 @@ namespace Tomboy.WebSync.Api +Index: tomboy.git/Tomboy/Addins/WebSyncService/Api/OAuth.cs +=================================================================== +--- tomboy.git.orig/Tomboy/Addins/WebSyncService/Api/OAuth.cs 2009-09-24 13:58:41.469760425 +0100 ++++ tomboy.git/Tomboy/Addins/WebSyncService/Api/OAuth.cs 2009-10-07 16:00:52.064108681 +0100 +@@ -45,7 +45,7 @@ #region Constructor public OAuth () { @@ -11,7 +11,7 @@ } #endregion -@@ -192,8 +192,11 @@ namespace Tomboy.WebSync.Api +@@ -192,8 +192,11 @@ var outUrl = string.Empty; List> parameters = null; @@ -24,11 +24,11 @@ if (Debugging) Logger.Debug ("Generated signature {0}", sig); -diff --git a/Tomboy/Addins/WebSyncService/OAuth/Base.cs b/Tomboy/Addins/WebSyncService/OAuth/Base.cs -index d70566a..6e698af 100644 ---- a/Tomboy/Addins/WebSyncService/OAuth/Base.cs -+++ b/Tomboy/Addins/WebSyncService/OAuth/Base.cs -@@ -159,7 +159,8 @@ namespace OAuth +Index: tomboy.git/Tomboy/Addins/WebSyncService/OAuth/Base.cs +=================================================================== +--- tomboy.git.orig/Tomboy/Addins/WebSyncService/OAuth/Base.cs 2009-09-24 13:58:41.469760425 +0100 ++++ tomboy.git/Tomboy/Addins/WebSyncService/OAuth/Base.cs 2009-10-07 16:00:52.084146564 +0100 +@@ -159,7 +159,8 @@ /// The signature type. To use the default values use SignatureType. /// The signature base. private string GenerateSignatureBase (Uri url, string consumerKey, string token, string tokenSecret, string verifier, @@ -38,7 +38,7 @@ out List> parameters) { log.LogDebug ("Generating signature base for OAuth request."); -@@ -196,6 +197,7 @@ namespace OAuth +@@ -196,6 +197,7 @@ if (!string.IsNullOrEmpty (token)) parameters.Add (new QueryParameter (OAuthTokenKey, token, s => string.IsNullOrEmpty (s))); if (!string.IsNullOrEmpty (verifier)) parameters.Add (new QueryParameter (OAuthVerifierKey, verifier, s => string.IsNullOrEmpty (s))); @@ -46,7 +46,7 @@ log.LogDebug ("Normalizing URL for signature."); -@@ -251,12 +253,13 @@ namespace OAuth +@@ -251,12 +253,13 @@ /// The HTTP method used. Must be valid HTTP method verb (POST, GET, PUT, etc). /// A Base64 string of the hash value. protected string GenerateSignature (Uri url, string consumerKey, string consumerSecret, string token, @@ -63,7 +63,7 @@ } /// -@@ -272,8 +275,8 @@ namespace OAuth +@@ -272,8 +275,8 @@ /// The type of signature to use. /// A Base64 string of the hash value. private string GenerateSignature (Uri url, string consumerKey, string consumerSecret, string token, @@ -74,7 +74,7 @@ { log.LogDebug ("Generating signature using signature type {0}", signatureType); -@@ -288,7 +291,8 @@ namespace OAuth +@@ -288,7 +291,8 @@ return signature; case SignatureType.HMACSHA1: string signatureBase = GenerateSignatureBase (url, consumerKey, token, tokenSecret, verifier, method, @@ -84,11 +84,11 @@ var hmacsha1 = new HMACSHA1 (); hmacsha1.Key = Encoding.ASCII.GetBytes (string.Format ("{0}&{1}", -diff --git a/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs b/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs -index 5d112e7..62f26a7 100644 ---- a/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs -+++ b/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs -@@ -107,25 +107,24 @@ namespace Tomboy.WebSync +Index: tomboy.git/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs +=================================================================== +--- tomboy.git.orig/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs 2009-09-24 13:58:41.469760425 +0100 ++++ tomboy.git/Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs 2009-10-07 16:00:52.114107121 +0100 +@@ -107,25 +107,24 @@ } // TODO: Move this @@ -131,7 +131,7 @@ } if (!Auth.IsAccessToken) { -@@ -159,6 +158,7 @@ namespace Tomboy.WebSync +@@ -159,6 +158,7 @@ return; } @@ -139,7 +139,7 @@ string authUrl = string.Empty; try { authUrl = Auth.GetAuthorizationUrl (); -@@ -223,7 +223,6 @@ namespace Tomboy.WebSync +@@ -223,7 +223,6 @@ } }, null); diff -u tomboy-1.0.0/debian/patches/01_dllmaps.patch tomboy-1.0.0/debian/patches/01_dllmaps.patch --- tomboy-1.0.0/debian/patches/01_dllmaps.patch +++ tomboy-1.0.0/debian/patches/01_dllmaps.patch @@ -1,5 +1,7 @@ ---- git.orig/Tomboy/Tomboy.exe.config.in -+++ git/Tomboy/Tomboy.exe.config.in +Index: tomboy.git/Tomboy/Tomboy.exe.config.in +=================================================================== +--- tomboy.git.orig/Tomboy/Tomboy.exe.config.in 2009-04-27 18:29:09.000000000 +0100 ++++ tomboy.git/Tomboy/Tomboy.exe.config.in 2009-10-07 16:00:35.894147250 +0100 @@ -2,6 +2,6 @@ only in patch2: unchanged: --- tomboy-1.0.0.orig/debian/README.source +++ tomboy-1.0.0/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. only in patch2: unchanged: --- tomboy-1.0.0.orig/debian/dirs +++ tomboy-1.0.0/debian/dirs @@ -0,0 +1 @@ +usr/share/pixmaps