r31055 - in /packages/unstable/tasks/debian: changelog compat control control.in rules tasks-hildon.install tasks.install watch

ross at users.alioth.debian.org ross at users.alioth.debian.org
Wed Oct 26 10:46:39 UTC 2011


Author: ross
Date: Wed Oct 26 10:46:39 2011
New Revision: 31055

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31055
Log:
New upstream release

Added:
    packages/unstable/tasks/debian/control.in
Removed:
    packages/unstable/tasks/debian/tasks-hildon.install
    packages/unstable/tasks/debian/tasks.install
Modified:
    packages/unstable/tasks/debian/changelog
    packages/unstable/tasks/debian/compat
    packages/unstable/tasks/debian/control
    packages/unstable/tasks/debian/rules
    packages/unstable/tasks/debian/watch

Modified: packages/unstable/tasks/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tasks/debian/changelog?rev=31055&op=diff
==============================================================================
--- packages/unstable/tasks/debian/changelog [utf-8] (original)
+++ packages/unstable/tasks/debian/changelog [utf-8] Wed Oct 26 10:46:39 2011
@@ -1,3 +1,11 @@
+tasks (0.20-1) unstable; urgency=low
+
+  * New upstream release (Closes: #646065)
+  * Drop Hildon varient, removed upstream
+  * Use dh instead of CDBS.
+
+ -- Ross Burton <ross at debian.org>  Wed, 26 Oct 2011 11:00:45 +0100
+
 tasks (0.16-1) unstable; urgency=low
 
   [ Ross Burton ]

Modified: packages/unstable/tasks/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tasks/debian/compat?rev=31055&op=diff
==============================================================================
--- packages/unstable/tasks/debian/compat [utf-8] (original)
+++ packages/unstable/tasks/debian/compat [utf-8] Wed Oct 26 10:46:39 2011
@@ -1,1 +1,1 @@
-5
+5

Modified: packages/unstable/tasks/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tasks/debian/control?rev=31055&op=diff
==============================================================================
--- packages/unstable/tasks/debian/control [utf-8] (original)
+++ packages/unstable/tasks/debian/control [utf-8] Wed Oct 26 10:46:39 2011
@@ -1,56 +1,28 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: tasks
 Section: gnome
 Priority: optional
 Maintainer: Ross Burton <ross at debian.org>
-Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 5),
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7),
+               gnome-pkg-tools,
                intltool,
                libecal1.2-dev,
                libgtk2.0-dev,
-               libhildon-1-dev,
                libdbus-1-dev,
-               libhildonmime-dev,
                dpkg-dev (>= 1.13.19)
 Standards-Version: 3.8.2
-
-# ordering is important here as to have dbg symbols for the main "tasks"
-# binary and not the tasks-hildon one
-Package: tasks-hildon
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         evolution-data-server
-Conflicts: tasks
-Description: a simple to do manager - Hildon flavour
- Tasks is a simple To Do manager, using GTK+ and libecal.  It eschews
- complicated features for a simple interface and functionality that does the
- right thing.
- .
- This flavour is suitable for the Hildon Desktop; for other desktop systems
- such as GNOME, see the tasks package.
 
 Package: tasks
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-data-server
-Conflicts: tasks-hildon
 Description: a simple to do manager
  Tasks is a simple To Do manager, using GTK+ and libecal.  It eschews
  complicated features for a simple interface and functionality that does the
  right thing.
- .
- This flavour is suitable for desktop systems such as GNOME; for the Hildon
- flavour of Tasks, see the tasks-hildon package.
-
-Package: tasks-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: tasks (= ${binary:Version}), ${misc:Depends}
-Description: a simple to do manager (debug symbols)
- Tasks is a simple To Do manager, using GTK+ and libecal.  It eschews
- complicated features for a simple interface and functionality that does the
- right thing.
- .
- This package contains the debugging symbols.

