[Python-apps-commits] r743 - in packages/emesene/trunk/debian (4 files)

[pochu-guest at users.alioth.debian.org]

    Date: Saturday, March 1, 2008 @ 20:18:05
  Author: pochu-guest
Revision: 743

* debian/control:
  - Removed python-xml from Build-Depends. It's included in python >= 2.4.
    Closes: #468588.
* debian/copyright:
  - Add translations copyright info.
* debian/patches/01_setup_py_update_get_orig_source.patch:
  - Updated to apply with the new snapshot.

Modified:
  packages/emesene/trunk/debian/changelog
  packages/emesene/trunk/debian/copyright
  packages/emesene/trunk/debian/patches/01_setup_py_update_get_orig_source.patch
  packages/emesene/trunk/debian/rules

Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog	2008-03-01 18:43:04 UTC (rev 742)
+++ packages/emesene/trunk/debian/changelog	2008-03-01 20:18:05 UTC (rev 743)
@@ -1,10 +1,15 @@
-emesene (1.0~r1122-1) unstable; urgency=low
+emesene (1.0~r1126-1) unstable; urgency=low
 
   * New svn snapshot.
-  * Removed python-xml from Build-Depends. It's included in python >= 2.4.
-    Closes: #468588.
+  * debian/control:
+    - Removed python-xml from Build-Depends. It's included in python >= 2.4.
+      Closes: #468588.
+  * debian/copyright:
+    - Add translations copyright info.
+  * debian/patches/01_setup_py_update_get_orig_source.patch:
+    - Updated to apply with the new snapshot.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 01 Mar 2008 17:54:04 +0100
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 01 Mar 2008 21:17:06 +0100
 
 emesene (1.0~r1015-1) unstable; urgency=low
 

Modified: packages/emesene/trunk/debian/copyright
===================================================================
--- packages/emesene/trunk/debian/copyright	2008-03-01 18:43:04 UTC (rev 742)
+++ packages/emesene/trunk/debian/copyright	2008-03-01 20:18:05 UTC (rev 743)
@@ -175,5 +175,27 @@
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+po/* are released under the same license as emesene (GPL2+) and the
+copyright owners are their respective translators.
+
+    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'.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 The Debian packaging is (C) 2007-2008, Emilio Pozuelo Monfort <pochu at ubuntu.com> and
 is licensed under the GPL, see above.

Modified: packages/emesene/trunk/debian/patches/01_setup_py_update_get_orig_source.patch
===================================================================
--- packages/emesene/trunk/debian/patches/01_setup_py_update_get_orig_source.patch	2008-03-01 18:43:04 UTC (rev 742)
+++ packages/emesene/trunk/debian/patches/01_setup_py_update_get_orig_source.patch	2008-03-01 20:18:05 UTC (rev 743)
@@ -1,23 +1,22 @@
-diff -ruN emesene-1.0~r1015/setup.py emesene-1.0~r1015.new/setup.py
---- emesene-1.0~r1015/setup.py	2008-02-12 21:33:18.000000000 +0100
-+++ emesene-1.0~r1015.new/setup.py	2008-02-13 13:02:24.000000000 +0100
-@@ -2,7 +2,7 @@
- 
+--- emesene-1.0~r1126/setup.py.old	2008-03-01 21:15:00.000000000 +0100
++++ emesene-1.0~r1126/setup.py	2008-03-01 21:15:13.000000000 +0100
+@@ -3,7 +3,7 @@
  from distutils.core import setup
+ import glob, os.path
  
 -from emesenecommon import APP_VERSION
 +from src.emesenecommon import APP_VERSION
  
- setup(name         = 'emesene',
-       version      = APP_VERSION,
-@@ -13,8 +13,8 @@
+ # From apport's setup.py
+ mo_files = []
+@@ -22,8 +22,8 @@ setup(name         = 'emesene',
        license      = 'GNU GPL 2',
        requires     = ["gtk"],
        platforms    = ["Platform Independent"],
 -      packages     = ['', 'abstract', 'emesenelib', 'plugins_base', 'plugins_base.currentSong'],
--      package_data = {'': ['conversation_themes/*/*', 'po/*/LC_MESSAGES/*.mo',
+-      package_data = {'': ['conversation_themes/*/*', 'smilies/*/*',
 +      packages     = ['src', 'src.abstract', 'src.emesenelib', 'src.plugins_base', 'src.plugins_base.currentSong'],
-+      package_data = {'src': ['conversation_themes/*/*', 'po/*/LC_MESSAGES/*.mo',
-                                   'smilies/*/*', 'sound_themes/*/*', 'themes/*/*', 'hotmlog.htm']},
++      package_data = {'src': ['conversation_themes/*/*', 'smilies/*/*',
+                            'sound_themes/*/*', 'themes/*/*', 'hotmlog.htm']},
        scripts      = ['emesene'],
        data_files   = [('share/pixmaps', ['misc/emesene.png']),

Modified: packages/emesene/trunk/debian/rules
===================================================================
--- packages/emesene/trunk/debian/rules	2008-03-01 18:43:04 UTC (rev 742)
+++ packages/emesene/trunk/debian/rules	2008-03-01 20:18:05 UTC (rev 743)
@@ -9,7 +9,7 @@
 
 DEB_PYTHON_INSTALL_ARGS_ALL = --install-lib=usr/share/emesene
 
-SVN_REVISION = 1123
+SVN_REVISION = 1126
 
 install/emesene::
 	install -m755 $(CURDIR)/debian/emesene-launcher $(CURDIR)/debian/emesene/usr/bin/emesene