[Python-apps-commits] r14319 - in packages/pyspread/trunk/debian (8 files)

anoteng-guest at users.alioth.debian.org anoteng-guest at users.alioth.debian.org
Sun Aug 13 12:41:57 UTC 2017 

    Date: Sunday, August 13, 2017 @ 12:41:55
  Author: anoteng-guest
Revision: 14319

new upstream release

Modified:
  packages/pyspread/trunk/debian/changelog
  packages/pyspread/trunk/debian/compat
  packages/pyspread/trunk/debian/control
  packages/pyspread/trunk/debian/patches/about_dialog_license.patch
  packages/pyspread/trunk/debian/patches/change_default_paths.patch
  packages/pyspread/trunk/debian/patches/python_tutorial.patch
  packages/pyspread/trunk/debian/rules
Deleted:
  packages/pyspread/trunk/debian/menu

Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog	2017-08-13 06:24:59 UTC (rev 14318)
+++ packages/pyspread/trunk/debian/changelog	2017-08-13 12:41:55 UTC (rev 14319)
@@ -1,3 +1,14 @@
+pyspread (1.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove python-rsvg dependency due to deprecation in debian (Closes: #844149)
+  * Add python-gtk2 dependency (Closes: #802424)
+  * Bump Standards-Version to 3.9.8 (no change)
+  * Bump debhelper compat to 9
+  * Remove menu file
+
+ -- Andreas Noteng <andreas at noteng.no>  Fri, 17 Feb 2017 23:33:41 +0100
+
 pyspread (1.0.3-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/pyspread/trunk/debian/compat
===================================================================
--- packages/pyspread/trunk/debian/compat	2017-08-13 06:24:59 UTC (rev 14318)
+++ packages/pyspread/trunk/debian/compat	2017-08-13 12:41:55 UTC (rev 14319)
@@ -1 +1 @@
-7
+9

Modified: packages/pyspread/trunk/debian/control
===================================================================
--- packages/pyspread/trunk/debian/control	2017-08-13 06:24:59 UTC (rev 14318)
+++ packages/pyspread/trunk/debian/control	2017-08-13 12:41:55 UTC (rev 14319)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Andreas Noteng <andreas at noteng.no>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 8.1.0), python (>= 2.7), python-pytest
+Build-Depends: debhelper (>= 9.20150101+deb8u2), python (>= 2.7), python-pytest
 X-Python-Version: >= 2.7
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://pyspread.sourceforge.net/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pyspread/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/pyspread/trunk/
@@ -20,9 +20,10 @@
          python-matplotlib,
          python-numpy (>= 1:1.1.0),
          python-wxgtk3.0,
+         python-gtk2,
          ${misc:Depends},
          ${python:Depends}
-Recommends: python-jedi (>=0.9.0-1), python-rsvg, python-xlrd, python-xlwt, gnupg-agent
+Recommends: python-jedi (>=0.9.0-1), python-xlrd, python-xlwt, gnupg-agent
 Suggests: python-mpltoolkits.basemap, ttf-mscorefonts-installer
 Description: cross-platform Python spreadsheet application
  Pyspread is a cross-platform Python spreadsheet application. Instead of

Deleted: packages/pyspread/trunk/debian/menu
===================================================================
--- packages/pyspread/trunk/debian/menu	2017-08-13 06:24:59 UTC (rev 14318)
+++ packages/pyspread/trunk/debian/menu	2017-08-13 12:41:55 UTC (rev 14319)
@@ -1,5 +0,0 @@
-?package(pyspread): needs="X11" \
-        section="Applications/Office" \
-        title="Pyspread command=pyspread" \
-	icon="/usr/share/pixmaps/pyspread.xpm" \
-	command="pyspread"

Modified: packages/pyspread/trunk/debian/patches/about_dialog_license.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/about_dialog_license.patch	2017-08-13 06:24:59 UTC (rev 14318)
+++ packages/pyspread/trunk/debian/patches/about_dialog_license.patch	2017-08-13 12:41:55 UTC (rev 14319)
@@ -3,13 +3,11 @@
 Author: Andreas Noteng <andreas at noteng.no>
 Last-Update: 2012-01-28
 
-Index: pyspread-1.0.3/pyspread/src/gui/_dialogs.py
-===================================================================
---- pyspread-1.0.3.orig/pyspread/src/gui/_dialogs.py
-+++ pyspread-1.0.3/pyspread/src/gui/_dialogs.py
-@@ -1174,7 +1174,7 @@ class AboutDialog(object):
+--- a/pyspread/src/gui/_dialogs.py
++++ b/pyspread/src/gui/_dialogs.py
+@@ -1180,7 +1180,7 @@
                              "Enrico Nicoletto", u"Frédéric Marchal",
-                             "Philipp Thomas"]
+                             "Philipp Thomas", "Rafael Fontenelle"]
  
 -        license_file = open(get_program_path() + "/COPYING", "r")
 +        license_file = open("/usr/share/common-licenses/GPL-3", "r")

Modified: packages/pyspread/trunk/debian/patches/change_default_paths.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/change_default_paths.patch	2017-08-13 06:24:59 UTC (rev 14318)
+++ packages/pyspread/trunk/debian/patches/change_default_paths.patch	2017-08-13 12:41:55 UTC (rev 14319)
@@ -4,11 +4,9 @@
 Forwarded: not-needed
 Author: Andreas Noteng <andreas at noteng.no>
 Last-Update: 2013-04-23
-Index: pyspread-1.0/pyspread/src/sysvars.py
-===================================================================
---- pyspread-1.0.orig/pyspread/src/sysvars.py
-+++ pyspread-1.0/pyspread/src/sysvars.py
-@@ -43,16 +43,13 @@ def is_gtk():
+--- a/pyspread/src/sysvars.py
++++ b/pyspread/src/sysvars.py
+@@ -44,16 +44,13 @@
  def get_program_path():
      """Returns the path in which pyspread is installed"""
  
@@ -27,11 +25,9 @@
  
  
  def get_python_tutorial_path():
-Index: pyspread-1.0/pyspread/src/pyspread.py
-===================================================================
---- pyspread-1.0.orig/pyspread/src/pyspread.py
-+++ pyspread-1.0/pyspread/src/pyspread.py
-@@ -39,11 +39,12 @@ Provides
+--- a/pyspread/src/pyspread.py
++++ b/pyspread/src/pyspread.py
+@@ -39,11 +39,12 @@
  
  import sys
  import optparse
@@ -46,7 +42,7 @@
  import lib.i18n as i18n
  
  
-@@ -51,7 +52,6 @@ import lib.i18n as i18n
+@@ -51,7 +52,6 @@
  _ = i18n.language.ugettext
  
  sys.setrecursionlimit(65535)
@@ -54,11 +50,9 @@
  
  # Separate icon in the Windows dock for Ms Windows
  try:
-Index: pyspread-1.0/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
+--- a/pyspread/src/lib/i18n.py
++++ b/pyspread/src/lib/i18n.py
+@@ -65,5 +65,4 @@
  # gettext initialization
  # ----------------------
  
@@ -66,11 +60,9 @@
 -                               fallback=True)
 \ No newline at end of file
 +language = gettext.translation(APP_NAME, languages=languages, fallback=True)
