[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master, updated. debian/0.15.3-1-5-g93b7cc3

Iain Lane laney at ubuntu.com
Thu Sep 24 13:50:57 UTC 2009


The following commit has been merged in the master branch:
commit 93b7cc3bbdfae996852dd7674dd32422a6676744
Author: Iain Lane <laney at ubuntu.com>
Date:   Thu Sep 24 14:22:53 2009 +0100

    New upstream version 1.0.0:
    
    * 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

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..8646078
--- /dev/null
+++ b/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 <patch>
+
+where <patch> 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 <file>
+
+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 <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> 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 <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
diff --git a/debian/changelog b/debian/changelog
index 2e27345..6522122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,46 @@
+tomboy (1.0.0-1) UNRELEASED; 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 
+
+ -- Iain Lane <laney at ubuntu.com>  Thu, 24 Sep 2009 14:49:09 +0100
+
 tomboy (0.15.3-1) experimental; urgency=low
 
   * New upstream version 0.15.3:
diff --git a/debian/control b/debian/control
index 4a5073c..c47e997 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tomboy
 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>
+Uploaders: Sebastian Dröge <slomo at debian.org>, Iain Lane <laney at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
                quilt (>= 0.46-7~),
                autotools-dev,
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 7.0.50),
                libpanel-applet2-dev,
                cli-common-dev (>= 0.4.4),
                imagemagick,
-               libgtk2.0-dev (>= 2.10.0),
+               libgtk2.0-dev (>= 2.14.0),
                libatk1.0-dev (>= 1.2.4),
                libgmime2.2a-cil,
                gnome-doc-utils (>= 0.3.2),
@@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 7.0.50),
                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-Git: git://git.debian.org/pkg-cli-apps/packages/tomboy.git
 Vcs-Browser: http://git.debian.org/git/pkg-cli-apps/packages/tomboy.git
diff --git a/debian/rules b/debian/rules
index 42cec40..6364df9 100755
--- a/debian/rules
+++ b/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,7 +23,7 @@ override_dh_auto_configure: autoreconf-stamp
 	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
@@ -58,6 +53,6 @@ get-orig-source:
 		--rename
 
 %:
-	dh $@
+	dh --with=quilt $@
 
-.PHONY: autoreconf get-orig-source
\ No newline at end of file
+.PHONY: autoreconf get-orig-source

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



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