Package: guitar
Version: 0.1.4
Author: Guillem Jover <guillem@hadrons.org>
Status: applied
Description:
 Use arj instead of non-free unarj.

diff -Naur guitar-0.1.4/debian/control guitar-0.1.4-patched/debian/control
--- guitar-0.1.4/debian/control	2003-09-10 20:37:41.000000000 +0200
+++ guitar-0.1.4-patched/debian/control	2003-09-10 20:33:34.000000000 +0200
@@ -9,7 +9,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: bzip2
-Suggests: menu (>= 1.5), zip, unzip, unarj, lha, rar
+Suggests: menu (>= 1.5), zip, unzip, arj, lha, rar
 Description: A GTK+ archive extraction/viewing tool
  guiTAR is a TAR extraction tool written in GTK+ and including GNOME
  support. It currently supports the tar, tar.Z, tar.gz, tar.bz2, lha, 
diff -Naur guitar-0.1.4/README guitar-0.1.4-patched/README
--- guitar-0.1.4/README	1999-03-12 03:09:55.000000000 +0100
+++ guitar-0.1.4-patched/README	2003-09-10 16:11:03.000000000 +0200
@@ -16,18 +16,18 @@
 recommended: X11R6, GTK+ v1.2.0 or newer (Get GTK+ from www.gtk.org)
 highly recommended: X11R6, GNOME 0.99.x or newer (Get GNOME from www.gnome.org)
 
-You need tar, gzip, bzip2, zip/unzip, unarj, lha, rar/unrar and GNU textutils.
+You need tar, gzip, bzip2, zip/unzip, arj, lha, rar/unrar and GNU textutils.
 
 tar and GNU textutils are mandatory for .tar*
 gzip is mandatory for .tar.gz (.tgz)
 bzip2 is mandatory for .tar.bz2
 zip/unzip are mandatory for .zip
-unarj is mandatory for .arj
+arj is mandatory for .arj
 lha is mandatory for .lzh(.lha)
 rar/unrar are mandatory for .rar
 
 This version is tested with GTK+ 1.2.0, GNOME 1.0.0, GNU tar 1.12,
-gzip 1.2.4, unzip 2.1, bzip2 0.9.0c, lha 1.02, unarj 2.41a demo version,
+gzip 1.2.4, unzip 2.1, bzip2 0.9.0c, lha 1.02, arj 3.10.15,
 rar/unrar 2.02, GNU textutils 1.22, Linux 2.2.1, and glibc 2.1.
 
 
diff -Naur guitar-0.1.4/src/programs.c guitar-0.1.4-patched/src/programs.c
--- guitar-0.1.4/src/programs.c	2003-09-10 20:37:41.000000000 +0200
+++ guitar-0.1.4-patched/src/programs.c	2003-09-10 20:27:34.000000000 +0200
@@ -672,7 +672,7 @@
   	  {
 	  f=fopen(tmp1,"w");
   	  fprintf(f,"#!/bin/sh\n");
-	  fprintf(f,"unarj l \"%s\" >%s",fn,tmp2);
+	  fprintf(f,"arj l \"%s\" >%s",fn,tmp2);
   	  fclose(f);
 
 	  chmod(tmp1,S_IRUSR | S_IWUSR | S_IXUSR);
@@ -707,8 +707,7 @@
 	  {
 	  strcpy(d[6],"");
 	  sscanf(ln,"%s %s %s %s %s %s %s %s",d[5],d[2],dumb,dumb,d[3],d[4],dumb,dumb);
-/*FILE_ID.DIZ          66         63 0.955 99-01-26 23:27:02 C3F5A217      B 1*/
-
+/* file_id.diz         66         63 0.955 03-03-24 09:07:17 -rw-r--r-- ---  +1 */
 	  add[0]=d[0];
 	  add[1]=d[1];
 	  add[2]=d[2];
@@ -783,7 +782,7 @@
 	  {
 	  f=fopen(tmp1,"w");
   	  fprintf(f,"#!/bin/sh\n");
-	  fprintf(f,"unarj x \"%s\" 2>%s",fn,tmp2);
+	  fprintf(f,"arj x \"%s\" 2>%s",fn,tmp2);
   	  fclose(f);
 
 	  chmod(tmp1,S_IRUSR | S_IWUSR | S_IXUSR);