r35657 - in /packages/experimental/gnome-clocks: ./ debian/changelog debian/compat debian/control debian/copyright debian/patches/ debian/patches/01_fix_images_dir.patch debian/patches/series debian/rules debian/watch
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Mon Sep 3 03:15:09 UTC 2012
Author: jbicha-guest
Date: Mon Sep 3 03:15:08 2012
New Revision: 35657
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35657
Log:
* Initial release
* TODO: figure out why Clocks can't find libcanberra.so
Added:
packages/experimental/gnome-clocks/
- copied from r35617, packages/experimental/jhbuild/
packages/experimental/gnome-clocks/debian/patches/
packages/experimental/gnome-clocks/debian/patches/01_fix_images_dir.patch
packages/experimental/gnome-clocks/debian/patches/series
Modified:
packages/experimental/gnome-clocks/debian/changelog
packages/experimental/gnome-clocks/debian/compat
packages/experimental/gnome-clocks/debian/control
packages/experimental/gnome-clocks/debian/copyright
packages/experimental/gnome-clocks/debian/rules
packages/experimental/gnome-clocks/debian/watch
Modified: packages/experimental/gnome-clocks/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-clocks/debian/changelog?rev=35657&op=diff
==============================================================================
--- packages/experimental/gnome-clocks/debian/changelog [utf-8] (original)
+++ packages/experimental/gnome-clocks/debian/changelog [utf-8] Mon Sep 3 03:15:08 2012
@@ -1,116 +1,6 @@
-jhbuild (3.5.3-1) UNRELEASED; urgency=low
+gnome-clocks (0.1.0-1) UNRELEASED; urgency=low
- * New upstream release.
+ * Initial release
+ * TODO: figure out why Clocks can't find libcanberra.so
- -- Jeremy Bicha <jbicha at ubuntu.com> Mon, 09 Jul 2012 22:45:36 -0400
-
-jhbuild (3.4.0-1) unstable; urgency=low
-
- * New upstream release.
- * Build-depend on yelp-tools instead of gnome-doc-utils
- * debian/control.in: Allow DM uploads
-
- -- Jeremy Bicha <jbicha at ubuntu.com> Thu, 19 Apr 2012 14:11:49 -0400
-
-jhbuild (3.2.1-1) unstable; urgency=low
-
- [ Jeremy Bicha ]
- * New upstream release.
- * Switch to dh_python2
- * Use 3.0 (quilt)
- * debian/control.in:
- - Bump debhelper minimum to 8 and Standards-Version to 3.9.3
- - Bump intltool minimum build-dependency
- - Update long description to mention Git (Closes: #597801)
- - Add Vcs and Homepage fields
- * debian/watch: Watch for .xz releases
-
- -- Jordi Mallach <jordi at debian.org> Wed, 28 Mar 2012 22:17:26 +0200
-
-jhbuild (2.29.2-2) unstable; urgency=low
-
- * debian/install:
- - Removed, let's not ship the modulesets and patches so that they
- are downloaded as needed from the intertubes, where they should be
- up to date.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org> Tue, 05 Oct 2010 20:40:09 +0200
-
-jhbuild (2.29.2-1) unstable; urgency=low
-
- * debian/patches/01_import_from_pkgdatadir.patch,
- debian/rules:
- - Remove hack to install the python modules in /usr/share/jhbuild
- and the patch to make jhbuild import them from that location.
- Set pythondir=/usr/share/jhbuild instead and pass it to make install.
- * New upstream release.
- * debian/watch: Also track unstable releases, jhbuild is mostly used
- to build unreleased software (like GNOME from master) so it makes sense
- to have the latest release that is updated for software changes.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org> Fri, 27 Nov 2009 13:01:16 +0100
-
-jhbuild (2.28.0-1) unstable; urgency=low
-
- [ Loic Minier ]
- * Cleanups.
- * Ship scripts.
- * Don't set GNOME_MODULE as it equals the name of the source package.
-
- [ Emilio Pozuelo Monfort ]
- * New upstream release. Closes: #524504.
- - Use 'git rev-parse' rather than 'git-rev-parse'. Closes: #544642.
- * Ship install-check. Closes: #441008.
- * Uploaders list regenerated. Closes: #523542, #554071.
- * debian/control.in,
- debian/rules:
- - Stop shipping a copy of subprocess.py. Require python >= 2.4.
- - Switch to python-support.
- * debian/control.in:
- - Bump Standards-Version to 3.8.3, no changes needed.
- - Build depend on intltool >= 0.35.0.
- - Build depend on pkg-config, gnome-doc-utils and rarian-compat to build
- the documentation.
- - Make jhbuild arch any since install-check is a binary. Depend on
- ${shlibs:Depends}.
- - Recommend, and not suggest, git-core. Also recommend mercurial.
- * debian/watch:
- - Added.
- * debian/patches/01_import_from_pkgdatadir.patch:
- - Added, import jhbuild from pkgdatadir if everything else fails.
- This way we can ship the jhbuild private modules in /usr/sharejhbuild.
- * debian/jhbuild.docs:
- - Removed, the necessary docs are now installed by the upstream Makefile.
- * debian/rules:
- - Include autotools.mk and gnome.mk.
- - Remove all the manual build process, autotools.mk does everything now.
- - Install the jhbuild modules in /usr/share/jhbuild.
- * debian/install:
- - Install the modulesets and patches from here since the upstream build
- system doesn't install them.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 09 Nov 2009 20:28:48 +0100
-
-jhbuild (0.0.svn.r1378-1) unstable; urgency=low
-
- * Build, install, and clean the user manual; build-depend on xmlto.
- * Add a README.Debian documenting:
- - The audience for and the risks with jhbuild.
- - The obsolescence of the user manual.
- - Some configuration tips.
- - Why scripts/ isn't shipped.
- - Disk space usage.
- * Drop most TODOs from debian/rules.
- * New upstream snapshot to fix gnome-2.16 and gnome-2.18 build failures with
- Ekiga/CVS which needs a fresher pwlib and opal: now use tarballs instead.
- - Drop .cvsignore handling as these were removed upstream.
- * Fix doc build to not run multiple times.
- * New upstream snapshot to use the new gucharmap gnome-2-16 branch.
-
- -- Loic Minier <lool at dooz.org> Sat, 17 Feb 2007 07:47:34 +0100
-
-jhbuild (0.0.svn.r1372-1) unstable; urgency=low
-
- * Initial upload to Debian; closes: #410881.
-
- -- Loic Minier <lool at dooz.org> Tue, 13 Feb 2007 19:37:29 +0100
+ -- Jeremy Bicha <jbicha at ubuntu.com> Sun, 02 Sep 2012 20:40:09 -0400
Modified: packages/experimental/gnome-clocks/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-clocks/debian/compat?rev=35657&op=diff
==============================================================================
--- packages/experimental/gnome-clocks/debian/compat [utf-8] (original)
+++ packages/experimental/gnome-clocks/debian/compat [utf-8] Mon Sep 3 03:15:08 2012
@@ -1,1 +1,1 @@
-8
+9
Modified: packages/experimental/gnome-clocks/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-clocks/debian/control?rev=35657&op=diff
==============================================================================
--- packages/experimental/gnome-clocks/debian/control [utf-8] (original)
+++ packages/experimental/gnome-clocks/debian/control [utf-8] Mon Sep 3 03:15:08 2012
@@ -1,54 +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: gnome-clocks
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jeremy Bicha <jbicha at ubuntu.com>
+Build-Depends: debhelper (>= 9),
+ python (>= 2.6.6-3~),
+ python-distutils-extra
+Standards-Version: 3.9.3
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/experimental/gnome-clocks
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/experimental/gnome-clocks/
+Homepage: https://live.gnome.org/GnomeClocks
-Source: jhbuild
-Section: devel
-Priority: optional
-Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>
-DM-Upload-Allowed: yes
-Build-Depends: cdbs (>= 0.4.90~),
- debhelper (>= 8),
- gnome-pkg-tools,
- intltool (>= 0.40.0),
- pkg-config,
- rarian-compat,
- yelp-tools,
- python (>= 2.6.6-3~)
-Standards-Version: 3.9.3
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/jhbuild
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/jhbuild/
-Homepage: https://live.gnome.org/Jhbuild
-
-Package: jhbuild
-Architecture: any
+Package: gnome-clocks
+Architecture: all
Depends: ${shlibs:Depends},
${misc:Depends},
- ${python:Depends}
-Recommends: bzr,
- cvs,
- git-core,
- mercurial,
- subversion,
- patch,
- wget | curl,
- autoconf,
- automake,
- gettext,
- pkg-config
-Suggests: tla,
- darcs,
- python-pygraphviz
-Description: flexible build script for package collections
- Jhbuild is a program that can be used to pull a number of modules from
- Git, CVS, Subversion, Bazaar and other types of repositories or from
- tarballs and build them in the correct order. Unlike some build
- scripts, jhbuild lets you specify what modules you want built and it
- will then go and build those modules plus dependencies.
- .
- Although jhbuild was originally developed to build GNOME, it has
- since been extended to work with other projects as well.
- Extending it to handle new modules is usually trivial assuming the
- build infrastructure matches the other modules it handles.
+ ${python:Depends},
+ gir1.2-clutter-1.0,
+ gir1.2-gweather-3.0,
+ gir1.2-gtkclutter-1.0,
+ gir1.2-notify-0.7,
+ libcanberra-gtk3-0,
+ python-cairo
+Description: Simple GNOME app to show the time, date, and alarms
+ GNOME Clocks is a simple application to show the time and date in multiple
+ locations and to set alarms.
Modified: packages/experimental/gnome-clocks/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-clocks/debian/copyright?rev=35657&op=diff
==============================================================================
--- packages/experimental/gnome-clocks/debian/copyright [utf-8] (original)
+++ packages/experimental/gnome-clocks/debian/copyright [utf-8] Mon Sep 3 03:15:08 2012
@@ -1,88 +1,23 @@
-This package was debianized by Loïc Minier <lool at dooz.org> on
-Tue, 13 Feb 2007 21:16:05 +0100 for Debian.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gnome-clocks
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-clocks/
-It was downloaded from <http://svn.gnome.org/svn/jhbuild/trunk> via SVN.
+Files: *
+Copyright: 2011-2012 Collabora, Ltd.
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-Upstream Authors and Copyright Holders:
- Copyright (C) 2001-2006 James Henstridge
- Copyright (C) 2003-2004 Seth Nickell
- Copyright (c) 2003-2004 by Peter Astrand <astrand at lysator.liu.se>
- Copyright (C) 2006-2007 Eric Anholt
- Copyright (C) 2003-2004 Marco Pesenti Gritti
- Copyright (c) 2001-2006 Gregory P. Ward.
- Copyright (c) 2002-2006 Python Software Foundation.
-
-Unless otherwise specified, files are under the GNU General Public License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-jhbuild/cut_n_paste/optparse.py is derived from the Optik SourceForge project
-and is under a BSD-style license:
-"""
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- * Neither the name of the author nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"""
-
-jhbuild/cut_n_paste/subprocess.py is under a MIT-style license:
-"""
-# By obtaining, using, and/or copying this software and/or its
-# associated documentation, you agree that you have read, understood,
-# and will comply with the following terms and conditions:
-#
-# Permission to use, copy, modify, and distribute this software and
-# its associated documentation for any purpose and without fee is
-# hereby granted, provided that the above copyright notice appears in
-# all copies, and that both that copyright notice and this permission
-# notice appear in supporting documentation, and that the name of the
-# author not be used in advertising or publicity pertaining to
-# distribution of the software without specific, written prior
-# permission.
-#
-# THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""
-
Added: packages/experimental/gnome-clocks/debian/patches/01_fix_images_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-clocks/debian/patches/01_fix_images_dir.patch?rev=35657&op=file
==============================================================================
--- packages/experimental/gnome-clocks/debian/patches/01_fix_images_dir.patch (added)
+++ packages/experimental/gnome-clocks/debian/patches/01_fix_images_dir.patch [utf-8] Mon Sep 3 03:15:08 2012
@@ -1,0 +1,43 @@
+From f9fd6e54006a4a4d16b9259583ab08319ae21b1d Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Sun, 2 Sep 2012 22:32:54 -0400
+Subject: [PATCH] Images aren't actually installed in
+ /usr/share/gnome-clocks/pixmaps
+
+Fixes this crash:
+
+Traceback (most recent call last):
+ File "/usr/lib/python2.7/dist-packages/gnomeclocks/app.py", line 397, in do_activate
+ self.win = Window(self)
+ File "/usr/lib/python2.7/dist-packages/gnomeclocks/app.py", line 65, in __init__
+ self.alarm = Alarm()
+ File "/usr/lib/python2.7/dist-packages/gnomeclocks/alarm.py", line 340, in __init__
+ self.load_alarms()
+ File "/usr/lib/python2.7/dist-packages/gnomeclocks/alarm.py", line 388, in load_alarms
+ self.add_alarm_widget(alarm)
+ File "/usr/lib/python2.7/dist-packages/gnomeclocks/alarm.py", line 399, in add_alarm_widget
+ widget = AlarmWidget(self, alarm, alert)
+ File "/usr/lib/python2.7/dist-packages/gnomeclocks/alarm.py", line 297, in __init__
+ self.drawing.render(timestr, img, isDay, repeat)
+ File "/usr/lib/python2.7/dist-packages/gnomeclocks/widgets.py", line 37, in render
+ self.surface = cairo.ImageSurface.create_from_png(img)
+cairo.Error: file not found
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683233
+---
+ gnome-clocks | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gnome-clocks b/gnome-clocks
+index ebae4a6..287db9e 100755
+--- a/gnome-clocks
++++ b/gnome-clocks
+@@ -33,7 +33,7 @@ if os.path.exists("gnome-clocks.doap"):
+ else:
+ ENV_PATHS = {
+ "GNOME_CLOCKS_DATA_PATH": "/usr/share/gnome-clocks/",
+- "GNOME_CLOCKS_IMAGE_PATH": "/usr/share/gnome-clocks/pixmaps/",
++ "GNOME_CLOCKS_IMAGE_PATH": "/usr/share/gnome-clocks/",
+ "GNOME_CLOCKS_LOCALE_PATH": "/usr/share/locale/",
+ }
+
Added: packages/experimental/gnome-clocks/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-clocks/debian/patches/series?rev=35657&op=file
==============================================================================
--- packages/experimental/gnome-clocks/debian/patches/series (added)
+++ packages/experimental/gnome-clocks/debian/patches/series [utf-8] Mon Sep 3 03:15:08 2012
@@ -1,0 +1,1 @@
+01_fix_images_dir.patch
Modified: packages/experimental/gnome-clocks/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-clocks/debian/rules?rev=35657&op=diff
==============================================================================
--- packages/experimental/gnome-clocks/debian/rules [utf-8] (original)
+++ packages/experimental/gnome-clocks/debian/rules [utf-8] Mon Sep 3 03:15:08 2012
@@ -1,18 +1,4 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/autotools.mk
-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/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-doc-installation=yes
-
-DEB_MAKE_ENVVARS += MAKEFLAGS=pythondir=/usr/share/jhbuild
-
-install/jhbuild::
- rm -r debian/jhbuild/usr/share/jhbuild/jhbuild/cut_n_paste
-
-binary-install/jhbuild::
- dh_python2 -p$(cdbs_curpkg)
+%:
+ dh $@ --with python2
Modified: packages/experimental/gnome-clocks/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-clocks/debian/watch?rev=35657&op=diff
==============================================================================
--- packages/experimental/gnome-clocks/debian/watch [utf-8] (original)
+++ packages/experimental/gnome-clocks/debian/watch [utf-8] Mon Sep 3 03:15:08 2012
@@ -1,2 +1,2 @@
version=3
-http://ftp.gnome.org/pub/GNOME/sources/jhbuild/([\d\.]+)/jhbuild-([\d\.]+)\.tar\.xz
+http://download.gnome.org/sources/gnome-clocks/([0-9.]+)/gnome-clocks-([0-9.]+)\.tar\.xz
More information about the pkg-gnome-commits
mailing list