-Index: pyspread-1.0/setup.py
-===================================================================
---- pyspread-1.0.orig/setup.py
-+++ pyspread-1.0/setup.py
-@@ -72,9 +72,6 @@ setup(
+--- a/setup.py
++++ b/setup.py
+@@ -72,9 +72,6 @@
      cmdclass={'test': PyTest},
      package_data={'pyspread': [
              '*.py',
@@ -80,7 +72,7 @@
              'src/*.py',
              'src/pyspread',
              'src/*/*.py',
-@@ -92,19 +89,8 @@ setup(
+@@ -92,19 +89,8 @@
              'share/icons/Tango/24x24/toggles/*.png',
              'share/icons/Tango/24x24/toggles/*.xpm',
              'share/icons/Tango/24x24/status/*.png',

Modified: packages/pyspread/trunk/debian/patches/python_tutorial.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/python_tutorial.patch	2017-08-13 06:24:59 UTC (rev 14318)
+++ packages/pyspread/trunk/debian/patches/python_tutorial.patch	2017-08-13 12:41:55 UTC (rev 14319)
@@ -6,14 +6,12 @@
 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-1.0.1/pyspread/src/gui/_main_window.py
-===================================================================
---- pyspread-1.0.1.orig/pyspread/src/gui/_main_window.py
-+++ pyspread-1.0.1/pyspread/src/gui/_main_window.py
-@@ -1439,8 +1439,12 @@ class MainWindowEventHandlers(EventMixin
+--- a/pyspread/src/gui/_main_window.py
++++ b/pyspread/src/gui/_main_window.py
+@@ -1478,8 +1478,12 @@
+     def OnPythonTutorial(self, event):
+         """Python tutorial launch event handler"""
  
-         # Doas not work any more
- 
 -        self.main_window.actions.launch_help("Python tutorial",
 -                                             get_python_tutorial_path())
 +        if os.path.isfile("/usr/share/doc/python-doc/html/tutorial/index.html"):
@@ -23,5 +21,5 @@
 +            self.main_window.actions.launch_help("Python tutorial",
 +                "http://docs.python.org/2/tutorial/")
  
-     def OnAbout(self, event):
-         """About dialog event handler"""
+     def OnDependencies(self, event):
+         """Display dependency dialog"""

Modified: packages/pyspread/trunk/debian/rules
===================================================================
--- packages/pyspread/trunk/debian/rules	2017-08-13 06:24:59 UTC (rev 14318)
+++ packages/pyspread/trunk/debian/rules	2017-08-13 12:41:55 UTC (rev 14319)
@@ -7,7 +7,7 @@
 
 override_dh_auto_install:
 	python setup.py install --root=debian/pyspread --install-layout=deb --install-lib=/usr/share/ --install-scripts=/usr/share/
-	cd debian/pyspread/usr/share/pyspread && mv locale ..
+#	cd debian/pyspread/usr/share/pyspread && mv locale ..
 	rm -rf debian/pyspread/usr/share/__init__.py
 	rm -rf debian/pyspread/usr/share/*.egg-info

More information about the Python-apps-commits mailing list