[Python-apps-commits] r14430 - in packages/sabnzbdplus/trunk/debian (4 files)

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

    Date: Sunday, October 22, 2017 @ 07:56:41
  Author: jcfp-guest
Revision: 14430

revert r14415, too many local changes

Modified:
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/control
  packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
  packages/sabnzbdplus/trunk/debian/rules

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2017-10-18 12:31:38 UTC (rev 14429)
+++ packages/sabnzbdplus/trunk/debian/changelog	2017-10-22 07:56:41 UTC (rev 14430)
@@ -14,7 +14,7 @@
     + update website info for rateit, codeplex is gone.
   * Patches:
     + refresh all.
-    + modify 06 to remove feedparser, and add rarfile handling.
+    + modify 06 to stop dealing with feedparser.
   * Control:
     + drop recommended dep on python-openssl: upstream switched to
       Python's builtin ssl.

Modified: packages/sabnzbdplus/trunk/debian/control
===================================================================
--- packages/sabnzbdplus/trunk/debian/control	2017-10-18 12:31:38 UTC (rev 14429)
+++ packages/sabnzbdplus/trunk/debian/control	2017-10-22 07:56:41 UTC (rev 14430)
@@ -33,7 +33,6 @@
  lsb-base (>= 3.0-6),
  python-cheetah (>= 2.0.1),
  python-configobj,
- python-rarfile (>= 3.0),
  python-sabyenc,
  python-six
 Recommends:

Modified: packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff	2017-10-18 12:31:38 UTC (rev 14429)
+++ packages/sabnzbdplus/trunk/debian/patches/06_use_packaged_modules.diff	2017-10-22 07:56:41 UTC (rev 14430)
@@ -10,58 +10,3 @@
  from sabnzbd.decorators import synchronized
  
  CONFIG_LOCK = threading.Lock()
---- a/sabnzbd/assembler.py
-+++ b/sabnzbd/assembler.py
-@@ -37,7 +37,7 @@
- from sabnzbd.postproc import PostProcessor
- import sabnzbd.downloader
- import sabnzbd.par2file as par2file
--import sabnzbd.utils.rarfile as rarfile
-+import rarfile
- from sabnzbd.encoding import unicoder
- from sabnzbd.rating import Rating
- 
---- a/sabnzbd/directunpacker.py
-+++ b/sabnzbd/directunpacker.py
-@@ -33,7 +33,7 @@
- from sabnzbd.encoding import TRANS, unicoder
- from sabnzbd.newsunpack import build_command, EXTRACTFROM_RE, EXTRACTED_RE, rar_volumelist
- from sabnzbd.postproc import prepare_extraction_path
--from sabnzbd.utils.rarfile import RarFile
-+from rarfile import RarFile
- from sabnzbd.utils.diskspeed import diskspeedmeasure
- 
- if sabnzbd.WIN32:
---- a/sabnzbd/dirscanner.py
-+++ b/sabnzbd/dirscanner.py
-@@ -29,7 +29,7 @@
- 
- import sabnzbd
- from sabnzbd.constants import SCAN_FILE_NAME, VALID_ARCHIVES
--import sabnzbd.utils.rarfile as rarfile
-+import rarfile
- from sabnzbd.encoding import platform_encode
- from sabnzbd.decorators import synchronized, NZBQUEUE_LOCK
- from sabnzbd.newsunpack import is_sevenfile, SevenZip
---- a/sabnzbd/newsunpack.py
-+++ b/sabnzbd/newsunpack.py
-@@ -30,7 +30,7 @@
- 
- import sabnzbd
- from sabnzbd.encoding import TRANS, UNTRANS, unicoder, platform_encode, deunicode
--import sabnzbd.utils.rarfile as rarfile
-+import rarfile
- from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \
-     real_path, globber, globber_full, get_all_passwords, renamer, clip_path, \
-     has_win_device, calc_age, long_path, remove_file
---- a/sabnzbd/postproc.py
-+++ b/sabnzbd/postproc.py
-@@ -48,7 +48,7 @@
- import sabnzbd.nzbqueue
- import sabnzbd.database as database
- import sabnzbd.notifier as notifier
--import sabnzbd.utils.rarfile as rarfile
-+import rarfile
- import sabnzbd.utils.checkdir
- 
- # Match samples

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2017-10-18 12:31:38 UTC (rev 14429)
+++ packages/sabnzbdplus/trunk/debian/rules	2017-10-22 07:56:41 UTC (rev 14430)
@@ -30,7 +30,6 @@
 		--exclude=utils/configobj.py \
 		--exclude=utils/pystone.py \
 		--exclude=utils/systrayiconthread.py \
-		--exclude=utils/rarfile.py \
 		--exclude=utils/subprocess_fix.py \
 		--exclude=sabnzbd/sabtray.py \
 		--exclude=images-split.tar.gz \