r19899 - in /desktop/unstable/sabayon/debian: TODO.Debian changelog control control.in copyright patches/04_ignore_locale_errors.patch patches/40_force-python2.5-build.patch patches/41_force-python2.5-execution.patch watch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue May 5 17:30:17 UTC 2009 

Author: joss
Date: Tue May  5 17:30:16 2009
New Revision: 19899

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19899
Log:
* New upstream release.
* 04_ignore_locale_errors.patch:
  - Refresh patch for new upstream release.
* 40_force-python2.5-build.patch, 41_force-python2.5-execution.patch:
  - Remove them, Debian has python2.5 as default Python interpreter.
* debian/copyright:
  - Add missing copyright holders.
  - Add missing upstream authors.
  - Software is released under GPLv2, adjust link to common-licenses.
  - Replace (C) with ©.
* debian/control, debian/control.in:
  + Adhere to Debian Python policy:
    - Build-depend on cdbs (>= 0.4.49) and debhelper (>= 5.0.38).
    - Require python-support to be >= 0.5.3.
    - Bump XS-Python-Version to >= 2.5, since sabayon will not work
      with older Python versions.
  + Bump Standards-Version to 3.8.1, no changes required.
  + Remove dependency on python-gamin, sabayon does not use gamin
    hooks anymore in favour of gnome-vfs.
  + Build-depend on python-xdg and intltool (>= 0.40.0).
* debian/watch:
  - Upstream has 2.25.0 as stable, adjust watch file to let uscan
    recognise such version.
* debian/TODO:
  - python-gamin support has been replaced by gnome-vfs, remove the
    correspondent item from the list.

Modified:
    desktop/unstable/sabayon/debian/TODO.Debian
    desktop/unstable/sabayon/debian/changelog
    desktop/unstable/sabayon/debian/control
    desktop/unstable/sabayon/debian/control.in
    desktop/unstable/sabayon/debian/copyright
    desktop/unstable/sabayon/debian/patches/04_ignore_locale_errors.patch
    desktop/unstable/sabayon/debian/patches/40_force-python2.5-build.patch
    desktop/unstable/sabayon/debian/patches/41_force-python2.5-execution.patch
    desktop/unstable/sabayon/debian/watch

Modified: desktop/unstable/sabayon/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/TODO.Debian?rev=19899&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/TODO.Debian (original)
+++ desktop/unstable/sabayon/debian/TODO.Debian Tue May  5 17:30:16 2009
@@ -1,2 +1,1 @@
 * Check whether this complies with Debian's GConf layout. (idea of Joss)
-* Rewrite code relying on python-gamin to use gnome-vfs instead. (idea of Joss)

