r15530 - in /desktop/unstable/sabayon/debian: changelog control control.in patches/01_desktop.patch patches/02_script-not-executable.patch patches/04_ignore_locale_errors.patch

Mon Apr 7 15:55:37 UTC 2008

Author: ember-guest
Date: Mon Apr  7 15:55:37 2008
New Revision: 15530

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15530
Log:
* New upstream release
  - 01_desktop.patch: Updated
  - 02_script-not-executable.patch: Dropped, merged upstream
* debian/patches/04_ignore_locale_errors.patch:
  - Added to catch and ignore exceptions from locale.setlocale,
    taken from Ubuntu
* debian/control{.in}:
  - Bump Standars-Version 3.7.3
  - Move pseudo-homepage to Homepage field

Added:
    desktop/unstable/sabayon/debian/patches/04_ignore_locale_errors.patch
Removed:
    desktop/unstable/sabayon/debian/patches/02_script-not-executable.patch
Modified:
    desktop/unstable/sabayon/debian/changelog
    desktop/unstable/sabayon/debian/control
    desktop/unstable/sabayon/debian/control.in
    desktop/unstable/sabayon/debian/patches/01_desktop.patch

Modified: desktop/unstable/sabayon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/changelog?rev=15530&op=diff
==============================================================================

--- desktop/unstable/sabayon/debian/changelog (original)
+++ desktop/unstable/sabayon/debian/changelog Mon Apr  7 15:55:37 2008
@@ -1,3 +1,17 @@
+sabayon (2.22.0-1) unstable; urgency=low
+
+  * New upstream release
+    - 01_desktop.patch: Updated
+    - 02_script-not-executable.patch: Dropped, merged upstream
+  * debian/patches/04_ignore_locale_errors.patch:
+    - Added to catch and ignore exceptions from locale.setlocale,
+      taken from Ubuntu
+  * debian/control{.in}:
+    - Bump Standars-Version 3.7.3
+    - Move pseudo-homepage to Homepage field
+ 
+ -- Pedro Fragoso <emberez at gmail.com>  Mon, 07 Apr 2008 01:42:15 +0100
+
 sabayon (2.20.1-2) unstable; urgency=low
 
   [ Loic Minier ]

Modified: desktop/unstable/sabayon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/control?rev=15530&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/control (original)
+++ desktop/unstable/sabayon/debian/control Mon Apr  7 15:55:37 2008
@@ -16,7 +16,8 @@
                libxml-parser-perl,
                xnest,
                python-support (>= 0.3)
-Standards-Version: 3.7.2
+Homepage: http://live.gnome.org/Sabayon
+Standards-Version: 3.7.3
 XS-Python-Version: >= 2.4
 
 Package: sabayon
@@ -43,6 +44,3 @@
  Sabayon launches profiles in an Xnest window. Any changes you make in the
  Xnest window are saved back to the profile file, which can then be applied
  to user's accounts.
- .
- Homepage: http://live.gnome.org/Sabayon
-

Modified: desktop/unstable/sabayon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/control.in?rev=15530&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/control.in (original)
+++ desktop/unstable/sabayon/debian/control.in Mon Apr  7 15:55:37 2008
@@ -16,7 +16,8 @@
                libxml-parser-perl,
                xnest,
                python-support (>= 0.3)
-Standards-Version: 3.7.2
+Homepage: http://live.gnome.org/Sabayon
+Standards-Version: 3.7.3
 XS-Python-Version: >= 2.4
 
 Package: sabayon
@@ -43,6 +44,3 @@
  Sabayon launches profiles in an Xnest window. Any changes you make in the
  Xnest window are saved back to the profile file, which can then be applied
  to user's accounts.
- .
- Homepage: http://live.gnome.org/Sabayon
-

Modified: desktop/unstable/sabayon/debian/patches/01_desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/patches/01_desktop.patch?rev=15530&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/patches/01_desktop.patch (original)
+++ desktop/unstable/sabayon/debian/patches/01_desktop.patch Mon Apr  7 15:55:37 2008
@@ -1,11 +1,11 @@
-diff -urpN sabayon-2.20.1/admin-tool/sabayon.desktop.in sabayon-2.20.1.new/admin-tool/sabayon.desktop.in
---- sabayon-2.20.1/admin-tool/sabayon.desktop.in	2007-09-20 03:49:27.000000000 +0330
-+++ sabayon-2.20.1.new/admin-tool/sabayon.desktop.in	2007-09-25 18:55:21.000000000 +0330
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
+diff -Nur -x '*.orig' -x '*~' sabayon-2.22.0/admin-tool/sabayon.desktop.in sabayon-2.22.0.new/admin-tool/sabayon.desktop.in
+--- sabayon-2.22.0/admin-tool/sabayon.desktop.in	2008-03-11 21:23:02.000000000 +0000
++++ sabayon-2.22.0.new/admin-tool/sabayon.desktop.in	2008-03-11 23:11:58.000000000 +0000
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
  _Name=User Profile Editor
  _Comment=Establish and Edit Profiles for Users
--Exec=gnomesu sabayon
+-Exec=sabayon
 +Exec=gksu sabayon
  Terminal=false
  Type=Application

Added: 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=15530&op=file
==============================================================================
--- desktop/unstable/sabayon/debian/patches/04_ignore_locale_errors.patch (added)
+++ desktop/unstable/sabayon/debian/patches/04_ignore_locale_errors.patch Mon Apr  7 15:55:37 2008
@@ -1,0 +1,14 @@
+--- 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 @@
+     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."""
+-    locale.setlocale (locale.LC_ALL, "")
++    try:
++         locale.setlocale (locale.LC_ALL, "")
++    except locale.Error:
++         pass
+     gettext.install (PACKAGE, LOCALEDIR)
+     # Python 2.4 compatibility
+     import __builtin__


