[Pkg-cli-apps-commits] [SCM] tasque branch, master, updated. upstream/0.1.8-6-g1369b97

Iain Lane laney at ubuntu.com
Wed Mar 3 21:37:56 UTC 2010


The following commit has been merged in the master branch:
commit 1369b97b95c2be0664215a3a2e7ff9bd51716865
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Mar 3 21:01:43 2010 +0000

    New upstream release 0.1.9 + bonus goodies
    
    * The "don't forget to sync your RAID array" release
    * New upstream release 0.1.9:
     + Support for Mono >= 2.6
     + Support for enabling groups of backends when building:
       --enable-standard-backends, --enable-experimental-backends and
       --enable-all-backends.
     + Customizable color highlighting in tasks.
     + Clear "New Task..." text in inputfield on drag and drop, Anirudh Sanjeev
     + Option to change category via context menu, Karsten Stöckmann.
     + Hiveminder improvements, Johnny Jacob.
     + Close task window on ESC keypress, Matt Enright
     + Initial implementation of tooltip for the tray icon, Peter Johanson.
     + Translation updates: cs, da, de, en_GB, eo, es, et, gl, gr, hu, id, it, ja,
       nds, pl, pt, pt_BR, sl, sv, th, zh_CN.
    * debian/rules: Convert to DH7
    * debian/control, debian/rules, debian/patches/*: Convert patchsys to quilt
    * debian/control:
      + Standards-Version 3.8.4, no changes required
      + Migrate to git, update Vcs-* metadata

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..5dde0bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,58 @@
+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
+                break
+        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 2368722..c01abc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+tasque (0.1.9-1) UNRELEASED; urgency=low
+
+  * The "don't forget to sync your RAID array" release
+  * New upstream release 0.1.9:
+   + Support for Mono >= 2.6
+   + Support for enabling groups of backends when building:
+     --enable-standard-backends, --enable-experimental-backends and 
+     --enable-all-backends.
+   + Customizable color highlighting in tasks.
+   + Clear "New Task..." text in inputfield on drag and drop, Anirudh Sanjeev
+   + Option to change category via context menu, Karsten Stöckmann.
+   + Hiveminder improvements, Johnny Jacob.
+   + Close task window on ESC keypress, Matt Enright
+   + Initial implementation of tooltip for the tray icon, Peter Johanson.
+   + Translation updates: cs, da, de, en_GB, eo, es, et, gl, gr, hu, id, it, ja, 
+     nds, pl, pt, pt_BR, sl, sv, th, zh_CN.
+  * debian/rules: Convert to DH7
+  * debian/control, debian/rules, debian/patches/*: Convert patchsys to quilt
+  * debian/control:
+    + Standards-Version 3.8.4, no changes required
+    + Migrate to git, update Vcs-* metadata
+
+ -- Iain Lane <laney at ubuntu.com>  Wed, 03 Mar 2010 20:46:49 +0000
+
 tasque (0.1.8-5) unstable; urgency=low
 
   * debian/control, debian/rules: Disable evolution integration - evo# is very
diff --git a/debian/control b/debian/control
index e665894..b29b1fa 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: tasque
 Section: gnome
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5),
-               cdbs,
-               cli-common-dev (>= 0.4.4),
+Build-Depends: debhelper (>= 7.0.50~),
+               cli-common-dev (>= 0.5.7~),
+               quilt (>= 0.46-7~),
                pkg-config,
                mono-devel (>= 2.4.3),
                gconf2,
@@ -15,10 +15,10 @@ Build-Depends: debhelper (>= 5),
                libndesk-dbus-glib1.0-cil-dev,
                libnotify-cil-dev,
                intltool
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://live.gnome.org/Tasque
-Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/tasque/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tasque/trunk/
+Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/tasque.git
+Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/tasque.git
 
 Package: tasque
 Architecture: all
diff --git a/debian/patches/01-build.patch b/debian/patches/01-build.patch
index 6c2fa84..87cf86d 100644
--- a/debian/patches/01-build.patch
+++ b/debian/patches/01-build.patch
@@ -1,6 +1,8 @@
---- src/Makefile.am.old	2008-12-29 10:08:08.000000000 +0100
-+++ src/Makefile.am	2008-12-29 10:08:25.000000000 +0100
-@@ -140,7 +140,7 @@
+Index: tasque.git/src/Makefile.am
+===================================================================
+--- tasque.git.orig/src/Makefile.am	2010-03-03 20:56:39.921828798 +0000
++++ tasque.git/src/Makefile.am	2010-03-03 20:56:45.121837862 +0000
+@@ -143,7 +143,7 @@
  	$(CSC) -unsafe -out:$@ $(CSFLAGS) $(NOTIFY_SHARP_CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
  
  tasquelibdir = $(libdir)/tasque
@@ -9,9 +11,11 @@
  
  bin_SCRIPTS = $(WRAPPER)
  
---- src/Makefile.in.old	2008-12-29 10:08:10.000000000 +0100
-+++ src/Makefile.in	2008-12-29 10:08:41.000000000 +0100
-@@ -359,7 +359,7 @@
+Index: tasque.git/src/Makefile.in
+===================================================================
+--- tasque.git.orig/src/Makefile.in	2010-03-03 20:56:46.980579405 +0000
++++ tasque.git/src/Makefile.in	2010-03-03 20:56:51.081828558 +0000
+@@ -388,7 +388,7 @@
  	$(EVOLUTION_SHARP_LIBS)
  
  tasquelibdir = $(libdir)/tasque
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..605653d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-build.patch
diff --git a/debian/rules b/debian/rules
index 5e431d7..bf48f68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,22 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cli-common/cli.make
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	--enable-standard-backends=no \
 	--enable-backend-rtm \
 	--enable-backend-sqlite \
 	--enable-release \
 	GMCS=/usr/bin/mono-csc
 
-export MONO_SHARED_DIR=$(CURDIR)
-
-build/tasque::
+override_dh_auto_build:
 	pod2man --section=1 --release=$(VERSION) --center "" debian/tasque.pod > debian/tasque.1
+	dh_auto_build
 
-common-binary-predeb-indep::
-	dh_clifixperms
-	dh_clideps -d
-	dh_clistrip
-
-cleanbuilddir/tasque::
+override_dh_auto_clean:
 	rm -f tasque.1
+	dh_auto_clean
 
-clean::
-	rm -rf $(MONO_SHARED_DIR)/.wapi
-
+%:
+	dh --with quilt $@

-- 
tasque



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