[Python-apps-commits] r5652 - in packages/sabnzbdplus/trunk/debian (2 files)

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

    Date: Tuesday, June 22, 2010 @ 21:01:54
  Author: jcfp-guest
Revision: 5652

Nzbmatrix category mapping file is no more

Modified:
  packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.dpatch
  packages/sabnzbdplus/trunk/debian/sabnzbdplus.install

Modified: packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.dpatch
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.dpatch	2010-06-22 19:37:37 UTC (rev 5651)
+++ packages/sabnzbdplus/trunk/debian/patches/02_find_parts_in_usr_share.dpatch	2010-06-22 21:01:54 UTC (rev 5652)
@@ -5,9 +5,9 @@
 ## DP: make the program find the interface templates, private python modules under /usr/share
 
 @DPATCH@
-diff -urNad sabnzbdplus-0.5.3~rc1~/SABnzbd.py sabnzbdplus-0.5.3~rc1/SABnzbd.py
---- sabnzbdplus-0.5.3~rc1~/SABnzbd.py	2010-05-25 22:56:10.000000000 +0200
-+++ sabnzbdplus-0.5.3~rc1/SABnzbd.py	2010-05-26 13:16:44.304986808 +0200
+diff -urNad sabnzbdplus-0.5.0~alpha7~/SABnzbd.py sabnzbdplus-0.5.0~alpha7/SABnzbd.py
+--- sabnzbdplus-0.5.0~alpha7~/SABnzbd.py	2009-10-27 19:52:13.000000000 +0100
++++ sabnzbdplus-0.5.0~alpha7/SABnzbd.py	2009-10-29 20:16:17.545578437 +0100
 @@ -16,6 +16,7 @@
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  
@@ -16,10 +16,10 @@
  if sys.version_info < (2,4):
      print "Sorry, requires Python 2.4 or higher."
      sys.exit(1)
-diff -urNad sabnzbdplus-0.5.3~rc1~/sabnzbd/constants.py sabnzbdplus-0.5.3~rc1/sabnzbd/constants.py
---- sabnzbdplus-0.5.3~rc1~/sabnzbd/constants.py	2010-05-25 22:56:10.000000000 +0200
-+++ sabnzbdplus-0.5.3~rc1/sabnzbd/constants.py	2010-05-26 13:16:44.304986808 +0200
-@@ -69,8 +69,8 @@
+diff -urNad sabnzbdplus-0.5.0~alpha7~/sabnzbd/constants.py sabnzbdplus-0.5.0~alpha7/sabnzbd/constants.py
+--- sabnzbdplus-0.5.0~alpha7~/sabnzbd/constants.py	2009-10-29 20:16:16.935578949 +0100
++++ sabnzbdplus-0.5.0~alpha7/sabnzbd/constants.py	2009-10-29 20:16:17.545578437 +0100
+@@ -67,8 +67,8 @@
  DEF_CACHE_DIR    = 'cache'
  DEF_LOG_DIR      = 'logs'
  DEF_NZBBACK_DIR  = ''
@@ -30,15 +30,3 @@
  DEF_INT_LANGUAGE = 'language'
  DEF_STDINTF      = 'smpl'
  DEF_SKIN_COLORS  = {'smpl':'white', 'classic':'darkblue', 'mobile':'light'}
-diff -urNad sabnzbdplus-0.5.3~rc1~/sabnzbd/urlgrabber.py sabnzbdplus-0.5.3~rc1/sabnzbd/urlgrabber.py
---- sabnzbdplus-0.5.3~rc1~/sabnzbd/urlgrabber.py	2010-05-25 22:56:10.000000000 +0200
-+++ sabnzbdplus-0.5.3~rc1/sabnzbd/urlgrabber.py	2010-05-26 13:19:21.114989983 +0200
-@@ -296,7 +296,7 @@
-     global _MATRIX_MAP
- 
-     _MATRIX_MAP = {}
--    path = os.path.join(sabnzbd.DIR_PROG, 'nzbmatrix.txt')
-+    path = os.path.join(sabnzbd.DIR_PROG, '../share/sabnzbdplus/nzbmatrix.txt')
-     try:
-         for line in open(path, 'r'):
-             try:

Modified: packages/sabnzbdplus/trunk/debian/sabnzbdplus.install
===================================================================
--- packages/sabnzbdplus/trunk/debian/sabnzbdplus.install	2010-06-22 19:37:37 UTC (rev 5651)
+++ packages/sabnzbdplus/trunk/debian/sabnzbdplus.install	2010-06-22 21:01:54 UTC (rev 5652)
@@ -12,6 +12,3 @@
 
 # tmp: patched cherrypy svn included by upstream
 cherrypy /usr/share/sabnzbdplus/
-
-# category mapping
-nzbmatrix.txt /usr/share/sabnzbdplus/