Added: packages/unstable/tasks/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tasks/debian/control.in?rev=31055&op=file
==============================================================================
--- packages/unstable/tasks/debian/control.in (added)
+++ packages/unstable/tasks/debian/control.in [utf-8] Wed Oct 26 10:46:39 2011
@@ -1,0 +1,23 @@
+Source: tasks
+Section: gnome
+Priority: optional
+Maintainer: Ross Burton <ross at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7),
+               gnome-pkg-tools,
+               intltool,
+               libecal1.2-dev,
+               libgtk2.0-dev,
+               libdbus-1-dev,
+               dpkg-dev (>= 1.13.19)
+Standards-Version: 3.8.2
+
+Package: tasks
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         evolution-data-server
+Description: a simple to do manager
+ Tasks is a simple To Do manager, using GTK+ and libecal.  It eschews
+ complicated features for a simple interface and functionality that does the
+ right thing.

Modified: packages/unstable/tasks/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tasks/debian/rules?rev=31055&op=diff
==============================================================================
--- packages/unstable/tasks/debian/rules [utf-8] (original)
+++ packages/unstable/tasks/debian/rules [utf-8] Wed Oct 26 10:46:39 2011
@@ -1,55 +1,8 @@
 #!/usr/bin/make -f
 
-# build each flavor in a different dir
-BUILDBASEDIR := $(CURDIR)/debian/build
-DEB_BUILDDIR := $(BUILDBASEDIR)/standard
-DEB_BUILDDIR_tasks-hildon := $(BUILDBASEDIR)/hildon
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
-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/cdbs/1/rules/utils.mk
-
-LDFLAGS += -Wl,-O1 -Wl,--as-needed
-
-# install each build flavor into a different dir
-INSTALLBASEDIR := $(CURDIR)/debian/tmp
-DEB_DESTDIR := $(INSTALLBASEDIR)/standard
-DEB_DESTDIR_tasks-hildon := $(INSTALLBASEDIR)/hildon
-# and teach dh_install about it
-DEB_DH_INSTALL_ARGS = --sourcedir=$(if $(findstring tasks-hildon,$(cdbs_curpkg)),$(DEB_DESTDIR_tasks-hildon),$(DEB_DESTDIR))
-
-# Hildon flavor flags
-DEB_CONFIGURE_HILDON_FLAGS += --enable-hildon
-
-common-build-arch::
-	# build a pot from srcidr with langpack.mk if available; intltool
-	# doesn't allow updates in builddir as it needs POTFILES.in and wont
-	# look up sources in srcdir if called from builddir; LP #188690
-	-$(MAKE) -f debian/rules langpack-mk-update-pot DEB_BUILDDIR=$(DEB_SRCDIR)
-
-clean::
-	rm -f po/tasks.pot
-
-configure/tasks-hildon:: $(DEB_BUILDDIR_tasks-hildon)/config.status
-$(DEB_BUILDDIR_tasks-hildon)/config.status:
-	cd $(DEB_BUILDDIR_tasks-hildon) && \
-		$(DEB_CONFIGURE_SCRIPT_ENV) \
-			$(DEB_CONFIGURE_SCRIPT) \
-				$(DEB_CONFIGURE_NORMAL_ARGS) \
-				$(cdbs_configure_flags) \
-				$(DEB_CONFIGURE_EXTRA_FLAGS) \
-				$(DEB_CONFIGURE_USER_FLAGS) \
-				$(DEB_CONFIGURE_HILDON_FLAGS)
-
-build/tasks-hildon::
-	make -C $(DEB_BUILDDIR_tasks-hildon)
-
-install/tasks-hildon::
-	make -C $(DEB_BUILDDIR_tasks-hildon) install DESTDIR=$(DEB_DESTDIR_tasks-hildon)
-
-clean::
-	rm -rf $(BUILDBASEDIR)
-
-common-binary-predeb-arch:: list-missing
-
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed

Modified: packages/unstable/tasks/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/tasks/debian/watch?rev=31055&op=diff
==============================================================================
--- packages/unstable/tasks/debian/watch [utf-8] (original)
+++ packages/unstable/tasks/debian/watch [utf-8] Wed Oct 26 10:46:39 2011
@@ -1,2 +1,2 @@
 version=3
-http://pimlico-project.org/sources/tasks/tasks-(.*)\.tar\.gz
+http://download.gnome.org/sources/tasks/.*/tasks-(.*)\.tar\.bz2




More information about the pkg-gnome-commits mailing list