On Fri, May 13, 2005 at 12:41:50PM +0200, Thijs Kinkhorst wrote:
> Please note that the "rar" package, by the same upstream author,
> contains such permission. So it should not be a problem to get the same
> statement for unrar.

NMU sitting in NEW, diff below.

Explanation on what and why I've done will be forthcoming on -devel and
-release as followup to the "unrar version confusion" thread once this
package has cleared NEW.

--Jeroen

reverted:
--- unrar-nonfree-3.4.3/pathfn.cpp
+++ unrar-nonfree-3.4.3.orig/pathfn.cpp
@@ -311,8 +311,7 @@
     char *EnvStr=getenv("HOME");
     if (EnvStr==NULL)
       return(false);
+    strcpy(Path,EnvStr);
-    strncpy(Path,EnvStr,NM);
-    Path[NM-1]='\0';
     return(true);
   }
   static char *AltPath[]={
diff -u unrar-nonfree-3.4.3/debian/changelog 
unrar-nonfree-3.5.2/debian/changelog
--- unrar-nonfree-3.4.3/debian/changelog
+++ unrar-nonfree-3.5.2/debian/changelog
@@ -1,3 +1,17 @@
+unrar-nonfree (1:3.5.2-0.1) unstable; urgency=medium
+
+  * Non-Maintainer Upload
+  * New upstream (Closes: #302986)
+    + License no longer prohibits packaging changes (Closes: #308272)
+    + Dropped security patch, as it has been incorporated upstream
+  * Make if very clear in copyright that you can't use the source code for
+    recreating rar compression algorithm
+  * Renamed binary package to 'unrar' to replace the still-in-development free
+    'equivalent', add epoch to cope with version increase too
+    (Closes: #265045)
+
+ -- Jeroen van Wolffelaar <[EMAIL PROTECTED]>  Sun, 22 May 2005 11:47:41 +0200
+
 unrar-nonfree (3.4.3-1) unstable; urgency=low
 
   * New upstream release 
diff -u unrar-nonfree-3.4.3/debian/copyright 
unrar-nonfree-3.5.2/debian/copyright
--- unrar-nonfree-3.4.3/debian/copyright
+++ unrar-nonfree-3.5.2/debian/copyright
@@ -3,12 +3,16 @@
 Further modifications have been made by Chris Anderson <[EMAIL PROTECTED]>
 on Wed Aug 25 19:03:47 EDT 2004
 
-It was downloaded from http://www.rarlab.com/rar/unrarsrc-3.4.2.tar.gz
+It was downloaded from http://www.rarlab.com/rar/unrarsrc-3.5.2.tar.gz
 
 Copyright:
-Copyright (c) 1993-1999, 2000-2002 Eugene Roshal
+Copyright (c) 1993-2005 Alexander L. Roshal
 
-This software is freeware.
+NOTE: this software is non-free, therefore carefully read this license before
+doing anything with it. In particular, this source code may not be used for
+recreating the rar compression algorithm.
+
+Full license follows:
 
  ******    *****   ******   unRAR - free utility for RAR archives
  **   **  **   **  **   **  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -20,7 +24,7 @@
       The source code of unRAR utility is freeware. This means:
 
    1. All copyrights to RAR and the utility unRAR are exclusively
-      owned by the author - Eugene Roshal.
+      owned by the author - Alexander Roshal.
 
    2. The unRAR sources may be used in any software to handle RAR
       archives without limitations free of charge, but cannot be used
@@ -30,8 +34,7 @@
       stated in the documentation and source comments that the code may
       not be used to develop a RAR (WinRAR) compatible archiver.
 
-   3. The unRAR utility may be freely distributed, provided the 
-      distribution package is not modified.  No person or company 
+   3. The unRAR utility may be freely distributed. No person or company 
       may charge a fee for the distribution of unRAR without written
       permission from the copyright holder.
 
@@ -54 +57 @@
-                                            Eugene Roshal
+                                            Alexander L. Roshal
diff -u unrar-nonfree-3.4.3/debian/control unrar-nonfree-3.5.2/debian/control
--- unrar-nonfree-3.4.3/debian/control
+++ unrar-nonfree-3.5.2/debian/control
@@ -5,12 +5,10 @@
 Build-Depends: debhelper (>= 4)
 Standards-Version: 3.6.1
 
-Package: unrar-nonfree
+Package: unrar
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: unrar
-Provides: unrar
-Conflicts: unrar, rar (<= 2.60-1)
+Conflicts: rar (<= 2.60-1)
 Description: Unarchiver for .rar files (non-free version)
  Unrar can extract files from .rar archives. If you want to create .rar
  archives, install package rar.
diff -u unrar-nonfree-3.4.3/debian/rules unrar-nonfree-3.5.2/debian/rules
--- unrar-nonfree-3.4.3/debian/rules
+++ unrar-nonfree-3.5.2/debian/rules
@@ -25,7 +25,7 @@
        dh_clean -k
        dh_installdirs
 
-       install -o root -g root -s -m 0755 unrar debian/unrar-nonfree/usr/bin
+       install -o root -g root -s -m 0755 unrar debian/unrar/usr/bin
 
        dh_installdocs
        dh_installman debian/unrar.1


-- 
Jeroen van Wolffelaar
[EMAIL PROTECTED]
http://jeroen.A-Eskwadraat.nl


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to