Modified: desktop/unstable/sabayon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/changelog?rev=19899&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/changelog (original)
+++ desktop/unstable/sabayon/debian/changelog Tue May  5 17:30:16 2009
@@ -1,3 +1,34 @@
+sabayon (2.25.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * 04_ignore_locale_errors.patch:
+    - Refresh patch for new upstream release.
+  * 40_force-python2.5-build.patch, 41_force-python2.5-execution.patch:
+    - Remove them, Debian has python2.5 as default Python interpreter.
+  * debian/copyright:
+    - Add missing copyright holders.
+    - Add missing upstream authors.
+    - Software is released under GPLv2, adjust link to common-licenses.
+    - Replace (C) with ©.
+  * debian/control, debian/control.in:
+    + Adhere to Debian Python policy:
+      - Build-depend on cdbs (>= 0.4.49) and debhelper (>= 5.0.38).
+      - Require python-support to be >= 0.5.3.
+      - Bump XS-Python-Version to >= 2.5, since sabayon will not work
+        with older Python versions.
+    + Bump Standards-Version to 3.8.1, no changes required.
+    + Remove dependency on python-gamin, sabayon does not use gamin
+      hooks anymore in favour of gnome-vfs.
+    + Build-depend on python-xdg and intltool (>= 0.40.0).
+  * debian/watch:
+    - Upstream has 2.25.0 as stable, adjust watch file to let uscan
+      recognise such version.
+  * debian/TODO:
+    - python-gamin support has been replaced by gnome-vfs, remove the
+      correspondent item from the list.
+
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Tue, 05 May 2009 19:01:23 +0200
+
 sabayon (2.22.0-1) unstable; urgency=low
 
   * New upstream release

Modified: desktop/unstable/sabayon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/control?rev=19899&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/control (original)
+++ desktop/unstable/sabayon/debian/control Tue May  5 17:30:16 2009
@@ -4,21 +4,23 @@
 Maintainer: Alan Baghumian <alan at technotux.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
 Build-Depends: autotools-dev,
-               debhelper (>= 5.0.37.2),
-               cdbs,
+               debhelper (>= 5.0.38),
+               cdbs (>= 0.4.49),
                gnome-pkg-tools,
                python2.5-dev,
                libpango1.0-dev,
                libgtk2.0-dev,
                python-gtk2-dev,
                python-gobject-dev (>= 2.12.0),
+               python-xdg,
                libxt-dev,
                libxml-parser-perl,
                xnest,
-               python-support (>= 0.3)
+               intltool (>= 0.40.0),
+               python-support (>= 0.5.3)
 Homepage: http://live.gnome.org/Sabayon
-Standards-Version: 3.7.3
-XS-Python-Version: >= 2.4
+Standards-Version: 3.8.1
+XS-Python-Version: >= 2.5
 
 Package: sabayon
 Architecture: any
@@ -27,7 +29,6 @@
          ${misc:Depends},
          python-gtk2 (>= 2.5.3),
          python-gnome2 (>= 2.6.0),
-         python-gamin,
          python-libxml2,
          xnest,
          gconf2 (>=  2.10.0-0ubuntu2),

Modified: desktop/unstable/sabayon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/control.in?rev=19899&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/control.in (original)
+++ desktop/unstable/sabayon/debian/control.in Tue May  5 17:30:16 2009
@@ -4,21 +4,23 @@
 Maintainer: Alan Baghumian <alan at technotux.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: autotools-dev,
-               debhelper (>= 5.0.37.2),
-               cdbs,
+               debhelper (>= 5.0.38),
+               cdbs (>= 0.4.49),
                gnome-pkg-tools,
                python2.5-dev,
                libpango1.0-dev,
                libgtk2.0-dev,
                python-gtk2-dev,
                python-gobject-dev (>= 2.12.0),
+               python-xdg,
                libxt-dev,
                libxml-parser-perl,
                xnest,
-               python-support (>= 0.3)
+               intltool (>= 0.40.0),
+               python-support (>= 0.5.3)
 Homepage: http://live.gnome.org/Sabayon
-Standards-Version: 3.7.3
-XS-Python-Version: >= 2.4
+Standards-Version: 3.8.1
+XS-Python-Version: >= 2.5
 
 Package: sabayon
 Architecture: any
@@ -27,7 +29,6 @@
          ${misc:Depends},
          python-gtk2 (>= 2.5.3),
          python-gnome2 (>= 2.6.0),
-         python-gamin,
          python-libxml2,
          xnest,
          gconf2 (>=  2.10.0-0ubuntu2),

Modified: desktop/unstable/sabayon/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/copyright?rev=19899&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/copyright (original)
+++ desktop/unstable/sabayon/debian/copyright Tue May  5 17:30:16 2009
@@ -4,13 +4,16 @@
 It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/sabayon/
 
 Copyright:
-        Copyright (C) 2005 Red Hat, Inc.
-        Copyright (C) 2005 Vincent Untz <vuntz at gnome.org>
-        Copyright (C) 2004 GNOME Foundation
+        Copyright © 2005 Red Hat, Inc.
+        Copyright © 2005 Vincent Untz <vuntz at gnome.org>
+        Copyright © 2004 GNOME Foundation
+        Copyright © 2006 Novell, Inc.
 
-Upstream Authors: Daniel Veillard <veillard at redhat.com>
-                  John Dennis <jdennis at redhat.com>
-                  Mark McLoughlin <markmc at redhat.com>
+Upstream Authors:
+        Daniel Veillard <veillard at redhat.com>
+        John Dennis <jdennis at redhat.com>
+        Mark McLoughlin <markmc at redhat.com>
+        Alexander Larsson <alexl at redhat.com>
 
 License:
 
@@ -29,4 +32,4 @@
    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'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.

Modified: desktop/unstable/sabayon/debian/patches/04_ignore_locale_errors.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/patches/04_ignore_locale_errors.patch?rev=19899&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/patches/04_ignore_locale_errors.patch (original)
+++ desktop/unstable/sabayon/debian/patches/04_ignore_locale_errors.patch Tue May  5 17:30:16 2009
@@ -1,6 +1,6 @@
 --- sabayon-2.21.0/lib/util.py	2008-01-20 00:49:27.000000000 +0000
 +++ sabayon-2.21.0/lib/util.py.new	2008-01-28 00:52:04.000000000 +0000
-@@ -114,7 +114,10 @@
+@@ -115,7 +115,10 @@
      util.init_gettext() at the entry point to any script and you'll be
      able to use _(), gettext(), and ngettext() to mark strings for
      translation."""

Modified: desktop/unstable/sabayon/debian/patches/40_force-python2.5-build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/patches/40_force-python2.5-build.patch?rev=19899&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/patches/40_force-python2.5-build.patch (original)
+++ desktop/unstable/sabayon/debian/patches/40_force-python2.5-build.patch Tue May  5 17:30:16 2009
@@ -1,27 +1,0 @@
-# Force to build with python 2.5, sabayon needs python 2.5 to
-# be executed correctly
-
-diff -urpN sabayon-2.20.1/aclocal.m4 sabayon-2.20.1.new/aclocal.m4
---- sabayon-2.20.1/aclocal.m4	2007-09-20 03:55:04.000000000 +0330
-+++ sabayon-2.20.1.new/aclocal.m4	2007-09-26 07:47:21.000000000 +0330
-@@ -8241,7 +8241,7 @@ AC_DEFUN([AM_PATH_PYTHON],
-   dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
-   dnl in 1.5.
-   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
--                    [python python2 python2.5 python2.4 python2.3 python2.2 dnl
-+                    [python2.5 python2.4 python2.3 python2.2 dnl
- python2.1 python2.0 python1.6 python1.5])
- 
-   m4_if([$1],[],[
-diff -urpN sabayon-2.20.1/configure sabayon-2.20.1.new/configure
---- sabayon-2.20.1/configure	2007-09-20 03:55:07.000000000 +0330
-+++ sabayon-2.20.1.new/configure	2007-09-26 07:46:56.000000000 +0330
-@@ -22025,7 +22025,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
- 
-         # Find any Python interpreter.
-     if test -z "$PYTHON"; then
--      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
-+      for ac_prog in python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2

Modified: desktop/unstable/sabayon/debian/patches/41_force-python2.5-execution.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/patches/41_force-python2.5-execution.patch?rev=19899&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/patches/41_force-python2.5-execution.patch (original)
+++ desktop/unstable/sabayon/debian/patches/41_force-python2.5-execution.patch Tue May  5 17:30:16 2009
@@ -1,30 +1,0 @@
-# Force to be executed with python 2.5, on Debian, /usr/bin/python still
-# points to python 2.4
-
-diff -urpN sabayon-2.20.1/admin-tool/sabayon sabayon-2.20.1.new/admin-tool/sabayon
---- sabayon-2.20.1/admin-tool/sabayon	2007-09-20 03:49:27.000000000 +0330
-+++ sabayon-2.20.1.new/admin-tool/sabayon	2007-09-26 07:49:17.000000000 +0330
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2.5
- # -*- mode: python -*-
- #
- # Copyright (C) 2005 Red Hat, Inc.
-diff -urpN sabayon-2.20.1/admin-tool/sabayon-apply sabayon-2.20.1.new/admin-tool/sabayon-apply
---- sabayon-2.20.1/admin-tool/sabayon-apply	2007-09-20 03:49:27.000000000 +0330
-+++ sabayon-2.20.1.new/admin-tool/sabayon-apply	2007-09-26 07:50:27.000000000 +0330
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2.5
- # -*- mode: python -*-
- #
- # Copyright (C) 2005 Red Hat, Inc.
-diff -urpN sabayon-2.20.1/admin-tool/sabayon-session sabayon-2.20.1.new/admin-tool/sabayon-session
---- sabayon-2.20.1/admin-tool/sabayon-session	2007-09-20 03:49:27.000000000 +0330
-+++ sabayon-2.20.1.new/admin-tool/sabayon-session	2007-09-26 07:50:42.000000000 +0330
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2.5
- # -*- mode: python -*-
- #
- # Copyright (C) 2005 Red Hat, Inc.

Modified: desktop/unstable/sabayon/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/watch?rev=19899&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/watch (original)
+++ desktop/unstable/sabayon/debian/watch Tue May  5 17:30:16 2009
@@ -1,2 +1,2 @@
 version=2
-http://ftp.gnome.org/pub/gnome/sources/sabayon/([\d\.]+)[02468]/sabayon-([\d\.]+)\.tar\.gz
+http://ftp.gnome.org/pub/gnome/sources/sabayon/([\d\.]+)[024568]/sabayon-([\d\.]+)\.tar\.gz

More information about the pkg-gnome-commits mailing list