[Python-apps-commits] r8504 - in packages/pyspread/trunk/debian (4 files)

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

    Date: Saturday, April 21, 2012 @ 09:55:16
  Author: anoteng-guest
Revision: 8504

Change directory layout

Modified:
  packages/pyspread/trunk/debian/changelog
  packages/pyspread/trunk/debian/links
  packages/pyspread/trunk/debian/patches/change_default_paths.patch
  packages/pyspread/trunk/debian/rules

Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog	2012-04-21 02:26:24 UTC (rev 8503)
+++ packages/pyspread/trunk/debian/changelog	2012-04-21 09:55:16 UTC (rev 8504)
@@ -2,4 +2,4 @@
 
   * Initial release. (Closes: #601950)
 
- -- Andreas Noteng <andreas at noteng.no>  Thu, 12 Apr 2012 23:45:45 +0200
+ -- Andreas Noteng <andreas at noteng.no>  Sat, 21 Apr 2012 11:55:03 +0200

Modified: packages/pyspread/trunk/debian/links
===================================================================
--- packages/pyspread/trunk/debian/links	2012-04-21 02:26:24 UTC (rev 8503)
+++ packages/pyspread/trunk/debian/links	2012-04-21 09:55:16 UTC (rev 8504)
@@ -1 +1 @@
-/usr/share/pyspread/pyspread/pyspread /usr/bin/pyspread
+/usr/share/pyspread/pyspread /usr/bin/pyspread

Modified: packages/pyspread/trunk/debian/patches/change_default_paths.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/change_default_paths.patch	2012-04-21 02:26:24 UTC (rev 8503)
+++ packages/pyspread/trunk/debian/patches/change_default_paths.patch	2012-04-21 09:55:16 UTC (rev 8504)
@@ -1,7 +1,7 @@
 Description: Install documentation and examples to /usr/share/doc/pyspread
 Forwarded: not-needed
 Author: Andreas Noteng <andreas at noteng.no>
-Last-Update: 2012-04-09
+Last-Update: 2012-04-21
 --- a/pyspread/src/sysvars.py
 +++ b/pyspread/src/sysvars.py
 @@ -38,13 +38,13 @@
@@ -9,7 +9,7 @@
      """Returns the path in which pyspread is installed"""
  
 -    return os.path.dirname(__file__) + '/../'
-+    return "/usr/share/pyspread/pyspread/"
++    return "/usr/share/pyspread/"
  
  
  def get_help_path():
@@ -29,21 +29,21 @@
 +    return font_list
 --- a/setup.py
 +++ b/setup.py
-@@ -47,12 +47,8 @@
+@@ -47,12 +47,7 @@
           'pyspread/share/icons/Tango/24x24/actions/*.png',
           'pyspread/share/icons/Tango/24x24/toggles/*.png',
           'pyspread/share/icons/Tango/24x24/toggles/*.xpm',
 -         'pyspread/doc/help/*.html',
 -         'pyspread/doc/help/images/*.png',
-          'pyspread/po/*',
+-         'pyspread/po/*',
 -         'pyspread/examples/*',
 -         'pyspread/COPYING', 'pyspread/thanks', 'pyspread/faq',
 -         'pyspread/authors', 'pyspread.pth', 'README', 'changelog']},
-+         'pyspread.pth']},
++         'pyspread/po/*']},
        classifiers=[ \
          'Development Status :: 4 - Beta',
          'Environment :: X11 Applications :: GTK',
-@@ -63,4 +59,4 @@
+@@ -63,4 +58,4 @@
          'Programming Language :: Python',
          'Topic :: Office/Business :: Financial :: Spreadsheet',
        ],
@@ -59,8 +59,8 @@
 +import sys
 +import os
 +
-+sys.path.insert(0, '/usr/share/pyspread/pyspread/')
-+sys.path.insert(0, '/usr/share/pyspread/pyspread/src/')
++sys.path.insert(0, '/usr/share/pyspread/')
++sys.path.insert(0, '/usr/share/pyspread/src/')
  
  import i18n
 -import sys

Modified: packages/pyspread/trunk/debian/rules
===================================================================
--- packages/pyspread/trunk/debian/rules	2012-04-21 02:26:24 UTC (rev 8503)
+++ packages/pyspread/trunk/debian/rules	2012-04-21 09:55:16 UTC (rev 8504)
@@ -2,7 +2,9 @@
 PYVERS := $(shell pyversions -i)
 
 override_dh_auto_install:
-	python setup.py install --root=debian/pyspread --install-layout=deb --install-lib=/usr/share/pyspread --install-scripts=/usr/share/pyspread
+	python setup.py install --root=debian/pyspread --install-layout=deb --install-lib=/usr/share/ --install-scripts=/usr/share/
+	rm -rf debian/pyspread/usr/share/__init__.py
+	rm -rf debian/pyspread/usr/share/*.egg-info
 
 override_dh_auto_build: