Package: garchiver
Version: 0.5
Author: Guillem Jover <guillem@hadrons.org>
Status: applied
Description:
 Use arj insetad of non-free unarj.

diff -Naur garchiver-0.5/debian/control garchiver-0.5-patched/debian/control
--- garchiver-0.5/debian/control	2003-09-10 22:50:02.000000000 +0200
+++ garchiver-0.5-patched/debian/control	2003-09-10 23:42:41.000000000 +0200
@@ -9,7 +9,7 @@
 Package: garchiver
 Depends: ${python:Depends}, python-gnome, python-glade, libglade-gnome0, ${shlibs:Depends}
 Recommends: bzip2
-Suggests: zip, unrar, unarj, ncompress
+Suggests: zip, unrar, arj, ncompress
 Description: Archiver with a WinZip and a tree interface, and full drag and drop
  garchiver is an archiver for Gnome. It has a tree interface that lets you
  navigate through your archives very easily, as well as the classic WinZip
diff -Naur garchiver-0.5/src/arj.py garchiver-0.5-patched/src/arj.py
--- garchiver-0.5/src/arj.py	2003-09-10 22:50:02.000000000 +0200
+++ garchiver-0.5-patched/src/arj.py	2003-09-10 22:48:41.000000000 +0200
@@ -23,7 +23,7 @@
         self.error_log = ''
         
     def available (self):
-        return os.access (PS ('unarj_path'), os.X_OK)
+        return os.access (PS ('arj_path'), os.X_OK)
 
     def extract (self, to, with_path, files=None):
     
@@ -53,7 +53,7 @@
                             pass
 
             else: #no files selected, extract all files
-                cmd_t = PS('unarj_path') + ' t "' + self.name + '"'
+                cmd_t = PS('arj_path') + ' t "' + self.name + '"'
                 (child_in_t, child_out_t, child_err_t) = popen2.popen3 (cmd_t)
                 lines_t = child_in_t.readlines ()
                 child_in_t.close ()
@@ -85,7 +85,7 @@
 
 
         pos = string.rfind(self.name, '/')
-        cmd_e = PS('unarj_path') + ' x "' + self.name[pos+1:]   + '"'
+        cmd_e = PS('arj_path') + ' x "' + self.name[pos+1:]   + '"'
         self.log = self.log + cmd_e + '\n'
         (sub_in_e, sub_cout_e, sub_err_e) = popen2.popen3 (cmd_e)
 
@@ -114,8 +114,8 @@
         return [gettext.gettext('Packed')]
         
     def list (self):
-        cmd = PS('unarj_path') + ' l "' + self.name + '"'
-        cmd_t = PS('unarj_path') + ' t "' + self.name + '"'
+        cmd = PS('arj_path') + ' l "' + self.name + '"'
+        cmd_t = PS('arj_path') + ' t "' + self.name + '"'
         ret = []
 
         (child_in, child_out, child_err) = popen2.popen3 (cmd)
@@ -180,7 +180,7 @@
         return ret
 
     def list_dir(self):
-        cmd_t = PS('unarj_path') + ' t "' + self.name + '"'
+        cmd_t = PS('arj_path') + ' t "' + self.name + '"'
         ret = []
 
         (child_in_t, child_out_t, child_err_t) = popen2.popen3 (cmd_t)
@@ -212,7 +212,7 @@
         return ret
 
     def view (self, file):
-        cmd = PS('unarj_path') + '-o -d /tmp/garchiver/ "' + self.name + '" ' + file
+        cmd = PS('arj_path') + '-o -d /tmp/garchiver/ "' + self.name + '" ' + file
         os.system(cmd)
         tmp = self.make_tempfile (file)
         os.rename('/tmp/garchiver/' + file, tmp)
diff -Naur garchiver-0.5/src/settings.py.in garchiver-0.5-patched/src/settings.py.in
--- garchiver-0.5/src/settings.py.in	2001-09-21 23:48:44.000000000 +0200
+++ garchiver-0.5-patched/src/settings.py.in	2003-09-10 22:44:34.000000000 +0200
@@ -54,7 +54,7 @@
 'uncompress_path':'/bin/uncompress',
 'zip_path':'/usr/bin/zip',
 'unzip_path':'/usr/bin/unzip',
-'unarj_path':'/usr/bin/unarj',
+'arj_path':'/usr/bin/arj',
 'unrar_path':'/usr/bin/unrar',
 
 'confirm_quit_classic': FALSE,
@@ -96,7 +96,7 @@
 
         for path in ['tar_path', 'gzip_path', 'gunzip_path', 'bzip_path',
                     'bunzip_path', 'compress_path', 'uncompress_path',
-                    'zip_path', 'unzip_path', 'unarj_path',
+                    'zip_path', 'unzip_path', 'arj_path',
                     'unrar_path']:
             selected = glade.get_widget (path).get_text ()
             _settings [path] = selected
@@ -151,7 +151,7 @@
 
         for path in ['tar_path', 'gzip_path', 'gunzip_path', 'bzip_path',
                 'bunzip_path', 'compress_path', 'uncompress_path', 'zip_path',
-                'unzip_path', 'unarj_path', 'unrar_path']:
+                'unzip_path', 'arj_path', 'unrar_path']:
             glade.get_widget (path).set_text (setting (path))
 
         for confirm in ['confirm_quit_classic', 'confirm_quit_tree',
@@ -177,7 +177,7 @@
 
         for path in ['tar_path', 'gzip_path', 'gunzip_path', 'bzip_path',
                     'bunzip_path', 'compress_path', 'uncompress_path',
-                    'zip_path', 'unzip_path', 'unarj_path', 'unrar_path']:
+                    'zip_path', 'unzip_path', 'arj_path', 'unrar_path']:
             _settings [path] = get_string (path)
 
         for confirm in ['confirm_quit_classic', 'confirm_quit_tree',