[Python-apps-commits] r4466 - in packages/emesene/trunk/debian (2 files)

[pochu at users.alioth.debian.org]

    Date: Wednesday, January 6, 2010 @ 22:25:43
  Author: pochu
Revision: 4466

* New upstream release.
  - debian/patches/20_dont_build_own_libmimic.patch:
    + Refreshed.

Modified:
  packages/emesene/trunk/debian/changelog
  packages/emesene/trunk/debian/patches/20_dont_build_own_libmimic.patch

Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog	2010-01-06 14:27:02 UTC (rev 4465)
+++ packages/emesene/trunk/debian/changelog	2010-01-06 22:25:43 UTC (rev 4466)
@@ -1,3 +1,11 @@
+emesene (1.6-1) unstable; urgency=low
+
+  * New upstream release.
+    - debian/patches/20_dont_build_own_libmimic.patch:
+      + Refreshed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 06 Jan 2010 23:25:28 +0100
+
 emesene (1.5.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/emesene/trunk/debian/patches/20_dont_build_own_libmimic.patch
===================================================================
--- packages/emesene/trunk/debian/patches/20_dont_build_own_libmimic.patch	2010-01-06 14:27:02 UTC (rev 4465)
+++ packages/emesene/trunk/debian/patches/20_dont_build_own_libmimic.patch	2010-01-06 22:25:43 UTC (rev 4466)
@@ -5,28 +5,30 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -4,18 +4,6 @@
- import glob, os.path
+@@ -5,18 +5,6 @@
  import sys
  
--for arg in sys.argv:
--    if arg == 'install': 
--        print 'Hello.\nYou are trying to do a system-wide install of emesene '\
--              'using this script, which is a very bad thing to do.\n'\
--              'Seriously, you do NOT want to do this, since it can break '\
--              'other python apps, and emesene too!\n'\
--              'Follow my advice: just run the \"emesene\" script that is '\
--              'in this very same directory and you\'re done. emesene is running '\
--              'and your system is safe. It\'s a win-win, don\'t you think?\n'\
--              'Thanks for trying emesene.'
--        quit()
--        
- # From apport's setup.py
- mo_files = []
- for filepath in glob.glob("po/*/LC_MESSAGES/*.mo"):
-@@ -48,5 +36,4 @@
-                       ('share/icons/hicolor/scalable/apps', ['misc/emesene.svg']),
-                       ('share/man/man1', ['misc/emesene.1']),
-                       ('share/applications', ['misc/emesene.desktop'])] + mo_files,
--      ext_modules = [libmimic_module]
-       )
+ if os.name == 'posix':
+-    for arg in sys.argv:
+-        if arg == 'install': 
+-            print 'Hello.\nYou are trying to do a system-wide install of emesene '\
+-                  'using this script, which is a very bad thing to do.\n'\
+-                  'Seriously, you do NOT want to do this, since it can break '\
+-                  'other python apps, and emesene too!\n'\
+-                  'Follow my advice: just run the \"emesene\" script that is '\
+-                  'in this very same directory and you\'re done. emesene is running '\
+-                  'and your system is safe. It\'s a win-win, don\'t you think?\n'\
+-                  'Thanks for trying emesene.'
+-            quit()
+-            
+     # From apport's setup.py
+     mo_files = []
+     for filepath in glob.glob("po/*/LC_MESSAGES/*.mo"):
+@@ -50,7 +38,6 @@
+                           ('share/icons/hicolor/scalable/apps', ['misc/emesene.svg']),
+                           ('share/man/man1', ['misc/emesene.1']),
+                           ('share/applications', ['misc/emesene.desktop'])] + mo_files,
+-          ext_modules = [libmimic_module]
+           )
+ elif os.name == 'nt':
+