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

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

    Date: Saturday, November 7, 2015 @ 23:18:21
  Author: anoteng-guest
Revision: 12575

New upstream release

Modified:
  packages/pyspread/trunk/debian/changelog
  packages/pyspread/trunk/debian/control
  packages/pyspread/trunk/debian/patches/change_default_paths.patch
  packages/pyspread/trunk/debian/patches/python_tutorial.patch

Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog	2015-11-06 19:02:44 UTC (rev 12574)
+++ packages/pyspread/trunk/debian/changelog	2015-11-07 23:18:21 UTC (rev 12575)
@@ -1,8 +1,10 @@
-pyspread (0.4.3-2) UNRELEASED; urgency=medium
+pyspread (1.0-1) unstable; urgency=medium
 
+  * New upstream release
   * Remove XS-Testsuite header, no longer necessary 
+  * Add missing libcairo-gobject2 dependency
 
- -- Andreas Noteng <andreas at noteng.no>  Sat, 06 Jun 2015 22:16:45 +0200
+ -- Andreas Noteng <andreas at noteng.no>  Sun, 08 Nov 2015 00:13:25 +0100
 
 pyspread (0.4.3-1) unstable; urgency=medium
 

Modified: packages/pyspread/trunk/debian/control
===================================================================
--- packages/pyspread/trunk/debian/control	2015-11-06 19:02:44 UTC (rev 12574)
+++ packages/pyspread/trunk/debian/control	2015-11-07 23:18:21 UTC (rev 12575)
@@ -13,6 +13,7 @@
 Package: pyspread
 Architecture: all
 Depends: gir1.2-pango-1.0,
+         libcairo-gobject2,
          libpangocairo-1.0-0,
          python-cairo,
          python-gnupg,

Modified: packages/pyspread/trunk/debian/patches/change_default_paths.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/change_default_paths.patch	2015-11-06 19:02:44 UTC (rev 12574)
+++ packages/pyspread/trunk/debian/patches/change_default_paths.patch	2015-11-07 23:18:21 UTC (rev 12575)
@@ -4,15 +4,18 @@
 Forwarded: not-needed
 Author: Andreas Noteng <andreas at noteng.no>
 Last-Update: 2013-04-23
-Index: pyspread-0.4.1/pyspread/src/sysvars.py
+Index: pyspread-1.0/pyspread/src/sysvars.py
 ===================================================================
---- pyspread-0.4.1.orig/pyspread/src/sysvars.py
-+++ pyspread-0.4.1/pyspread/src/sysvars.py
-@@ -43,13 +43,13 @@ def is_gtk():
+--- pyspread-1.0.orig/pyspread/src/sysvars.py
++++ pyspread-1.0/pyspread/src/sysvars.py
+@@ -43,16 +43,13 @@ def is_gtk():
  def get_program_path():
      """Returns the path in which pyspread is installed"""
  
--    return os.path.dirname(__file__) + '/../'
+-    src_folder = os.path.dirname(__file__)
+-    program_path = os.sep.join(src_folder.split(os.sep)[:-1]) + os.sep
+-
+-    return program_path
 +    return "/usr/share/pyspread/"
  
  
@@ -24,10 +27,10 @@
  
  
  def get_python_tutorial_path():
-Index: pyspread-0.4.1/pyspread/src/pyspread.py
+Index: pyspread-1.0/pyspread/src/pyspread.py
 ===================================================================
---- pyspread-0.4.1.orig/pyspread/src/pyspread.py
-+++ pyspread-0.4.1/pyspread/src/pyspread.py
+--- pyspread-1.0.orig/pyspread/src/pyspread.py
++++ pyspread-1.0/pyspread/src/pyspread.py
 @@ -39,11 +39,12 @@ Provides
  
  import sys
@@ -51,10 +54,10 @@
  
  # Separate icon in the Windows dock for Ms Windows
  try:
-Index: pyspread-0.4.1/pyspread/src/lib/i18n.py
+Index: pyspread-1.0/pyspread/src/lib/i18n.py
 ===================================================================
---- pyspread-0.4.1.orig/pyspread/src/lib/i18n.py
-+++ pyspread-0.4.1/pyspread/src/lib/i18n.py
+--- pyspread-1.0.orig/pyspread/src/lib/i18n.py
++++ pyspread-1.0/pyspread/src/lib/i18n.py
 @@ -60,5 +60,4 @@ mo_location = LOCALE_DIR
  # gettext initialization
  # ----------------------
@@ -63,10 +66,10 @@
 -                               fallback=True)
 \ No newline at end of file
 +language = gettext.translation(APP_NAME, languages=languages, fallback=True)
-Index: pyspread-0.4.1/setup.py
+Index: pyspread-1.0/setup.py
 ===================================================================
---- pyspread-0.4.1.orig/setup.py
-+++ pyspread-0.4.1/setup.py
+--- pyspread-1.0.orig/setup.py
++++ pyspread-1.0/setup.py
 @@ -72,9 +72,6 @@ setup(
      cmdclass={'test': PyTest},
      package_data={'pyspread': [

Modified: packages/pyspread/trunk/debian/patches/python_tutorial.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/python_tutorial.patch	2015-11-06 19:02:44 UTC (rev 12574)
+++ packages/pyspread/trunk/debian/patches/python_tutorial.patch	2015-11-07 23:18:21 UTC (rev 12575)
@@ -6,11 +6,11 @@
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704928
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704929
 Last-Update: 2013-04-21
-Index: pyspread-0.4.1/pyspread/src/gui/_main_window.py
+Index: pyspread-1.0/pyspread/src/gui/_main_window.py
 ===================================================================
---- pyspread-0.4.1.orig/pyspread/src/gui/_main_window.py
-+++ pyspread-0.4.1/pyspread/src/gui/_main_window.py
-@@ -1401,8 +1401,12 @@ class MainWindowEventHandlers(EventMixin
+--- pyspread-1.0.orig/pyspread/src/gui/_main_window.py
++++ pyspread-1.0/pyspread/src/gui/_main_window.py
+@@ -1441,8 +1441,12 @@ class MainWindowEventHandlers(EventMixin
  
          # Doas not work any more