releasing version 8.80

Instead, avoid populating fields with empty strings if rpm fails to
get a field value, either due to not knowing the field, or due to the
field not being set.

.gitignore

@@ -0,0 +1,2 @@
+alien.lsm
+alien.spec

Alien/Package/Deb.pm

@@ -87,8 +87,11 @@ sub install {
 	my $this=shift;
 	my $deb=shift;
 
+	my $v=$Alien::Package::verbose;
+	$Alien::Package::verbose=2;
 	$this->do("dpkg", "--no-force-overwrite", "-i", $deb)
 		or die "Unable to install";
+	$Alien::Package::verbose=$v;
 }
 
 =item test
@@ -314,6 +317,7 @@ sub prep {
 		my $line=<$changelog>;
 		if ($line=~/^[^ ]+\s+\(([^)]+)\)\s/) {
 			my $version=$1;
+			$version=~s/\s+//; # ensure no whitespace
 			if ($version=~/(.*)-(.*)/) {
 				$version=$1;
 				$this->release($2);
@@ -331,10 +335,14 @@ sub prep {
 	print OUT $this->name." (".$this->version."-".$this->release.") experimental; urgency=low\n";
 	print OUT "\n";
 	print OUT "  * Converted from .".$this->origformat." format to .deb by alien version $Alien::Version\n";
+	print OUT "  \n";
+	if (defined $this->changelogtext) {
+		my $ct=$this->changelogtext;
+		$ct=~s/^/  /gm;
+		print OUT $ct."\n";
+	}
 	print OUT "\n";
 	print OUT " -- ".$this->username." <".$this->email.">  ".$this->date."\n";
-	print OUT "\n";
-	print OUT $this->changelogtext."\n" if defined $this->changelogtext;
 	close OUT;
 
 	# Control file.
@@ -676,7 +684,7 @@ sub email {
 		close MAILNAME;
 	}
 	if (!$mailname) {
-		$mailname=$this->runpipe(1, "hostname -f");
+		$mailname=$this->runpipe(1, "hostname");
 		chomp $mailname;
 	}
 	return "$login\@$mailname";
@@ -731,7 +739,7 @@ sub postinst {
 	return $postinst unless %$owninfo;
 	
 	my ($firstline, $rest)=split(/\n/, $postinst, 2);
-	if ($firstline !~ m/^#!\s*\/bin\/sh/) {
+	if ($firstline !~ m/^#!\s*\/bin\/(ba)?sh/) {
 		print STDERR "warning: unable to add ownership fixup code to postinst as the postinst is not a shell script!\n";
 		return $postinst;
 	}
@@ -747,7 +755,7 @@ sub postinst {
 	return "$firstline\n$permscript\n$rest";
 }
 
-=cut
+=back
 
 =head1 AUTHOR
 

Alien/Package/Pkg.pm

@@ -106,8 +106,11 @@ sub install {
 	my $pkg=shift;
 
 	if (-x "/usr/sbin/pkgadd") {
+		my $v=$Alien::Package::verbose;
+		$Alien::Package::verbose=2;
 		$this->do("/usr/sbin/pkgadd", "-d .", "$pkg")
 			or die "Unable to install";
+		$Alien::Package::verbose=$v;
 	}
 	else {
 		die "Sorry, I cannot install the generated .pkg file because /usr/sbin/pkgadd is not present.\n";
@@ -259,7 +262,7 @@ sub prep {
 #  	  grep {/^\./} readdir DIR;
 #  	closedir DIR;
 
-	$this->do("cd $dir; find . -print | pkgproto > ./prototype")
+	$this->do("cd $dir; find . -print | sed -e '/.\\/prototype\$/d' | pkgproto > ./prototype")
 		|| die "error during pkgproto: $!\n";
 
 	open(PKGPROTO, ">>$dir/prototype")
@@ -324,6 +327,8 @@ sub build {
 	return $name;
 }
 
+=back
+
 =head1 AUTHOR
 
 Mark Hershberger <mah@everybody.org>

Alien/Package/Rpm.pm

@@ -53,8 +53,11 @@ sub install {
 	my $this=shift;
 	my $rpm=shift;
 
+	my $v=$Alien::Package::verbose;
+	$Alien::Package::verbose=2;
 	$this->do("rpm -ivh ".(exists $ENV{RPMINSTALLOPT} ? $ENV{RPMINSTALLOPT} : '').$rpm)
 		or die "Unable to install";
+	$Alien::Package::verbose=$v;
 }
 
 =item scan
@@ -73,20 +76,23 @@ sub scan {
 		POSTIN => 'postinst',
 		PREUN => 'prerm',
 		POSTUN => 'postrm',
+		LICENSE => 'copyright',
 	);
 
-	# These fields need no translation except case.
-	foreach (qw{name version release arch changelogtext summary
-		    description copyright prefixes}) {
-		$fieldtrans{uc $_}=$_;
-	}
-
 	# Use --queryformat to pull out all the fields we need.
-	foreach my $field (keys(%fieldtrans)) {
+	foreach my $field (qw{NAME VERSION RELEASE ARCH CHANGELOGTEXT
-		$_=$this->runpipe(0, "LANG=C rpm -qp --queryformat \%{$field} $file");
+		              SUMMARY DESCRIPTION PREFIXES},
-		$field=$fieldtrans{$field};
+	                   keys(%fieldtrans)) {
-		$_='' if $_ eq '(none)';
+		my $value=$this->runpipe(0, "LANG=C rpm -qp --queryformat \%{$field} $file");
-		$this->$field($_);
+		next if $? || $value eq '(none)';
+		my $key;
+		if (exists $fieldtrans{$field}) {
+			$key=$fieldtrans{$field};
+		}
+		else {
+			$key=lc($field);
+		}
+		$this->$key($value);
 	}
 
 	# Get the conffiles list.
@@ -117,12 +123,18 @@ sub scan {
 			$this->summary('Converted RPM package');
 		}
 	}
-	unless (defined $this->copyright) {
-		$this->copyright('unknown');
-	}
 	unless (defined $this->description) {
 		$this->description($this->summary);
 	}
+	unless (defined $this->copyright) {
+		# Older rpms have no licence tag, but have a copyright.
+		$this->copyright($this->runpipe(0, "LANG=C rpm -qp --queryformat \%{COPYRIGHT} $file"));
+
+		# Fallback.
+		if (! $this->copyright) {
+			$this->copyright('unknown');
+		}
+	}
 	if (! defined $this->release || ! defined $this->version || 
 	    ! defined $this->name) {
 		die "Error querying rpm file";
@@ -182,30 +194,45 @@ sub unpack {
 	#
 	# Test to see if the package contains the prefix directory already.
 	if (defined $this->prefixes && ! -e "$workdir/".$this->prefixes) {
+		my $relocate=1;
+
 		# Get the files to move.
 		my @filelist=glob("$workdir/*");
-
+		
 		# Now, make the destination directory.
 		my $collect=$workdir;
 		foreach (split m:/:, $this->prefixes) {
 			if ($_ ne '') { # this keeps us from using anything but relative paths.
 				$collect.="/$_";
+				if (-d $collect) {
+					# The package contains a parent
+					# directory of the relocation
+					# directory. Since it's impossible
+					# to move a parent directory into
+					# its child, bail out and do
+					# nothing.
+					$relocate=0;
+					last;
+				}
 				$this->do("mkdir", $collect) || die "unable to mkdir $collect: $!";
 			}
 		}
-		# Now move all files in the package to the directory we made.
-		if (@filelist) {
-			$this->do("mv", @filelist, "$workdir/".$this->prefixes)
-				or die "error moving unpacked files into the default prefix directory: $!";
-		}
 
-		# Deal with relocating conffiles.
+		if ($relocate) {
-		my @cf;
+			# Now move all files in the package to the directory we made.
-		foreach my $cf (@{$this->conffiles}) {
+			if (@filelist) {
-			$cf=$this->prefixes.$cf;
+				$this->do("mv", @filelist, "$workdir/".$this->prefixes)
-			push @cf, $cf;
+					or die "error moving unpacked files into the default prefix directory: $!";
+			}
+	
+			# Deal with relocating conffiles.
+			my @cf;
+			foreach my $cf (@{$this->conffiles}) {
+				$cf=$this->prefixes.$cf;
+				push @cf, $cf;
+			}
+			$this->conffiles([@cf]);
 		}
-		$this->conffiles([@cf]);
 	}
 	
 	# rpm files have two sets of permissions; the set in the cpio
@@ -219,6 +246,9 @@ sub unpack {
 	while (<GETPERMS>) {
 		chomp;
 		my ($mode, $owner, $group, $file) = split(/ /, $_, 4);
+
+		next if -l "$workdir/$file";
+
 		$mode = $mode & 07777; # remove filetype
 		my $uid = getpwnam($owner);
 		if (! defined $uid || $uid != 0) {
@@ -238,12 +268,10 @@ sub unpack {
 		if (defined($owninfo{$file}) && ($mode & 07000 > 0)) {
 			$modeinfo{$file} = sprintf "%lo", $mode;
 		}
-		next unless -e "$workdir/$file"; # skip broken links
 		if ($> == 0) {
 			$this->do("chown", "$uid:$gid", "$workdir/$file") 
 				|| die "failed chowning $file to $uid\:$gid\: $!";
 		}
-		next if -l "$workdir/$file"; # skip links
 		$this->do("chmod", sprintf("%lo", $mode), "$workdir/$file") 
 			|| die "failed changing mode of $file to $mode\: $!";
 	}
@@ -398,7 +426,9 @@ sub build {
 	}
 
 	$opts.=" $ENV{RPMBUILDOPT}" if exists $ENV{RPMBUILDOPT};
-	my $command="cd $dir; $buildcmd -bb $opts ".$this->name."-".$this->version."-".$this->release.".spec";
+	my $pwd=`pwd`;
+	chomp $pwd;
+	my $command="cd $dir; $buildcmd --buildroot=$pwd/$dir -bb $opts ".$this->name."-".$this->version."-".$this->release.".spec";
 	my $log=$this->runpipe(1, "$command 2>&1");
 	if ($?) {
 		die "Package build failed. Here's the log of the command ($command):\n", $log;
@@ -443,11 +473,16 @@ debian/slackware scripts can be anything -- perl programs or binary files
 -- and rpm is limited to only shell scripts, we need to encode the files
 and add a scrap of shell script to make it unextract and run on the fly.
 
-When setting a value, we do some mangling too. Rpm maitainer scripts
+When setting a value, we do some mangling too. Rpm maintainer scripts
-are typically shell scripts, but often lack the leading #!/bin/sh
+are typically shell scripts, but often lack the leading shebang line.
-This can confuse dpkg, so add the #!/bin/sh if it looks like there
+This can confuse dpkg, so add the shebang if it looks like there
 is no shebang magic already in place.
 
+Additionally, it's not uncommon for rpm maintainer scripts to contain
+bashisms, which can be triggered when they are ran on systems where /bin/sh
+is not bash. To work around this, the shebang line of the scripts is
+changed to use bash.
+
 Also, if the rpm is relocatable, the script could refer to
 RPM_INSTALL_PREFIX, which is set by rpm at run time. Deal with this by
 adding code to the script to set RPM_INSTALL_PREFIX.
@@ -469,9 +504,10 @@ sub _script_helper {
 
 		my $value=shift;
 		if (length $value and $value !~ m/^#!\s*\//) {
-			$value="#!/bin/sh\n$prefixcode$value";
+			$value="#!/bin/bash\n$prefixcode$value";
 		}
 		else {
+			$value=~s@^#!\s*/bin/sh(\s)@#!/bin/bash$1@;
 			$value=~s/\n/\n$prefixcode/s;
 		}
 		$this->{$script} = $value;

Alien/Package/Slp.pm

@@ -114,8 +114,11 @@ sub install {
 	my $this=shift;
 	my $slp=shift;
 
+	my $v=$Alien::Package::verbose;
+	$Alien::Package::verbose=2;
 	$this->do("slpi", $slp)
 		or die "Unable to install";
+	$Alien::Package::verbose=$v;
 }
 
 =item getfooter
@@ -355,6 +358,8 @@ sub release {
 }
 
 
+=back
+
 =head1 AUTHOR
 
 Joey Hess <joey@kitenet.net>

Alien/Package/Tgz.pm

@@ -9,10 +9,14 @@ Alien::Package::Tgz - an object that represents a tgz package
 package Alien::Package::Tgz;
 use strict;
 use base qw(Alien::Package);
+use Cwd qw(abs_path);
+
+my $tarext=qr/\.(?:tgz|tar(?:\.(?:gz|Z|z|bz|bz2))?|taz)$/;
 
 =head1 DESCRIPTION
 
 This is an object class that represents a tgz package, as used in Slackware. 
+It also allows conversion of raw tar files.
 It is derived from Alien::Package.
 
 =head1 CLASS DATA
@@ -49,7 +53,7 @@ sub checkfile {
         my $this=shift;
         my $file=shift;
 
-        return $file =~ m/.*\.(?:tgz|tar\.(?:gz|Z|z)|taz)$/;
+        return $file =~ m/$tarext$/;
 }
 
 =item install
@@ -66,8 +70,11 @@ sub install {
 	my $tgz=shift;
 
 	if (-x "/sbin/installpkg") {
+		my $v=$Alien::Package::verbose;
+		$Alien::Package::verbose=2;
 		$this->do("/sbin/installpkg", "$tgz")
 			or die "Unable to install";
+		$Alien::Package::verbose=$v;
 	}
 	else {
 		die "Sorry, I cannot install the generated .tgz file because /sbin/installpkg is not present. You can use tar to install it yourself.\n"
@@ -90,9 +97,9 @@ sub scan {
 	my ($basename)=('/'.$file)=~m#^/?.*/(.*?)$#;
 
 	# Strip out any tar extentions.
-	$basename=~s/\.(tgz|tar\.(gz|Z))$//;
+	$basename=~s/$tarext//;
 
-	if ($basename=~m/(.*)-(.*?[0-9]+.*)/) {
+	if ($basename=~m/([\w-]+)-([0-9\.?]+).*/) {
 		$this->name($1);
 		$this->version($2);
 	}
@@ -103,11 +110,11 @@ sub scan {
 
 	$this->arch('all');
 
-	$this->summary("Converted Slackware tgz package");
+	$this->summary("Converted tgz package");
 	$this->description($this->summary);
 	$this->copyright('unknown');
 	$this->release(1);
-	$this->distribution("Slackware");
+	$this->distribution("Slackware/tarball");
 	$this->group("unknown");
 	$this->origformat('tgz');
 	$this->changelogtext('');
@@ -116,7 +123,7 @@ sub scan {
 	# Now figure out the conffiles. Assume anything in etc/ is a
 	# conffile.
 	my @conffiles;
-	open (FILELIST,"tar zvtf $file | grep etc/ |") ||
+	open (FILELIST,"tar vtf $file | grep etc/ |") ||
 		die "getting filelist: $!";
 	while (<FILELIST>) {
 		# Make sure it's a normal file. This is looking at the
@@ -133,7 +140,7 @@ sub scan {
 	# Now get the whole filelist. We have to add leading /'s to the
 	# filenames. We have to ignore all files under /install/
 	my @filelist;
-	open (FILELIST, "tar ztf $file |") ||
+	open (FILELIST, "tar tf $file |") ||
 		die "getting filelist: $!";
 	while (<FILELIST>) {
 		chomp;
@@ -145,7 +152,7 @@ sub scan {
 
 	# Now get the scripts.
 	foreach my $script (keys %{scripttrans()}) {
-		$this->$script(scalar $this->runpipe(1, "tar Oxzf $file install/${scripttrans()}{$script} 2>/dev/null"));
+		$this->$script(scalar $this->runpipe(1, "tar Oxf $file install/${scripttrans()}{$script} 2>/dev/null"));
 	}
 
 	return 1;
@@ -160,9 +167,9 @@ Unpack tgz.
 sub unpack {
 	my $this=shift;
 	$this->SUPER::unpack(@_);
-	my $file=$this->filename;
+	my $file=abs_path($this->filename);
 
-	$this->do("cat $file | (cd ".$this->unpacked_tree."; tar zxpf -)")
+	$this->do("cd ".$this->unpacked_tree."; tar xpf $file")
 		or die "Unpacking of '$file' failed: $!";
 	# Delete the install directory that has slackware info in it.
 	$this->do("cd ".$this->unpacked_tree."; rm -rf ./install");
@@ -215,6 +222,8 @@ sub build {
 	return $tgz;
 }
 
+=back
+
 =head1 AUTHOR
 
 Joey Hess <joey@kitenet.net>

Makefile.PL

@@ -29,9 +29,6 @@ extra_build:
 extra_install:
 	install -d $(PREFIX)/share/alien/patches \
 		   $(VARPREFIX)/var/lib/alien
-	cp -f patches/*.diff $(PREFIX)/share/alien/patches/
-	-rm -f $(PREFIX)/share/alien/patches/*.gz
-	gzip -qf9 $(PREFIX)/share/alien/patches/*
 
 alien:
 	perl -pe '$$_="" if /use lib/; $$_="our \$$Version=\"$(VER)\";\n" if /VERSION_AUTOREPLACE/' alien.pl > alien

alien.pl

@@ -67,6 +67,9 @@ standard linux directory tree. Do NOT run B<alien> on tar files with source
 code in them, unless you want this source code to be installed in your root
 directory when you install the package!
 
+When using B<alien> to convert a tgz package, all files in /etc in are assumed
+to be configuration files.
+
 =item pkg
 
 To manipulate packages in the Solaris pkg format (which is really the SV 
@@ -127,6 +130,16 @@ Like B<-g>, but do not generate the packagename.orig directory. This is only
 useful when you are very low on disk space and are generating a debian
 package.
 
+=item B<-c>, B<--scripts>
+
+Try to convert the scripts that are meant to be run when the
+package is installed and removed. Use this with caution, because these
+scripts might be designed to work on a system unlike your own, and could
+cause problems. It is recommended that you examine the scripts by hand
+and check to see what they do before using this option.
+
+This is enabled by default when converting from lsb packages.
+
 =item B<--patch=>I<patch>
 
 Specify the patch to be used instead of automatically looking the patch up
@@ -137,7 +150,7 @@ built.
 
 Be less strict about which patch file is used, perhaps attempting to use a patch
 file for an older verson of the package. This is not guaranteed to always work;
-older patches may necessarily not work with newer packages.
+older patches may not necessarily work with newer packages.
 
 =item B<--nopatch>
 
@@ -156,16 +169,6 @@ information.
 
 Note that without an argument, this displays the version of B<alien> instead.
 
-=item B<-c>, B<--scripts>
-
-Try to convert the scripts that are meant to be run when the
-package is installed and removed. Use this with caution, becuase these
-scripts might be designed to work on a system unlike your own, and could
-cause problems. It is recommended that you examine the scripts by hand
-and check to see what they do before using this option.
-
-This is enabled by default when converting from lsb packages.
-
 =item B<-T>, B<--test>
 
 Test the generated packages. Currently this is only supported for debian
@@ -239,7 +242,7 @@ all 4 package formats.
 
 =head1 ENVIRONMENT
 
-B<alien> recognizes the following environemnt variables:
+B<alien> recognizes the following environment variables:
 
 =over 4
 
@@ -258,14 +261,6 @@ included in generated debian packages.
 
 =back
 
-=head1 NOTES
-
-When using B<alien> to convert a tgz package, all files in /etc in are assumed
-to be configuration files.
-
-If B<alien> is not run as root, the files in the generated package will have
-incorrect owners and permissions.
-
 =head1 AUTHOR
 
 B<alien> was written by Christoph Lameter, B<<clameter@debian.org>>.
@@ -513,7 +508,7 @@ foreach my $file (@ARGV) {
 				# Make sure $package does not wipe out the
 				# directory when it is destroyed.
 				$package->unpacked_tree('');
-				exit;
+				next;
 			}
 			
 			my $newfile=$package->build;

debian/changelog

@@ -1,3 +1,112 @@
+alien (8.80) unstable; urgency=low
+
+  * Support querying rpm LICENSE field. (Alexey Khoroshilov)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 18 Apr 2010 15:44:52 -0400
+
+alien (8.79) unstable; urgency=low
+
+  * Typo. Closes: #554379
+  * Modify -g and -s to support running on multiple packages at once.
+    Closes: #554404
+  * Removed all built-in patches for converting specific packages
+    (j2sdk, jdk, lgtoclnt, motif) with alien. These were out of date,
+    and not maintained. Alien will not include such patches going forward.
+  * Depend on the new rpm2cpio package. Closes: #559061
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 01 Dec 2009 13:23:55 -0500
+
+alien (8.78) unstable; urgency=low
+
+  * Add support for rpm 4.7.0, which ignores the buildroot setting in the
+    spec file, by passing --buildroot. (Thanks, Pavel Roskin)
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 08 Jul 2009 13:53:05 -0400
+
+alien (8.77) unstable; urgency=low
+
+  * Don't allow whitespace in package version when parsing debian/changelog.
+  * In rpm permission fixup code, avoid processing symlinks since that
+    would result in the file the link points to being "fixed". Closes: #535586
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 06 Jul 2009 13:37:01 -0400
+
+alien (8.76) unstable; urgency=low
+
+  * Avoid using hostname -f for portability to unix systems,
+    such as Solaris, where any options _set_ the hostname.
+  * Fix bash shebang and recognise bash scripts as editable
+    shell scripts when converting to deb. Closes: #532330
+    (Thanks, Bruce Stephens)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 08 Jun 2009 13:22:35 -0400
+
+alien (8.75) unstable; urgency=low
+
+  * Simplified rules file.
+  * Modify maintainer scripts from rpm files to use /bin/bash rather
+    than /bin/sh. Many such scripts are only tested on systems where /bin/sh
+    is bash, and contain bashisms, which can cause trouble when converting
+    the rpm to be used on eg, the Debian family of distributions, where
+    /bin/sh can legitimatly be dash. Closes: #495971
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 06 May 2009 17:22:02 -0400
+
+alien (8.74) unstable; urgency=low
+
+  * Support bzipped and uncompressed tar files, using tar's auto-compression
+    detection. (Requires gnu tar 1.14.91)
+  * pod fixes
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 19:51:54 -0500
+
+alien (8.73) unstable; urgency=low
+
+  * Fix pkg generation to not include /prototype in all packages.
+    (Kim Bisgaard)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 26 Oct 2008 23:43:47 -0400
+
+alien (8.72) unstable; urgency=low
+
+  * Use debhelper 7, rules file minimisation.
+  * Improve parsing of tgz filenames, to avoid confusion when the filename
+    includes the package type (ie, "noarch"). Patch from Andrej Ricnik-Bay.
+  * When generating a debian changelog file, work around bug #478925 by
+    including the alien changelog text inside the debian changelog entry.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 01 May 2008 15:40:34 -0400
+
+alien (8.71) unstable; urgency=low
+
+  * Deal with rpms that relocate ie, /usr into /usr/local, and don't
+    try to move /usr into /usr/local in this case. Closes: #470905
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 14 Mar 2008 13:35:33 -0400
+
+alien (8.70) unstable; urgency=low
+
+  * Extract prefixes field before extracting scripts so that
+    RPM_INSTALL_PREFIX gets set.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 12 Mar 2008 11:05:40 -0400
+
+alien (8.69) unstable; urgency=low
+
+  * Alien's repository has moved from subversion to git.
+  * Minor improvement to debian/rules clean.
+  * Improve the short description.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 19 Oct 2007 20:27:53 -0400
+
+alien (8.68) unstable; urgency=low
+
+  * Show output of installation of package with -i, since some packages
+    install scripts may have important output or even be interactive.
+    Closes: #425732
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 24 May 2007 14:08:39 -0400
+
 alien (8.67) unstable; urgency=low
 
   * Update the url to the web page, and remove several other broken urls from

debian/compat

@@ -1 +1 @@
-4
+7

debian/control

@@ -1,17 +1,18 @@
 Source: alien
 Section: admin
 Priority: optional
-Build-Depends: debhelper (>= 4), dpkg-dev (>= 1.9.0)
+Build-Depends: debhelper (>= 7.0.50)
 Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.8.3
-XS-Vcs-Svn: svn://svn.kitenet.net/joey/trunk/src/packages/alien
+Vcs-Git: git://git.kitenet.net/alien
+Homepage: http://kitenet.net/~joey/code/alien/
 
 Package: alien
 Architecture: all
 Section: admin
-Depends: debhelper (>= 3), ${misc:Depends}, ${perl:Depends}, rpm (>= 2.4.4-2), dpkg-dev, make, cpio
+Depends: debhelper (>= 3), ${misc:Depends}, ${perl:Depends}, rpm (>= 2.4.4-2), dpkg-dev, make, cpio, rpm2cpio
 Suggests: patch, bzip2, lsb-rpm, lintian
-Description: install non-native packages with dpkg
+Description: convert and install rpm and other packages
  Alien allows you to convert LSB, Red Hat, Stampede and Slackware Packages
  into Debian packages, which can be installed with dpkg.
  .

debian/docs

@@ -0,0 +1,2 @@
+README
+gendiff.txt

debian/rules

@@ -1,47 +1,20 @@
 #!/usr/bin/make -f
+%:
+	dh $@
 
-build: build-stamp
+override_dh_auto_test:
-build-stamp:
-	dh_testdir
-	perl Makefile.PL
-	$(MAKE)
 	# simple smoke test
 	./alien.pl -V
-	touch build-stamp
 
-clean:
+override_dh_auto_install:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	perl Makefile.PL
-	-$(MAKE) realclean
-	dh_clean
-
-binary-arch: build
-
-binary-indep: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
 	$(MAKE) pure_install INSTALLDIRS=vendor \
 		PREFIX=$(shell pwd)/debian/alien/$(shell perl -MConfig -e 'print $$Config{prefix}') \
 		VARPREFIX=$(shell pwd)/debian/alien
-	# Why does it make this empty directory? Sigh.
+
-	rm -rf debian/alien/usr/lib
+override_dh_auto_clean:
-	dh_installdocs README gendiff.txt
+	# distclean moans about MANIFEST, this is quieter
-	dh_installexamples
+	if [ -e Makefile ]; then $(MAKE) realclean; fi
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_perl
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
 # Not intended for use by anyone except the author.
 announcedir:
 	@echo ${HOME}/src/joeywiki/code/alien/news
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary

patches/j2sdk_1.4.2_05-1.diff

@@ -1,393 +0,0 @@
---- j2sdk-1.4.2_05.orig/debian/dirs
-+++ j2sdk-1.4.2_05/debian/dirs
-@@ -0,0 +1,4 @@
-+usr/share/doc
-+usr/share/man
-+usr/lib/netscape/plugins-libc6
-+usr/lib/mozilla/plugins
---- j2sdk-1.4.2_05.orig/debian/control
-+++ j2sdk-1.4.2_05/debian/control
-@@ -0,0 +1,24 @@
-+Source: j2sdk
-+Section: non-free/devel
-+Priority: optional
-+Maintainer: Gerald Turner <gturner@unzane.com>
-+
-+Package: j2sdk1.4
-+Architecture: i386
-+Depends: ${shlibs:Depends}
-+Provides: java-common, java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin, java-compiler, java2-compiler, j2sdk1.4, j2re1.4
-+Suggests: mozilla-browser (>= 1.2.1-10) | netscape
-+Description: Java(TM) 2 SDK, Standard Edition, Sun Microsystems(TM)
-+ The Java(TM) 2 SDK is a development environment for building
-+ applications, applets, and components that can be deployed on the
-+ Java platform.
-+ .
-+ The Java(TM) 2 SDK software includes tools useful for developing and
-+ testing programs written in the Java programming language and running
-+ on the Java platform. These tools are designed to be used from the
-+ command line. Except for appletviewer, these tools do not provide a
-+ graphical user interface.
-+ .
-+ This package has been converted from a rpm package by alien version
-+ 8.46 using a special diff file to help make the package conform to
-+ debian policy written by Gerald Turner.
---- j2sdk-1.4.2_05.orig/debian/prerm
-+++ j2sdk-1.4.2_05/debian/prerm
-@@ -0,0 +1,39 @@
-+#!/bin/sh
-+
-+case "`uname -m`" in
-+    i[3-7]86 | ia32 | ia64)
-+        ARCH=i386
-+        ;;
-+    sparc*)
-+        ARCH=sparc
-+        ;;
-+    *)
-+        ARCH="`uname -m`"
-+        ;;
-+esac
-+
-+if [ $1 = remove ]
-+then
-+    for i in appletviewer extcheck idlj jar jarsigner java java-rmi.cgi javac \
-+             javadoc javah javap jdb keytool kinit klist ktab native2ascii    \
-+             orbd policytool rmic rmid rmiregistry serialver servertool       \
-+             tnameserv HtmlConverter
-+    do
-+        update-alternatives --remove $i /usr/lib/j2sdk-1.4.2/bin/$i
-+    done
-+
-+    for i in ControlPanel
-+    do
-+        update-alternatives --remove $i /usr/lib/j2sdk-1.4.2/jre/bin/$i
-+    done
-+
-+    update-alternatives \
-+        --remove \
-+        javaplugin.so \
-+        /usr/lib/j2sdk-1.4.2/jre/plugin/${ARCH}/ns4/libjavaplugin.so
-+
-+    update-alternatives \
-+        --remove \
-+        javaplugin_oji.so \
-+        /usr/lib/j2sdk-1.4.2/jre/plugin/${ARCH}/ns610-gcc32/libjavaplugin_oji.so
-+fi
---- j2sdk-1.4.2_05.orig/debian/rules
-+++ j2sdk-1.4.2_05/debian/rules
-@@ -0,0 +1,99 @@
-+#!/usr/bin/make -f
-+# debian/rules for alien
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# Use v4 compatability mode, so ldconfig gets added to maint scripts.
-+export DH_COMPAT=4
-+
-+PACKAGE=$(shell dh_listpackages)
-+
-+JAVA_HOME := debian/$(PACKAGE)/usr/lib/j2sdk-1.4.2
-+MAN_DIR := debian/$(PACKAGE)/usr/share/man
-+
-+build:
-+	dh_testdir
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	dh_clean
-+
-+binary-indep: build
-+
-+binary-arch: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+
-+# Copy the packages's files.
-+	find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \
-+		xargs -0 -r -i cp -a {} debian/$(PACKAGE)
-+
-+#
-+# If you need to move files around in debian/$(PACKAGE) or do some
-+# binary patching, do it here
-+#
-+
-+# Move RPM contents to a proper debian/blackdown directory
-+	mv debian/$(PACKAGE)/usr/java/j2sdk1.4.2_05 $(JAVA_HOME)
-+	rmdir debian/$(PACKAGE)/usr/java
-+
-+# Move man pages to /usr/share/man
-+	mv $(JAVA_HOME)/man/* $(MAN_DIR)
-+	rmdir $(JAVA_HOME)/man
-+
-+# Move Japanese man pages further
-+	rm $(MAN_DIR)/ja
-+	mv $(MAN_DIR)/ja_JP.eucJP $(MAN_DIR)/ja
-+	for i in `find $(MAN_DIR) -type f` ;                              \
-+          do mv $$i `echo $$i | sed 's/\.\([^.]*\)$$/.j2sdk-1_4_2.\1/'` ; \
-+        done
-+
-+# Unpack tripple compressed jars that showed up in 1.4.2
-+	if [ -x $(JAVA_HOME)/lib/unpack ] ; then           \
-+          for i in `find $(JAVA_HOME) -name \*.pack` ; do  \
-+            $(JAVA_HOME)/lib/unpack                        \
-+              $$i `dirname $$i`/`basename $$i .pack`.jar ; \
-+          done ;                                           \
-+        fi
-+
-+# Fix ControlPanel shell script incompatibilities
-+	if [ -f $(JAVA_HOME)/jre/bin/ControlPanel ] ; then \
-+          sed "s/\/usr\/bin\/ls/\/bin\/ls/g;               \
-+	       s/expr \(.*\) : '^/expr \1 : '/;"           \
-+            $(JAVA_HOME)/jre/bin/ControlPanel              \
-+	    > $(JAVA_HOME)/jre/bin/ControlPanel.tmp ;      \
-+          mv $(JAVA_HOME)/jre/bin/ControlPanel.tmp         \
-+             $(JAVA_HOME)/jre/bin/ControlPanel ;           \
-+          chmod 755 $(JAVA_HOME)/jre/bin/ControlPanel ;    \
-+        fi
-+
-+# Include optional documentation
-+	if [ -f ../j2sdk-1_4_2-doc.zip ] ; then                          \
-+            unzip -q -d debian/$(PACKAGE)/usr/share/doc                  \
-+                  ../j2sdk-1_4_2-doc.zip ;                               \
-+            mv debian/$(PACKAGE)/usr/share/doc/docs                      \
-+               debian/$(PACKAGE)/usr/share/doc/$(PACKAGE) ;              \
-+        else                                                             \
-+            echo j2sdk-1_4_2-doc.zip not found, skipping documentation ; \
-+        fi
-+
-+	dh_installdocs
-+	dh_installchangelogs
-+
-+# This has been known to break on some wacky binaries.
-+#	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_makeshlibs
-+	dh_installdeb
-+	-dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary
---- j2sdk-1.4.2_05.orig/debian/changelog
-+++ j2sdk-1.4.2_05/debian/changelog
-@@ -0,0 +1,86 @@
-+j2sdk (2:1.4.2_05-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@unzane.com>  Fri, 01 Oct 2004 10:01:53 -0700
-+
-+j2sdk (2:1.4.2_03-1) experimental; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Mon, 19 Jan 2004 12:33:32 -0800
-+
-+j2sdk (2:1.4.2-1) experimental; urgency=low
-+
-+  * Fix ControlPanel shell script incompatibilities.  Closes: #200731
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Thu, 10 Jul 2003 09:59:23 -0700
-+
-+j2sdk (1:1.4.2-1) experimental; urgency=low
-+
-+  * alien echoes the wrong filename, "j2sdk_1.4.2-1_i386.deb generated",
-+    and fails to install when using the -i option.  Reverted package name
-+    j2sdk1.4 to j2sdk.  Changed package version to 1 and use an epoch.
-+    Closes: #199992
-+  * The intent of the j2sdk1.4 package rename was so that that multiple
-+    j2sdk versions could be installed simultaneously (i.e. j2sdk1.3).
-+    This is no longer possible using this patch.
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Sun,  6 Jul 2003 13:39:31 -0700
-+
-+j2sdk (1.4.2-6) experimental; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Mon, 30 Jun 2003 15:46:47 -0700
-+
-+j2sdk (1.4.1_02-5) experimental; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Fri, 14 Mar 2003 14:43:45 -0800
-+
-+j2sdk (1.4.1_01-4) experimental; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Tue, 14 Jan 2003 17:03:09 -0800
-+
-+j2sdk (1.4.1-3) experimental; urgency=low
-+
-+  * New upstream release
-+  * Detection and installation of j2sdk-1_4_1-doc.zip (must be downloaded
-+    and copied to the same directory where alien is executed)
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Wed,  2 Oct 2002 16:41:24 -0700
-+
-+j2sdk (1.4.1-2) experimental; urgency=low
-+
-+  * Added java-common Depends
-+  * Added java-virtual-machine, java2-runtime, java-compiler, and
-+    java2-compiler Provides
-+  * Added netscape and mozilla Suggests
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Thu, 23 Aug 2002 09:07:09 -0700
-+
-+j2sdk (1.4.1-1) experimental; urgency=low
-+
-+  * New upstream release
-+  * Detection and installation of j2sdk-1_4_1-rc-doc.zip (must be downloaded
-+    and copied to the same directory where alien is executed)
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Thu, 22 Aug 2002 16:22:33 -0700
-+
-+j2sdk (1.4.0_01-1) experimental; urgency=low
-+
-+  * New upstream release
-+  * Detection and installation of j2sdk-1_4_0-doc.zip (must be downloaded
-+    and copied to the same directory where alien is executed)
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Thu, 22 Aug 2002 15:44:54 -0700
-+
-+j2sdk (1.4.0-1) experimental; urgency=low
-+
-+  * Converted from .rpm format to .deb
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Wed, 22 May 2002 12:46:34 -0700
---- j2sdk-1.4.2_05.orig/debian/postinst
-+++ j2sdk-1.4.2_05/debian/postinst
-@@ -0,0 +1,85 @@
-+#!/bin/sh
-+
-+case "`uname -m`" in
-+    i[3-7]86 | ia32 | ia64)
-+        ARCH=i386
-+        ;;
-+    sparc*)
-+        ARCH=sparc
-+        ;;
-+    *)
-+        ARCH="`uname -m`"
-+        ;;
-+esac
-+
-+if [ $1 = configure ]
-+then
-+    for i in appletviewer extcheck idlj jar jarsigner java java-rmi.cgi javac \
-+             javadoc javah javap jdb keytool kinit klist ktab native2ascii    \
-+             orbd policytool rmic rmid rmiregistry serialver servertool       \
-+             tnameserv HtmlConverter
-+    do
-+        if [ -e /usr/share/man/man1/$i.j2sdk-1_4_2.1.gz ]
-+        then
-+            if [ -e /usr/share/man/ja/man1/$i.j2sdk-1_4_2.1.gz ]
-+            then
-+                update-alternatives \
-+                    --install \
-+                        /usr/bin/$i \
-+                        $i \
-+                        /usr/lib/j2sdk-1.4.2/bin/$i \
-+                        1425 \
-+                    --slave \
-+                        /usr/share/man/man1/$i.1.gz \
-+                        $i.1.gz \
-+                        /usr/share/man/man1/$i.j2sdk-1_4_2.1.gz \
-+                    --slave \
-+                        /usr/share/man/ja/man1/$i.1.gz \
-+                        $i.ja.1.gz \
-+                        /usr/share/man/ja/man1/$i.j2sdk-1_4_2.1.gz
-+            else
-+                update-alternatives \
-+                    --install \
-+                        /usr/bin/$i \
-+                        $i \
-+                        /usr/lib/j2sdk-1.4.2/bin/$i \
-+                        1425 \
-+                    --slave \
-+                        /usr/share/man/man1/$i.1.gz \
-+                        $i.1.gz \
-+                        /usr/share/man/man1/$i.j2sdk-1_4_2.1.gz
-+            fi
-+        else
-+            update-alternatives \
-+                --install \
-+                    /usr/bin/$i \
-+                    $i \
-+                    /usr/lib/j2sdk-1.4.2/bin/$i \
-+                    1425
-+        fi
-+    done
-+
-+    for i in ControlPanel
-+    do
-+        update-alternatives \
-+            --install \
-+                /usr/bin/$i \
-+                $i \
-+                /usr/lib/j2sdk-1.4.2/jre/bin/$i \
-+                1425
-+    done
-+
-+    update-alternatives \
-+        --install \
-+        /usr/lib/netscape/plugins-libc6/javaplugin.so \
-+        javaplugin.so \
-+        /usr/lib/j2sdk-1.4.2/jre/plugin/${ARCH}/ns4/libjavaplugin.so \
-+        1425
-+
-+    update-alternatives \
-+        --install \
-+        /usr/lib/mozilla/plugins/javaplugin_oji.so \
-+        javaplugin_oji.so \
-+        /usr/lib/j2sdk-1.4.2/jre/plugin/${ARCH}/ns610-gcc32/libjavaplugin_oji.so \
-+        1425
-+fi
---- j2sdk-1.4.2_05.orig/debian/copyright
-+++ j2sdk-1.4.2_05/debian/copyright
-@@ -0,0 +1,35 @@
-+This package was debianized by the alien program by converting
-+a binary .rpm package on Mon, 19 Jan 2004 12:33:32 -0800
-+
-+Copyright: 1994-2001 Sun Microsystems, Inc.
-+
-+Information from the binary package:
-+Name        : j2sdk                        Relocations: (not relocateable)
-+Version     : 1.4.2_03                          Vendor: Sun Microsystems
-+Release     : fcs                           Build Date: Tue Nov 18 17:08:10 2003
-+Install date: (not installed)               Build Host: localhost.localdomain
-+Group       : Development/Tools             Source RPM: j2sdk-1.4.2_03-fcs.src.rpm
-+Size        : 65744430                         License: 1994-2001 Sun Microsystems, Inc.
-+Packager    : Java Software <j2se-comments@java.sun.com>
-+URL         : http://java.sun.com/linux
-+Summary     : Java(TM) 2 Software Development Kit, Standard Edition
-+Description :
-+The Java 2 SDK, Standard Edition includes the Java
-+Virtual Machine, core class libraries and tools used
-+by programmers to develop Java software applets and
-+applications. The SDK also provides the foundation
-+for IDE (Integrated Development Environment) tools
-+such as Sun's Forte for Java, Community Edition,
-+the Java(TM) 2 Platform, Enterprise Edition (J2EE),
-+Java-based application servers and more.
-+The Java 2 Software Development Kit, SDK, is a
-+development environment for building applications,
-+applets, and components that can be deployed on
-+the Java platform. The Java 2 SDK software includes
-+tools useful for developing and testing programs
-+written in the Java programming language and running
-+on the Java platform.  These tools are designed to
-+be used from the command line.  Except for
-+appletviewer, these tools do not provide a
-+graphical user interface.
-+

patches/jdk_1.5.0-1.diff

@@ -1,420 +0,0 @@
---- jdk-1.5.0.orig/debian/dirs
-+++ jdk-1.5.0/debian/dirs
-@@ -0,0 +1,4 @@
-+usr/share/doc
-+usr/share/man
-+usr/lib/netscape/plugins-libc6
-+usr/lib/mozilla/plugins
---- jdk-1.5.0.orig/debian/control
-+++ jdk-1.5.0/debian/control
-@@ -0,0 +1,24 @@
-+Source: jdk
-+Section: non-free/devel
-+Priority: optional
-+Maintainer: Gerald Turner <gturner@unzane.com>
-+
-+Package: jdk1.5
-+Architecture: i386
-+Depends: ${shlibs:Depends}
-+Provides: java-common, java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin, java-compiler, java2-compiler, j2sdk1.4, j2re1.4
-+Suggests: mozilla-browser (>= 1.2.1-10)
-+Description: Java(TM) 2 SDK, Standard Edition, Sun Microsystems(TM)
-+ The Java(TM) 2 SDK is a development environment for building
-+ applications, applets, and components that can be deployed on the
-+ Java platform.
-+ .
-+ The Java(TM) 2 SDK software includes tools useful for developing and
-+ testing programs written in the Java programming language and running
-+ on the Java platform. These tools are designed to be used from the
-+ command line. Except for appletviewer, these tools do not provide a
-+ graphical user interface.
-+ .
-+ This package has been converted from a rpm package by alien version
-+ 8.46 using a special diff file to help make the package conform to
-+ debian policy written by Gerald Turner.
---- jdk-1.5.0.orig/debian/prerm
-+++ jdk-1.5.0/debian/prerm
-@@ -0,0 +1,35 @@
-+#!/bin/sh
-+
-+case "`uname -m`" in
-+    i[3-7]86 | ia32 | ia64)
-+        ARCH=i386
-+        ;;
-+    sparc*)
-+        ARCH=sparc
-+        ;;
-+    *)
-+        ARCH="`uname -m`"
-+        ;;
-+esac
-+
-+if [ $1 = remove ]
-+then
-+    for i in appletviewer ControlPanel extcheck HtmlConverter idlj jar      \
-+             jarsigner java javac javadoc javah javap java-rmi.cgi javaws   \
-+             jconsole jdb jinfo jmap jps jsadebugd jstack jstat jstatd      \
-+             keytool kinit klist ktab native2ascii orbd pack200 policytool  \
-+             rmic rmid rmiregistry serialver servertool tnameserv unpack200
-+    do
-+        update-alternatives --remove $i /usr/lib/j2sdk-1.5.0/bin/$i
-+    done
-+
-+    for i in apt
-+    do
-+        update-alternatives --remove j$i /usr/lib/j2sdk-1.5.0/bin/$i
-+    done
-+
-+    update-alternatives \
-+        --remove \
-+        javaplugin_oji.so \
-+        /usr/lib/j2sdk-1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so
-+fi
---- jdk-1.5.0.orig/debian/rules
-+++ jdk-1.5.0/debian/rules
-@@ -0,0 +1,108 @@
-+#!/usr/bin/make -f
-+# debian/rules for alien
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# Use v4 compatability mode, so ldconfig gets added to maint scripts.
-+export DH_COMPAT=4
-+
-+PACKAGE=$(shell dh_listpackages)
-+
-+JAVA_HOME := debian/$(PACKAGE)/usr/lib/j2sdk-1.5.0
-+MAN_DIR := debian/$(PACKAGE)/usr/share/man
-+
-+build:
-+	dh_testdir
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	dh_clean
-+
-+binary-indep: build
-+
-+binary-arch: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+
-+# Copy the packages's files.
-+	find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \
-+		xargs -0 -r -i cp -a {} debian/$(PACKAGE)
-+
-+#
-+# If you need to move files around in debian/$(PACKAGE) or do some
-+# binary patching, do it here
-+#
-+
-+# Move RPM contents to a proper debian/blackdown directory
-+	mv debian/$(PACKAGE)/usr/java/jdk1.5.0 $(JAVA_HOME)
-+	rmdir debian/$(PACKAGE)/usr/java
-+
-+# Move man pages to /usr/share/man
-+	mv $(JAVA_HOME)/man/* $(MAN_DIR)
-+	rmdir $(JAVA_HOME)/man
-+
-+# Move Japanese man pages further
-+	rm $(MAN_DIR)/ja
-+	mv $(MAN_DIR)/ja_JP.eucJP $(MAN_DIR)/ja
-+	for i in `find $(MAN_DIR) -type f` ;                              \
-+          do mv $$i `echo $$i | sed 's/\.\([^.]*\)$$/.j2sdk-1_5_0.\1/'` ; \
-+        done
-+
-+# Unpack tripple compressed jars that showed up in 1.4.2
-+	if [ -x $(JAVA_HOME)/bin/unpack200 ] ; then        \
-+          for i in `find $(JAVA_HOME) -name \*.pack` ; do  \
-+            $(JAVA_HOME)/bin/unpack200                     \
-+              $$i `dirname $$i`/`basename $$i .pack`.jar ; \
-+          done ;                                           \
-+        fi
-+
-+# Fix ControlPanel shell script incompatibilities
-+	if [ -f $(JAVA_HOME)/bin/ControlPanel ] ; then \
-+          sed "s/\/usr\/bin\/ls/\/bin\/ls/g;           \
-+	       s/expr \(.*\) : '^/expr \1 : '/;"       \
-+            $(JAVA_HOME)/bin/ControlPanel              \
-+	    > $(JAVA_HOME)/bin/ControlPanel.tmp ;      \
-+          mv $(JAVA_HOME)/bin/ControlPanel.tmp         \
-+             $(JAVA_HOME)/bin/ControlPanel ;           \
-+          chmod 755 $(JAVA_HOME)/bin/ControlPanel ;    \
-+        fi
-+	if [ -f $(JAVA_HOME)/jre/bin/ControlPanel ] ; then \
-+          sed "s/\/usr\/bin\/ls/\/bin\/ls/g;               \
-+	       s/expr \(.*\) : '^/expr \1 : '/;"           \
-+            $(JAVA_HOME)/jre/bin/ControlPanel              \
-+	    > $(JAVA_HOME)/jre/bin/ControlPanel.tmp ;      \
-+          mv $(JAVA_HOME)/jre/bin/ControlPanel.tmp         \
-+             $(JAVA_HOME)/jre/bin/ControlPanel ;           \
-+          chmod 755 $(JAVA_HOME)/jre/bin/ControlPanel ;    \
-+        fi
-+
-+# Include optional documentation
-+	if [ -f ../jdk-1_5_0-doc.zip ] ; then                            \
-+            unzip -q -d debian/$(PACKAGE)/usr/share/doc                  \
-+                  ../jdk-1_5_0-doc.zip ;                                 \
-+            mv debian/$(PACKAGE)/usr/share/doc/docs                      \
-+               debian/$(PACKAGE)/usr/share/doc/$(PACKAGE) ;              \
-+        else                                                             \
-+            echo jdk-1_5_0-doc.zip not found, skipping documentation   ; \
-+        fi
-+
-+	dh_installdocs
-+	dh_installchangelogs
-+
-+# This has been known to break on some wacky binaries.
-+#	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_makeshlibs
-+	dh_installdeb
-+	-dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary
---- jdk-1.5.0.orig/debian/changelog
-+++ jdk-1.5.0/debian/changelog
-@@ -0,0 +1,92 @@
-+jdk (1.5.0-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@unzane.com>  Fri, 01 Oct 2004 14:19:16 -0700
-+
-+j2sdk (2:1.4.2_05-1) experimental; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@unzane.com>  Fri, 01 Oct 2004 10:01:53 -0700
-+
-+j2sdk (2:1.4.2_03-1) experimental; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Mon, 19 Jan 2004 12:33:32 -0800
-+
-+j2sdk (2:1.4.2-1) experimental; urgency=low
-+
-+  * Fix ControlPanel shell script incompatibilities.  Closes: #200731
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Thu, 10 Jul 2003 09:59:23 -0700
-+
-+j2sdk (1:1.4.2-1) experimental; urgency=low
-+
-+  * alien echoes the wrong filename, "j2sdk_1.4.2-1_i386.deb generated",
-+    and fails to install when using the -i option.  Reverted package name
-+    j2sdk1.4 to j2sdk.  Changed package version to 1 and use an epoch.
-+    Closes: #199992
-+  * The intent of the j2sdk1.4 package rename was so that that multiple
-+    j2sdk versions could be installed simultaneously (i.e. j2sdk1.3).
-+    This is no longer possible using this patch.
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Sun,  6 Jul 2003 13:39:31 -0700
-+
-+j2sdk (1.4.2-6) experimental; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Mon, 30 Jun 2003 15:46:47 -0700
-+
-+j2sdk (1.4.1_02-5) experimental; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Fri, 14 Mar 2003 14:43:45 -0800
-+
-+j2sdk (1.4.1_01-4) experimental; urgency=low
-+
-+  * New upstream release
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Tue, 14 Jan 2003 17:03:09 -0800
-+
-+j2sdk (1.4.1-3) experimental; urgency=low
-+
-+  * New upstream release
-+  * Detection and installation of j2sdk-1_4_1-doc.zip (must be downloaded
-+    and copied to the same directory where alien is executed)
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Wed,  2 Oct 2002 16:41:24 -0700
-+
-+j2sdk (1.4.1-2) experimental; urgency=low
-+
-+  * Added java-common Depends
-+  * Added java-virtual-machine, java2-runtime, java-compiler, and
-+    java2-compiler Provides
-+  * Added netscape and mozilla Suggests
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Thu, 23 Aug 2002 09:07:09 -0700
-+
-+j2sdk (1.4.1-1) experimental; urgency=low
-+
-+  * New upstream release
-+  * Detection and installation of j2sdk-1_4_1-rc-doc.zip (must be downloaded
-+    and copied to the same directory where alien is executed)
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Thu, 22 Aug 2002 16:22:33 -0700
-+
-+j2sdk (1.4.0_01-1) experimental; urgency=low
-+
-+  * New upstream release
-+  * Detection and installation of j2sdk-1_4_0-doc.zip (must be downloaded
-+    and copied to the same directory where alien is executed)
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Thu, 22 Aug 2002 15:44:54 -0700
-+
-+j2sdk (1.4.0-1) experimental; urgency=low
-+
-+  * Converted from .rpm format to .deb
-+
-+ -- Gerald Turner <gturner@newedgenetworks.com>  Wed, 22 May 2002 12:46:34 -0700
---- jdk-1.5.0.orig/debian/postinst
-+++ jdk-1.5.0/debian/postinst
-@@ -0,0 +1,111 @@
-+#!/bin/sh
-+
-+case "`uname -m`" in
-+    i[3-7]86 | ia32 | ia64)
-+        ARCH=i386
-+        ;;
-+    sparc*)
-+        ARCH=sparc
-+        ;;
-+    *)
-+        ARCH="`uname -m`"
-+        ;;
-+esac
-+
-+if [ $1 = configure ]
-+then
-+    for i in appletviewer ControlPanel extcheck HtmlConverter idlj jar      \
-+             jarsigner java javac javadoc javah javap java-rmi.cgi javaws   \
-+             jconsole jdb jinfo jmap jps jsadebugd jstack jstat jstatd      \
-+             keytool kinit klist ktab native2ascii orbd pack200 policytool  \
-+             rmic rmid rmiregistry serialver servertool tnameserv unpack200
-+    do
-+        if [ -e /usr/share/man/man1/$i.j2sdk-1_5_0.1.gz ]
-+        then
-+            if [ -e /usr/share/man/ja/man1/$i.j2sdk-1_5_0.1.gz ]
-+            then
-+                update-alternatives \
-+                    --install \
-+                        /usr/bin/$i \
-+                        $i \
-+                        /usr/lib/j2sdk-1.5.0/bin/$i \
-+                        1500 \
-+                    --slave \
-+                        /usr/share/man/man1/$i.1.gz \
-+                        $i.1.gz \
-+                        /usr/share/man/man1/$i.j2sdk-1_5_0.1.gz \
-+                    --slave \
-+                        /usr/share/man/ja/man1/$i.1.gz \
-+                        $i.ja.1.gz \
-+                        /usr/share/man/ja/man1/$i.j2sdk-1_5_0.1.gz
-+            else
-+                update-alternatives \
-+                    --install \
-+                        /usr/bin/$i \
-+                        $i \
-+                        /usr/lib/j2sdk-1.5.0/bin/$i \
-+                        1500 \
-+                    --slave \
-+                        /usr/share/man/man1/$i.1.gz \
-+                        $i.1.gz \
-+                        /usr/share/man/man1/$i.j2sdk-1_5_0.1.gz
-+            fi
-+        else
-+            update-alternatives \
-+                --install \
-+                    /usr/bin/$i \
-+                    $i \
-+                    /usr/lib/j2sdk-1.5.0/bin/$i \
-+                    1500
-+        fi
-+    done
-+
-+    for i in apt
-+    do
-+        if [ -e /usr/share/man/man1/$i.j2sdk-1_5_0.1.gz ]
-+        then
-+            if [ -e /usr/share/man/ja/man1/$i.j2sdk-1_5_0.1.gz ]
-+            then
-+                update-alternatives \
-+                    --install \
-+                        /usr/bin/j$i \
-+                        j$i \
-+                        /usr/lib/j2sdk-1.5.0/bin/$i \
-+                        1500 \
-+                    --slave \
-+                        /usr/share/man/man1/j$i.1.gz \
-+                        j$i.1.gz \
-+                        /usr/share/man/man1/$i.j2sdk-1_5_0.1.gz \
-+                    --slave \
-+                        /usr/share/man/ja/man1/j$i.1.gz \
-+                        j$i.ja.1.gz \
-+                        /usr/share/man/ja/man1/$i.j2sdk-1_5_0.1.gz
-+            else
-+                update-alternatives \
-+                    --install \
-+                        /usr/bin/j$i \
-+                        j$i \
-+                        /usr/lib/j2sdk-1.5.0/bin/$i \
-+                        1500 \
-+                    --slave \
-+                        /usr/share/man/man1/j$i.1.gz \
-+                        j$i.1.gz \
-+                        /usr/share/man/man1/$i.j2sdk-1_5_0.1.gz
-+            fi
-+        else
-+            update-alternatives \
-+                --install \
-+                    /usr/bin/j$i \
-+                    j$i \
-+                    /usr/lib/j2sdk-1.5.0/bin/$i \
-+                    1500
-+        fi
-+    done
-+
-+    update-alternatives \
-+        --install \
-+        /usr/lib/mozilla/plugins/javaplugin_oji.so \
-+        javaplugin_oji.so \
-+        /usr/lib/j2sdk-1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
-+        1500
-+fi
---- jdk-1.5.0.orig/debian/copyright
-+++ jdk-1.5.0/debian/copyright
-@@ -0,0 +1,25 @@
-+This package was debianized by the alien program by converting
-+a binary .rpm package on Fri,  1 Oct 2004 10:18:23 -0700
-+
-+Copyright: Sun Microsystems Binary Code License (BCL)
-+
-+Information from the binary package:
-+Name        : jdk                          Relocations: /usr/java 
-+Version     : 1.5.0                             Vendor: Sun Microsystems, Inc.
-+Release     : fcs                           Build Date: Wed 15 Sep 2004 06:18:37 AM PDT
-+Install date: (not installed)               Build Host: tiger-linux
-+Group       : Development/Tools             Source RPM: jdk-1.5.0-fcs.src.rpm
-+Size        : 80132114                         License: Sun Microsystems Binary Code License (BCL)
-+Packager    : Java Software <j2se-comments@java.sun.com>
-+URL         : http://java.sun.com/
-+Summary     : Java(TM) 2 Platform Standard Edition Development Kit
-+Description :
-+The Java 2 Platform Standard Edition Development Kit (JDK) includes both the
-+runtime environment (Java virtual machine, the Java platform classes and
-+supporting files) and development tools (compilers, debuggers, tool libraries
-+and other tools).
-+
-+The JDK is a development environment for building applications, applets and
-+components that can be deployed with the Java 2 Platform Standard Edition
-+Runtime Environment.
-+

patches/lgtoclnt_7.1.2-2.diff

@@ -1,145 +0,0 @@
---- lgtoclnt-7.1.2.orig/debian/copyright
-+++ lgtoclnt-7.1.2/debian/copyright
-@@ -0,0 +1,20 @@
-+This package was debianized by the alien program by converting
-+a binary .rpm package on Wed, 13 Oct 2004 10:49:10 -0400
-+
-+Copyright: commercial
-+
-+Information from the binary package:
-+Name        : lgtoclnt                     Relocations: /usr 
-+Version     : 7.1.2                             Vendor: LEGATO Software, a Division of EMC
-+Release     : 1                             Build Date: Fri Jun  4 06:13:15 2004
-+Install date: (not installed)               Build Host: azzurro.legato.com
-+Group       : Utilities                     Source RPM: lgtoclnt-7.1.2-1.src.rpm
-+Size        : 34958741                         License: commercial
-+Packager    : Support support@legato.com
-+URL         : http://www.legato.com
-+Summary     : LEGATO NetWorker Client for Linux Platforms
-+Description :
-+LEGATO's NetWorker client is a set of programs that manage automated
-+backups to and directed retrievals from a LEGATO NetWorker server across
-+the network.
-+
---- lgtoclnt-7.1.2.orig/debian/dirs
-+++ lgtoclnt-7.1.2/debian/dirs
-@@ -0,0 +1 @@
-+etc
---- lgtoclnt-7.1.2.orig/debian/lgtoclnt.networker.init
-+++ lgtoclnt-7.1.2/debian/lgtoclnt.networker.init
-@@ -0,0 +1,27 @@
-+#!/bin/sh 
-+case $1 in
-+'start')
-+        (echo  'starting NetWorker daemons:') > /dev/console
-+        if [ -f /usr/sbin/nsrexecd ]; then
-+                (/usr/sbin/nsrexecd)       > /dev/console 2>&1
-+                (echo  ' nsrexecd') > /dev/console
-+                (echo '') > /dev/console
-+        fi
-+        if [ -f /usr/sbin/nsrd ]; then
-+                (/usr/sbin/nsrd) > /dev/console 2>&1
-+                (echo  ' nsrd') > /dev/console
-+                (echo '') > /dev/console
-+        fi
-+;;
-+'stop')
-+        (echo  'stopping NetWorker daemons:') > /dev/console
-+        if [ -f /usr/sbin/nsr_shutdown ]; then
-+                (/usr/sbin/nsr_shutdown -a -q&) > /dev/console 2>&1
-+                (echo  ' nsr_shutdown -a -q')   > /dev/console
-+                (echo '') > /dev/console
-+        fi
-+;;
-+*)
-+        echo "usage: `basename $0` {start|stop}"
-+;;
-+esac
---- lgtoclnt-7.1.2.orig/debian/control
-+++ lgtoclnt-7.1.2/debian/control
-@@ -0,0 +1,14 @@
-+Source: lgtoclnt
-+Section: non-free/admin
-+Priority: extra
-+Maintainer: Clint Adams <schizo@debian.org>
-+
-+Package: lgtoclnt
-+Architecture: i386
-+Depends: ${shlibs:Depends}
-+Description: LEGATO NetWorker Client for Linux Platforms
-+ LEGATO's NetWorker client is a set of programs that manage automated
-+ backups to and directed retrievals from a LEGATO NetWorker server across
-+ the network.
-+ .
-+ (Converted from a rpm package by alien version 8.47.)
---- lgtoclnt-7.1.2.orig/debian/changelog
-+++ lgtoclnt-7.1.2/debian/changelog
-@@ -0,0 +1,10 @@
-+lgtoclnt (7.1.2-2) experimental; urgency=low
-+
-+  * Converted from .rpm format to .deb
-+    by alien version 8.47
-+  * Moved app-defaults to /etc/X11.
-+  * Re-added init script.
-+
-+ -- Clint Adams <schizo@debian.org>  Wed, 13 Oct 2004 10:49:10 -0400
-+
-+Initial deployment.
---- lgtoclnt-7.1.2.orig/debian/rules
-+++ lgtoclnt-7.1.2/debian/rules
-@@ -0,0 +1,55 @@
-+#!/usr/bin/make -f
-+# debian/rules for alien
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# Use v3 compatability mode, so ldconfig gets added to maint scripts.
-+export DH_COMPAT=4
-+
-+PACKAGE=$(shell dh_listpackages)
-+
-+build:
-+	dh_testdir
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -d
-+
-+binary-indep: build
-+
-+binary-arch: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k -d
-+	dh_installdirs
-+
-+	dh_installdocs
-+	dh_installchangelogs
-+
-+# Copy the packages's files.
-+	find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \
-+		xargs -0 -r -i cp -a {} debian/$(PACKAGE)
-+
-+	mv debian/$(PACKAGE)/usr/lib/X11 debian/$(PACKAGE)/etc
-+
-+#
-+# If you need to move files around in debian/$(PACKAGE) or do some
-+# binary patching, do it here
-+#
-+
-+	dh_installinit --name=networker --update-rcd-params="defaults 95 5"
-+# This has been known to break on some wacky binaries.
-+#	dh_strip
-+	dh_compress
-+#	dh_fixperms
-+	dh_makeshlibs
-+	dh_installdeb
-+	-dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary

patches/motif-devel_2.1.10-7.diff

@@ -1,381 +0,0 @@
---- motif-devel-2.1.10.orig/debian/changelog-template
-+++ motif-devel-2.1.10/debian/changelog-template
-@@ -0,0 +1,31 @@
-+#PACKAGE# (#VERS#-7) unstable; urgency=low
-+
-+  * Disabled dh_undocumented.
-+  * Removed dh_suidregister.
-+
-+ -- Andreas Voegele <andreas.voegele@gmx.de>  Tue, 16 Jan 2001 11:58:56 +0100
-+
-+#PACKAGE# (#VERS#-6) unstable; urgency=low
-+
-+  * Depends on xlibs-dev.
-+
-+ -- Andreas Voegele <andreas.voegele@gmx.de>  Sat,  9 Dec 2000 12:27:50 +0100
-+
-+#PACKAGE# (#VERS#-5) unstable; urgency=low
-+
-+  * Made mxterm use libncurses.so.5 instead of libtermcap.so.2.
-+
-+ -- Andreas Voegele <andreas.voegele@gmx.de>  Mon,  3 Jan 2000 10:04:26 +0100
-+
-+#PACKAGE# (#VERS#-4) unstable; urgency=low
-+
-+  * Converted from RPM binary format to Debian.
-+  * Added *.so symlinks.
-+  * Added mxmkmf.
-+  * Enabled dh_undocumented and dh_fixperms.
-+
-+ -- Andreas Voegele <andreas.voegele@gmx.de>  Tue, 16 Nov 1999 19:31:18 +0100
-+
-+Local variables:
-+mode: debian-changelog
-+End:
---- motif-devel-2.1.10.orig/debian/control
-+++ motif-devel-2.1.10/debian/control
-@@ -0,0 +1,14 @@
-+Source: motif-devel
-+Section: non-free/x11
-+Priority: extra
-+Build-Depends: debhelper, motif
-+Maintainer: Andreas Voegele <andreas.voegele@gmx.de>
-+Standards-Version: 3.1.1
-+
-+Package: motif-devel
-+Architecture: any
-+Depends: motif (= ${Source-Version}), libc6-dev, xlibs-dev
-+Conflicts: lesstif-bin, lesstif-dev, lesstif-dbg, lesstif1, lesstifg, openmotif, openmotif-devel
-+Description: Development files for the Motif toolkit
-+ This is the Motif development environment.  It includes the static
-+ libraries and header files necessary to build Motif based applications.
---- motif-devel-2.1.10.orig/debian/copyright
-+++ motif-devel-2.1.10/debian/copyright
-@@ -0,0 +1,150 @@
-+This is the prepackaged version of Metro Link Motif. It was debianized
-+by the alien program by converting a binary RPM package.
-+
-+Metro Link's web site can be found at http://www.metrolink.com/
-+
-+METRO LINK WARRANTY AND LICENSE AGREEMENT
-+ 
-+READ THESE LICENSE TERMS BEFORE OPENING THE SOFTWARE PACKAGE.  
-+OPENING THE SOFTWARE PACKAGE INDICATES YOUR ACCEPTANCE OF THIS LICENSE.  
-+IF YOU DO NOT AGREE TO THESE LICENSE TERMS, RETURN THE SOFTWARE PACKAGE
-+UNOPENED (ALONG WITH ALL ASSOCIATED WRITTEN PRODUCT MATERIALS) AND 
-+WITHIN THE WARRANTY PERIOD TO THE DEALER FROM WHOM YOU OBTAINED IT 
-+FOR A FULL REFUND.
-+
-+This License is an agreement between you and METRO LINK INCORPORATED 
-+(hereafter "ML").
-+
-+1.  LICENSE GRANT
-+ 
-+Subject to the terms set forth in this License, you may use the 
-+enclosed computer product ("SOFTWARE"), including all associated 
-+software documentation furnished with this package, solely for your 
-+internal business purposes in the country in which the Software was 
-+furnished to you and on a single computer system (i.e. single or 
-+multiple CPU system in the same physical cabinet).
-+
-+NFS mounting of programs or clients is not permitted.
-+ 
-+
-+2.  COPYRIGHT AND TITLE.
-+ 
-+The Software and its copyrights are owned by ML or its suppliers.  
-+The Software is protected by United States copyright laws and 
-+international treaty provisions.  Therefore, you must treat the 
-+Software like any other copyrighted material (e.g., a book or musical
-+recording) except that you may either (a) make one (1) copy of the 
-+Software solely for backup purposes or (b) transfer the Software to 
-+a single hard disk provided you keep the original solely for backup 
-+or archival purposes.  You must reproduce and include the copyright 
-+notice on the backup copy.  You may not copy the written materials.
-+ 
-+
-+3.  RESTRICTED USE.
-+ 
-+You may not rent or lease the Software, and you may not reverse engineer, 
-+decompile, or disassemble the Software.  Furthermore, certain components
-+of the Software are licensed for use exclusively with hardware supplied
-+by specific manufacturers, and you may not modify the Software so that
-+it will operate with hardware supplied by alternate manufacturers.
-+ 
-+
-+4.  ADAPTATIONS
-+ 
-+Any part of the Software that you merge with other software is still 
-+property of ML.  In the event this License is terminated, you may not 
-+use part of the Software even if it has been merged with other software.  
-+You agree to take reasonable steps to protect ML's Software from theft 
-+or use contrary to this License.
-+ 
-+
-+5.  LIMITED 30-DAY WARRANTIES.
-+ 
-+ML warrants to you (the original Licensee) for thirty (30) days from 
-+the date of delivery to you of the Software, as evidenced by a copy 
-+of your license purchase receipt ( the Warranty Period"), that the 
-+Software shall be in operable condition as described in the documentation
-+provided with the product code, and that the media upon which the 
-+Software is furnished to you will be free from defects in material and
-+workmanship under normal use.  FOR WARRANTY ASSISTANCE, YOU MAY EITHER 
-+RETURN THE SOFTWARE TO THE DEALER FROM WHICH YOU PURCHASED THE LICENSE, 
-+OR CONTACT THAT DEALER (WHOSE NAME AND ADDRESS IS SET FORTH ON THE BOX
-+CONTAINING THIS WARRANTY), OR CONTACT ML AT THE ADDRESS STATED ON THIS 
-+LICENSE, ATTN: CUSTOMER SERVICE DEPARTMENT.  This warranty allocates
-+risks of product failure between you and ML.
-+ 
-+
-+6.  NO OTHER WARRANTIES.
-+ 
-+The agents, employees, distributors, and dealers of ML are not 
-+authorized to make modifications to this warranty, nor are additional
-+warranties binding on ML.  Accordingly, additional statements such as 
-+dealer advertising or presentations, whether oral or written, do not 
-+constitute warranties by ML and should not be relied upon as a limited 
-+warranty of ML.
-+
-+ML AND ITS SUPPLIERS MAKE NO OTHER REPRESENTATIONS, CONDITIONS, OR 
-+WARRANTIES, EXPRESSED OR IMPLIED.  ANY IMPLIED WARRANTY OR CONDITION OF
-+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE IS LIMITED IN 
-+DURATION TO THE WARRANTY PERIOD.  SOME STATES DO NOT ALLOW LIMITATIONS 
-+ON HOW LONG AN IMPLIED WARRANTY LASTS, SO THE ABOVE LIMITATIONS MAY NOT 
-+APPLY TO YOU.  THIS WARRANTY GIVES YOU SPECIFIC LEGAL RIGHTS AND YOU MAY 
-+ALSO HAVE OTHER LEGAL RIGHTS WHICH VARY FROM STATE TO STATE.
-+ 
-+
-+7.  CUSTOMER REMEDIES
-+ 
-+YOUR SOLE AND EXCLUSIVE REMEDY AND ML'S SOLE LIABILITY HEREUNDER 
-+SHALL BE, UPON YOUR RETURN OF THE SOFTWARE TO ML WITH THE RECEIPT 
-+WITHIN THE WARRANTY PERIOD, AT ML'S OPTION, REPLACEMENT OR REPAIR 
-+OF SOFTWARE THAT DOES NOT MEET ML'S LIMITED WARRANTY OR A REFUND OF 
-+THE SOFTWARE'S PURCHASE PRICE.  ML'S SUPPLIERS SHALL NOT BE HELD TO 
-+ANY LIABILITY FOR ANY DAMAGES SUFFERED OR INCURRED BY YOU.  IN NO EVENT 
-+SHALL ML OR ITS SUPPLIERS BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY 
-+INCIDENTAL, COLLATERAL, SPECIAL, OR CONSEQUENTIAL DAMAGES, INCLUDING 
-+WITHOUT LIMITATION, DAMAGES FOR LOSS OF PROFITS, LOSS OF CUSTOMERS, 
-+LOSS OF GOOD WILL, WORK STOPPAGE, DATA LOSS, COMPUTER FAILURE OR 
-+MALFUNCTION, CLAIMS BY ANY PARTY OTHER THAN YOU, OR ANY OR ALL OTHER 
-+SIMILAR DAMAGES OR LOSS EVEN IF ML, ITS SUPPLIERS, OR ITS AGENT HAS 
-+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  SOME STATES DO NOT 
-+ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL 
-+DAMAGES, SO THE ABOVE LIMITATIONS OR EXCLUSION MAY NOT APPLY TO YOU.
-+
-+ML shall have no liability or responsibility for Software altered, 
-+modified, or converted by you or a third party, damages resulting 
-+from accident, abuse, or misapplication, or for problems due to the 
-+malfunction of your equipment or software not supplied by ML.
-+ 
-+
-+8.  TERMINATION
-+ 
-+This License is in effect until terminated and terminates without 
-+notice from ML if you fail to comply with any of its provisions.  
-+Upon termination you shall either destroy the Software and all copies 
-+or portions thereof or return the Software and all copies as portions 
-+thereof to ML.
-+ 
-+
-+9.  GENERAL
-+ 
-+This License is governed by the laws of the State of Florida.  This 
-+License represents the entire statement of the understandings and 
-+agreements among the parties.
-+ 
-+
-+10. U.S. GOVERNMENT RESTRICTED RIGHTS
-+ 
-+This Software and documentation is provided with RESTRICTED RIGHTS.  
-+Use, duplication, or disclosure by the Government is subject to 
-+restrictions as set forth in subparagraph (c)(1)(ii) of the Rights 
-+in Technical Data and Computer FAR 52.227-14 (Alternate III) or the 
-+Software clause at DFAR 252.227-7013.  Contractor/manufacturer is 
-+METRO LINK INCORPORATED, 4711 North Powerline Road, Fort Lauderdale, 
-+FL  33309.
-+
-+Metro Link Motif Complete!, Metro Link Motif, Metro-X, Metro
-+Extreme 3D, Metro OpenGL, Metro-Xv, and Metro-XIE are trademarks
-+of Metro Link Incorporated.
-+
-+XRT, XRT/graph, XRT/field, XRT/gear, XRT/3d, and XRT/table are
-+trademarks of KL Group Incorporated.
---- motif-devel-2.1.10.orig/debian/rules
-+++ motif-devel-2.1.10/debian/rules
-@@ -0,0 +1,87 @@
-+#!/usr/bin/make -f
-+# debian/rules that uses debhelper and alien
-+# GNU copyright 1997 by Joey Hess.
-+
-+SHELL = /bin/sh
-+
-+package := $(shell basename `pwd` | sed 's/-[0-9].*//')
-+version := $(shell basename `pwd` | tr -cd '[0-9.]')
-+major := $(word 1,$(subst ., ,$(version)))
-+minor := $(word 2,$(subst ., ,$(version)))
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# This is the debhelper compatability version to use.
-+export DH_COMPAT=1
-+
-+motif-version:
-+	sed -e 's/#PACKAGE#/$(package)/' -e 's/#VERS#/$(version)/' debian/changelog-template >debian/changelog
-+
-+build: motif-version
-+	dh_testdir
-+
-+clean: motif-version
-+	dh_testdir
-+	dh_testroot
-+	dh_clean
-+
-+# Build architecture-independent files here.
-+binary-indep: build
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build
-+#	dh_testversion
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+	tar -cf - --exclude=debian --exclude='./usr/doc' . | tar -xpf - -C debian/tmp
-+#
-+# If you need to move files around in debian/tmp or do some
-+# binary patching ... Insert it here
-+#
-+	-ln -fs libMrm.so.$(major).$(minor) debian/tmp/usr/X11R6/lib/libMrm.so
-+	-ln -fs libUil.so.$(major).$(minor) debian/tmp/usr/X11R6/lib/libUil.so
-+	-ln -fs libXm.so.$(major).$(minor) debian/tmp/usr/X11R6/lib/libXm.so
-+# Move /usr/X11R6/lib/X11/app-defaults to /etc/X11/app-defaults.
-+	@if [ -d debian/tmp/usr/X11R6/lib/X11/app-defaults ]; then \
-+	  echo "Moving /usr/X11R6/lib/X11/app-defaults to /etc/X11/app-defaults"; \
-+	  [ -d debian/tmp/etc/X11 ] || mkdir -p debian/tmp/etc/X11; \
-+	  mv debian/tmp/usr/X11R6/lib/X11/app-defaults debian/tmp/etc/X11; \
-+	fi
-+# Install mxmkmf.
-+	@if [ ! -e debian/tmp/usr/X11R6/bin/mxmkmf ]; then \
-+	  echo "Installing mxmkmf"; \
-+	  install -m 0755 debian/mxmkmf debian/tmp/usr/X11R6/bin/mxmkmf; \
-+	fi
-+# Copy documentation.
-+	@if [ -d usr/doc ]; then \
-+	  echo "Copying documentation"; \
-+	  mkdir -p debian/tmp/usr/share/doc/$(package); \
-+	  cp -a usr/doc/*/* debian/tmp/usr/share/doc/$(package); \
-+	fi
-+	dh_installdocs
-+	dh_installexamples
-+	dh_installmenu
-+#	dh_installinit
-+#	dh_installcron
-+#	dh_installmanpages
-+#	dh_undocumented
-+	dh_installchangelogs
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_installdeb
-+	-dh_shlibdeps
-+	dh_gencontrol
-+#	dh_makeshlibs
-+	dh_md5sums
-+	dh_builddeb
-+
-+source diff:                                                                  
-+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary motif-version
---- motif-devel-2.1.10.orig/debian/mxmkmf
-+++ motif-devel-2.1.10/debian/mxmkmf
-@@ -0,0 +1,70 @@
-+#!/bin/sh
-+
-+# $XFree86$
-+#
-+# make a Makefile from an Imakefile from inside or outside the sources
-+# 
-+# $XConsortium: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws $
-+
-+usage="usage:  $0 [-a] [top_of_sources_pathname [current_directory]]"
-+
-+configdirspec="-I/usr/X11R6/lib/X11/config"
-+topdir=
-+curdir=.
-+do_all=
-+imake_defines="-DProjectRulesFile=<Motif.rules.metro> -DProjectTmplFile=<Motif.tmpl.metro>"
-+
-+while [ $# -gt 0 ]
-+do
-+    case "$1" in
-+    -D*)
-+       	imake_defines="$imake_defines $1"
-+	shift
-+	;;
-+    -a)
-+	do_all="yes"
-+	shift
-+	;;
-+    *)
-+    	break
-+	;;
-+    esac
-+done
-+
-+case $# in 
-+    0) ;;
-+    1) topdir=$1 ;;
-+    2) topdir=$1  curdir=$2 ;;
-+    *) echo "$usage" 1>&2; exit 1 ;;
-+esac
-+
-+case "$topdir" in
-+    -*) echo "$usage" 1>&2; exit 1 ;;
-+esac
-+
-+if [ -f Makefile ]; then 
-+    echo mv -f Makefile Makefile.bak
-+    mv -f Makefile Makefile.bak
-+fi
-+
-+if [ "$topdir" = "" ]; then
-+    args="-DUseInstalled "$configdirspec
-+else
-+    args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
-+fi
-+
-+echo imake $imake_defines $args
-+case "$do_all" in
-+yes)
-+    imake $imake_defines $args && 
-+    echo "make Makefiles" &&
-+    make Makefiles &&
-+    echo "make includes" &&
-+    make includes &&
-+    echo "make depend" &&
-+    make depend
-+    ;;
-+*)
-+    imake $imake_defines $args
-+    ;;
-+esac
---- motif-devel-2.1.10.orig/debian/dirs
-+++ motif-devel-2.1.10/debian/dirs
-@@ -0,0 +1,2 @@
-+usr/X11R6/bin
-+usr/X11R6/lib
---- motif-devel-2.1.10.orig/debian/README.Debian
-+++ motif-devel-2.1.10/debian/README.Debian
-@@ -0,0 +1,6 @@
-+Motif for Debian
-+----------------
-+
-+Please use mxmkmf instead of xmkmf to build Motif programs.
-+
-+ -- Andreas Voegele <andreas.voegele@gmx.de>  Tue, 16 Nov 1999 19:31:18 +0100

patches/motif_2.1.10-7.diff

@@ -1,508 +0,0 @@
---- motif-2.1.10.orig/debian/control
-+++ motif-2.1.10/debian/control
-@@ -0,0 +1,18 @@
-+Source: motif
-+Section: non-free/x11
-+Priority: extra
-+Build-Depends: debhelper
-+Maintainer: Andreas Voegele <andreas.voegele@gmx.de>
-+Standards-Version: 3.1.1
-+
-+Package: motif
-+Architecture: any
-+Depends: libc6, xlibs
-+Conflicts: lesstif-bin, lesstif-dev, lesstif-dbg, lesstif1, lesstifg, openmotif, openmotif-devel, suidmanager (<< 0.50)
-+Provides: x-window-manager
-+Suggests: menu
-+Description: Runtime libraries and executables for the Motif toolkit
-+ This package contains:
-+   - The Motif shared libraries, needed to run applications which are
-+     `dynamically linked' with Motif.
-+   - The popular Motif Window Manager, `mwm'.
---- motif-2.1.10.orig/debian/copyright
-+++ motif-2.1.10/debian/copyright
-@@ -0,0 +1,150 @@
-+This is the prepackaged version of Metro Link Motif. It was debianized
-+by the Alien program by converting a binary RPM package.
-+
-+Metro Link's web site can be found at http://www.metrolink.com/
-+
-+METRO LINK WARRANTY AND LICENSE AGREEMENT
-+ 
-+READ THESE LICENSE TERMS BEFORE OPENING THE SOFTWARE PACKAGE.  
-+OPENING THE SOFTWARE PACKAGE INDICATES YOUR ACCEPTANCE OF THIS LICENSE.  
-+IF YOU DO NOT AGREE TO THESE LICENSE TERMS, RETURN THE SOFTWARE PACKAGE
-+UNOPENED (ALONG WITH ALL ASSOCIATED WRITTEN PRODUCT MATERIALS) AND 
-+WITHIN THE WARRANTY PERIOD TO THE DEALER FROM WHOM YOU OBTAINED IT 
-+FOR A FULL REFUND.
-+
-+This License is an agreement between you and METRO LINK INCORPORATED 
-+(hereafter "ML").
-+
-+1.  LICENSE GRANT
-+ 
-+Subject to the terms set forth in this License, you may use the 
-+enclosed computer product ("SOFTWARE"), including all associated 
-+software documentation furnished with this package, solely for your 
-+internal business purposes in the country in which the Software was 
-+furnished to you and on a single computer system (i.e. single or 
-+multiple CPU system in the same physical cabinet).
-+
-+NFS mounting of programs or clients is not permitted.
-+ 
-+
-+2.  COPYRIGHT AND TITLE.
-+ 
-+The Software and its copyrights are owned by ML or its suppliers.  
-+The Software is protected by United States copyright laws and 
-+international treaty provisions.  Therefore, you must treat the 
-+Software like any other copyrighted material (e.g., a book or musical
-+recording) except that you may either (a) make one (1) copy of the 
-+Software solely for backup purposes or (b) transfer the Software to 
-+a single hard disk provided you keep the original solely for backup 
-+or archival purposes.  You must reproduce and include the copyright 
-+notice on the backup copy.  You may not copy the written materials.
-+ 
-+
-+3.  RESTRICTED USE.
-+ 
-+You may not rent or lease the Software, and you may not reverse engineer, 
-+decompile, or disassemble the Software.  Furthermore, certain components
-+of the Software are licensed for use exclusively with hardware supplied
-+by specific manufacturers, and you may not modify the Software so that
-+it will operate with hardware supplied by alternate manufacturers.
-+ 
-+
-+4.  ADAPTATIONS
-+ 
-+Any part of the Software that you merge with other software is still 
-+property of ML.  In the event this License is terminated, you may not 
-+use part of the Software even if it has been merged with other software.  
-+You agree to take reasonable steps to protect ML's Software from theft 
-+or use contrary to this License.
-+ 
-+
-+5.  LIMITED 30-DAY WARRANTIES.
-+ 
-+ML warrants to you (the original Licensee) for thirty (30) days from 
-+the date of delivery to you of the Software, as evidenced by a copy 
-+of your license purchase receipt ( the Warranty Period"), that the 
-+Software shall be in operable condition as described in the documentation
-+provided with the product code, and that the media upon which the 
-+Software is furnished to you will be free from defects in material and
-+workmanship under normal use.  FOR WARRANTY ASSISTANCE, YOU MAY EITHER 
-+RETURN THE SOFTWARE TO THE DEALER FROM WHICH YOU PURCHASED THE LICENSE, 
-+OR CONTACT THAT DEALER (WHOSE NAME AND ADDRESS IS SET FORTH ON THE BOX
-+CONTAINING THIS WARRANTY), OR CONTACT ML AT THE ADDRESS STATED ON THIS 
-+LICENSE, ATTN: CUSTOMER SERVICE DEPARTMENT.  This warranty allocates
-+risks of product failure between you and ML.
-+ 
-+
-+6.  NO OTHER WARRANTIES.
-+ 
-+The agents, employees, distributors, and dealers of ML are not 
-+authorized to make modifications to this warranty, nor are additional
-+warranties binding on ML.  Accordingly, additional statements such as 
-+dealer advertising or presentations, whether oral or written, do not 
-+constitute warranties by ML and should not be relied upon as a limited 
-+warranty of ML.
-+
-+ML AND ITS SUPPLIERS MAKE NO OTHER REPRESENTATIONS, CONDITIONS, OR 
-+WARRANTIES, EXPRESSED OR IMPLIED.  ANY IMPLIED WARRANTY OR CONDITION OF
-+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE IS LIMITED IN 
-+DURATION TO THE WARRANTY PERIOD.  SOME STATES DO NOT ALLOW LIMITATIONS 
-+ON HOW LONG AN IMPLIED WARRANTY LASTS, SO THE ABOVE LIMITATIONS MAY NOT 
-+APPLY TO YOU.  THIS WARRANTY GIVES YOU SPECIFIC LEGAL RIGHTS AND YOU MAY 
-+ALSO HAVE OTHER LEGAL RIGHTS WHICH VARY FROM STATE TO STATE.
-+ 
-+
-+7.  CUSTOMER REMEDIES
-+ 
-+YOUR SOLE AND EXCLUSIVE REMEDY AND ML'S SOLE LIABILITY HEREUNDER 
-+SHALL BE, UPON YOUR RETURN OF THE SOFTWARE TO ML WITH THE RECEIPT 
-+WITHIN THE WARRANTY PERIOD, AT ML'S OPTION, REPLACEMENT OR REPAIR 
-+OF SOFTWARE THAT DOES NOT MEET ML'S LIMITED WARRANTY OR A REFUND OF 
-+THE SOFTWARE'S PURCHASE PRICE.  ML'S SUPPLIERS SHALL NOT BE HELD TO 
-+ANY LIABILITY FOR ANY DAMAGES SUFFERED OR INCURRED BY YOU.  IN NO EVENT 
-+SHALL ML OR ITS SUPPLIERS BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY 
-+INCIDENTAL, COLLATERAL, SPECIAL, OR CONSEQUENTIAL DAMAGES, INCLUDING 
-+WITHOUT LIMITATION, DAMAGES FOR LOSS OF PROFITS, LOSS OF CUSTOMERS, 
-+LOSS OF GOOD WILL, WORK STOPPAGE, DATA LOSS, COMPUTER FAILURE OR 
-+MALFUNCTION, CLAIMS BY ANY PARTY OTHER THAN YOU, OR ANY OR ALL OTHER 
-+SIMILAR DAMAGES OR LOSS EVEN IF ML, ITS SUPPLIERS, OR ITS AGENT HAS 
-+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  SOME STATES DO NOT 
-+ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL 
-+DAMAGES, SO THE ABOVE LIMITATIONS OR EXCLUSION MAY NOT APPLY TO YOU.
-+
-+ML shall have no liability or responsibility for Software altered, 
-+modified, or converted by you or a third party, damages resulting 
-+from accident, abuse, or misapplication, or for problems due to the 
-+malfunction of your equipment or software not supplied by ML.
-+ 
-+
-+8.  TERMINATION
-+ 
-+This License is in effect until terminated and terminates without 
-+notice from ML if you fail to comply with any of its provisions.  
-+Upon termination you shall either destroy the Software and all copies 
-+or portions thereof or return the Software and all copies as portions 
-+thereof to ML.
-+ 
-+
-+9.  GENERAL
-+ 
-+This License is governed by the laws of the State of Florida.  This 
-+License represents the entire statement of the understandings and 
-+agreements among the parties.
-+ 
-+
-+10. U.S. GOVERNMENT RESTRICTED RIGHTS
-+ 
-+This Software and documentation is provided with RESTRICTED RIGHTS.  
-+Use, duplication, or disclosure by the Government is subject to 
-+restrictions as set forth in subparagraph (c)(1)(ii) of the Rights 
-+in Technical Data and Computer FAR 52.227-14 (Alternate III) or the 
-+Software clause at DFAR 252.227-7013.  Contractor/manufacturer is 
-+METRO LINK INCORPORATED, 4711 North Powerline Road, Fort Lauderdale, 
-+FL  33309.
-+
-+Metro Link Motif Complete!, Metro Link Motif, Metro-X, Metro
-+Extreme 3D, Metro OpenGL, Metro-Xv, and Metro-XIE are trademarks
-+of Metro Link Incorporated.
-+
-+XRT, XRT/graph, XRT/field, XRT/gear, XRT/3d, and XRT/table are
-+trademarks of KL Group Incorporated.
---- motif-2.1.10.orig/debian/rules
-+++ motif-2.1.10/debian/rules
-@@ -0,0 +1,113 @@
-+#!/usr/bin/make -f
-+# debian/rules that uses debhelper and alien
-+# GNU copyright 1997 by Joey Hess.
-+
-+SHELL = /bin/sh
-+
-+package := $(shell basename `pwd` | sed 's/-[0-9].*//')
-+version := $(shell basename `pwd` | tr -cd '[0-9.]')
-+major := $(word 1,$(subst ., ,$(version)))
-+minor := $(word 2,$(subst ., ,$(version)))
-+
-+mwmrc := etc/X11/mwm/system.mwmrc
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# This is the debhelper compatability version to use.
-+export DH_COMPAT=1
-+
-+motif-version:
-+	sed -e 's/#PACKAGE#/$(package)/' -e 's/#VERS#/$(version)/' debian/changelog-template >debian/changelog
-+
-+build: motif-version
-+	dh_testdir
-+
-+clean: motif-version
-+	dh_testdir
-+	dh_testroot
-+	dh_clean debian/conffiles debian/menu
-+
-+# Build architecture-independent files here.
-+binary-indep: build
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build
-+#	dh_testversion
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+	tar -cf - --exclude=debian --exclude='./usr/doc' --exclude='*.so.?' --exclude='*.so' . | tar -xpf - -C debian/tmp
-+#
-+# If you need to move files around in debian/tmp or do some
-+# binary patching ... Insert it here
-+#
-+	-ln -fs libMrm.so.$(major).$(minor) debian/tmp/usr/X11R6/lib/libMrm.so.$(major)
-+	-ln -fs libUil.so.$(major).$(minor) debian/tmp/usr/X11R6/lib/libUil.so.$(major)
-+	-ln -fs libXm.so.$(major).$(minor) debian/tmp/usr/X11R6/lib/libXm.so.$(major)
-+# Move system.mwmrc to /etc/X11/mwm/system.mwmrc.
-+	@mwmrc=`find debian/tmp -name system.mwmrc -type f -printf '%P\t' | cut -f1`; \
-+	if [ "$$mwmrc" != $(mwmrc) ]; then \
-+	  echo "Moving /$$mwmrc to $(mwmrc)"; \
-+	  mv debian/tmp/$$mwmrc debian/tmp/$(mwmrc); \
-+	  dh_link $(mwmrc) $$mwmrc; \
-+	fi
-+# Move /usr/X11R6/lib/X11/app-defaults to /etc/X11/app-defaults.
-+	@if [ -d debian/tmp/usr/X11R6/lib/X11/app-defaults ]; then \
-+	  echo "Moving /usr/X11R6/lib/X11/app-defaults to /etc/X11/app-defaults"; \
-+	  mv debian/tmp/usr/X11R6/lib/X11/app-defaults debian/tmp/etc/X11; \
-+	fi
-+# Install the menu method and /etc/X11/mwm/system.mwmrc-menu.
-+	@echo "Installing menu method"
-+	@sed -e 's/#PACKAGE#/$(package)/' debian/menu-template >debian/menu
-+	@install -m 0755 debian/mwm-menumethod debian/tmp/etc/menu-methods
-+	@cp debian/etcmwmrc debian/tmp/$(mwmrc)-menu
-+	@echo "include-menu-defs" >>debian/tmp/$(mwmrc)-menu
-+# Find the configuration files.
-+	@echo "Looking for configuration files"
-+	@echo "/$(mwmrc)-menu" >debian/conffiles
-+	@find debian/tmp/etc -name system.fpanelrc -type f -printf '/etc/%P\n' >>debian/conffiles
-+	@if [ -d debian/tmp/etc/X11/app-defaults ]; then \
-+	  find debian/tmp/etc/X11/app-defaults -type f -printf '/etc/X11/app-defaults/%P\n' >>debian/conffiles; \
-+	fi
-+# Fix mxterm.
-+	@if [ -f debian/tmp/usr/X11R6/bin/mxterm ]; then \
-+	  echo "Fixing mxterm"; \
-+	  perl -pi -e 's/libtermcap\.so\.2/libncurses.so.5/' debian/tmp/usr/X11R6/bin/mxterm; \
-+	fi
-+# Copy documentation.
-+	@if [ -d usr/doc ]; then \
-+	  echo "Copying documentation"; \
-+	  mkdir -p debian/tmp/usr/share/doc/$(package); \
-+	  cp -a usr/doc/*/* debian/tmp/usr/share/doc/$(package); \
-+	fi
-+	dh_installwm --priority=40 mwm
-+	dh_installdocs
-+	dh_installexamples
-+	dh_installmenu
-+#	dh_installinit
-+#	dh_installcron
-+#	dh_installmanpages
-+#	dh_undocumented
-+	dh_installchangelogs
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	@if [ -f debian/tmp/usr/X11R6/bin/mxterm ]; then \
-+	  chown root:utmp debian/tmp/usr/X11R6/bin/mxterm; \
-+	  chmod 2755 debian/tmp/usr/X11R6/bin/mxterm; \
-+	fi
-+	dh_installdeb
-+#	-dh_shlibdeps
-+	dh_gencontrol
-+	dh_makeshlibs
-+	dh_md5sums
-+	dh_builddeb
-+
-+source diff:                                                                  
-+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary motif-version
---- motif-2.1.10.orig/debian/mwm-menumethod
-+++ motif-2.1.10/debian/mwm-menumethod
-@@ -0,0 +1,30 @@
-+#!/usr/sbin/install-menu
-+#   -*- mode: shell-script; -*-
-+#I need menu-1!
-+#
-+#NOTE: the first line of this script _must_ be
-+# equal to "#!/usr/sbin/install-menu", otherwise update-menus
-+# will feed this script old-compat-mode data.
-+#
-+#More info: /usr/share/doc/menu/README.
-+#
-+compat="menu-1"
-+
-+!include menu.h
-+
-+function mwmcommon($c)=\
-+   "\t\"" title() "\"\tf.exec  \"" replacewith($c,"\"","'") " &\"\n"
-+
-+supported 
-+  x11 =mwmcommon($command)
-+  text=mwmcommon(term())
-+endsupported
-+startmenu=   "Menu \"" $section "\"\n{\n\t\"" \
-+              ifelse(title(),title(),"Debian") "\"\tf.title\n"
-+endmenu=     "}\n"
-+submenutitle="  \"" title() "\" f.menu \"" $section "\"\n"
-+genmenu=      "menudefs.hook"
-+rcfile=       "system.mwmrc"
-+examplercfile="system.mwmrc-menu"
-+rootprefix=   "/etc/X11/mwm/"
-+userprefix=   "/.mwm/"
---- motif-2.1.10.orig/debian/etcmwmrc
-+++ motif-2.1.10/debian/etcmwmrc
-@@ -0,0 +1,103 @@
-+!!
-+!! Root Menu Description
-+!!
-+
-+Menu DefaultRootMenu
-+{
-+	"Root Menu"		f.title
-+	"Debian"                f.menu "/Debian"
-+	"New Window"		f.exec "x-terminal-emulator &"
-+	"Shuffle Up"		f.circle_up
-+	"Shuffle Down"		f.circle_down
-+	"Refresh"		f.refresh
-+	"Pack Icons"		f.pack_icons
-+!	"Toggle Behavior..."	f.set_behavior
-+	 no-label		f.separator
-+	"Restart..."		f.restart
-+	"Quit..."		f.quit_mwm
-+}
-+
-+!!
-+!! Default Window Menu
-+!!
-+Menu DefaultWindowMenu
-+{
-+	"Make Pinned"				f.toggle_pin_state
-+	no-label				f.separator
-+	Restore		_R	Alt<Key>F5	f.restore
-+	Move		_M	Alt<Key>F7	f.move
-+	Size		_S	Alt<Key>F8	f.resize
-+	Minimize	_n	Alt<Key>F9	f.minimize
-+	Maximize	_x	Alt<Key>F10	f.maximize
-+	Raise		_a	Alt<Key>F2	f.raise
-+	Lower		_L	Alt<Key>F3	f.lower
-+	no-label				f.separator
-+	Close		_C	Alt<Key>F4	f.kill
-+}
-+
-+
-+!!
-+!! Default Key Bindings
-+!!
-+Keys DefaultKeyBindings
-+{
-+	Shift<Key>Escape	window|icon		f.post_wmenu
-+	Alt<Key>space		window|icon		f.post_wmenu
-+	Alt<Key>Tab		root|icon|window	f.next_key
-+	Alt Shift<Key>Tab	root|icon|window	f.prev_key
-+	Alt<Key>Escape		root|icon|window	f.circle_down
-+	Alt Shift<Key>Escape	root|icon|window	f.circle_up
-+	Alt Shift Ctrl<Key>exclam root|icon|window	f.set_behavior
-+	Alt<Key>F6		window			f.next_key transient
-+	Alt Shift<Key>F6	window			f.prev_key transient
-+	Shift<Key>F10		icon			f.post_wmenu
-+	Alt Shift<Key>Delete	root|icon|window	f.restart
-+}
-+
-+!!
-+!! Button Binding Description(s)
-+!!
-+!! These can be used anywhere
-+!!
-+Buttons DefaultButtonBindings
-+{
-+	<Btn1Down>	icon|frame	f.raise
-+	<Btn3Down>	icon|frame	f.post_wmenu
-+	<Btn3Down>	root		f.menu	DefaultRootMenu
-+}
-+ 
-+!!
-+!! These are some example bindings that you might use if your
-+!! keyboardFocusPolicy is "explicit".  Note that to use these, you'll
-+!! have to change the Mwm*buttonBindings resource in Mwm to
-+!! ExplicitButtonBindings instead of DefaultButtonBindings.
-+!!
-+Buttons ExplicitButtonBindings
-+{
-+	<Btn1Down>	frame|icon	f.raise
-+	<Btn3Down>	frame|icon	f.post_wmenu
-+	<Btn3Down>	root		f.menu	DefaultRootMenu
-+!	<Btn1Up>	icon		f.restore
-+	Alt<Btn1Down>	window|icon	f.lower
-+!	Alt<Btn2Down>	window|icon	f.resize
-+!	Alt<Btn3Down>	window|icon	f.move
-+}
-+
-+!! These are some example bindings that you might use if your
-+!! keyboardFocusPolicy is "pointer".  Note that to use these, you'll
-+!! have to change the Mwm*buttonBindings resource in Mwm to
-+!! PointerButtonBindings instead of DefaultButtonBindings.
-+!!
-+Buttons PointerButtonBindings
-+{
-+	<Btn1Down>	frame|icon	f.raise
-+	<Btn3Down>	frame|icon	f.post_wmenu
-+	<Btn3Down>	root		f.menu	DefaultRootMenu
-+	<Btn1Down>	window		f.raise
-+!	<Btn1Up>	icon		f.restore
-+	Alt<Btn1Down>	window|icon	f.lower
-+!	Alt<Btn2Down>	window|icon	f.resize
-+!	Alt<Btn3Down>	window|icon	f.move
-+}
-+
-+!include-menu-defs
---- motif-2.1.10.orig/debian/dirs
-+++ motif-2.1.10/debian/dirs
-@@ -0,0 +1,4 @@
-+etc/X11/mwm
-+etc/menu-methods
-+usr/X11R6/bin
-+usr/X11R6/lib
---- motif-2.1.10.orig/debian/changelog-template
-+++ motif-2.1.10/debian/changelog-template
-@@ -0,0 +1,37 @@
-+#PACKAGE# (#VERS#-7) unstable; urgency=low
-+
-+  * Mwm is registered with dh_installwm.
-+  * Disabled dh_undocumented.
-+  * Removed dh_suidregister.
-+  * The virtual package `x-terminal-emulator' is no longer provided since
-+    Metro Link's latest Motif release doesn't contain mxterm anymore.
-+
-+ -- Andreas Voegele <andreas.voegele@gmx.de>  Tue, 16 Jan 2001 12:17:38 +0100
-+
-+#PACKAGE# (#VERS#-6) unstable; urgency=low
-+
-+  * Moved app-defaults directory to /etc/X11.
-+  * Depends on xlibs.
-+
-+ -- Andreas Voegele <andreas.voegele@gmx.de>  Sat,  9 Dec 2000 08:45:11 +0100
-+
-+#PACKAGE# (#VERS#-5) unstable; urgency=low
-+
-+  * Made mxterm use libncurses.so.5 instead of libtermcap.so.2.
-+
-+ -- Andreas Voegele <andreas.voegele@gmx.de>  Mon,  3 Jan 2000 09:50:03 +0100
-+
-+#PACKAGE# (#VERS#-4) unstable; urgency=low
-+
-+  * Converted from RPM binary format to Debian.
-+  * Removed *.so symlinks.
-+  * Made mxterm use libncurses.so.4 instead of libtermcap.so.2.
-+  * Enabled dh_undocumented, dh_fixperms and dh_strip.
-+  * Added menu file and menu method.
-+  * Added maintainer scripts.
-+
-+ -- Andreas Voegele <andreas.voegele@gmx.de>  Tue, 16 Nov 1999 19:31:03 +0100
-+
-+Local variables:
-+mode: debian-changelog
-+End:
---- motif-2.1.10.orig/debian/postinst
-+++ motif-2.1.10/debian/postinst
-@@ -0,0 +1,7 @@
-+#!/bin/sh -e
-+
-+if [ "$1" = "configure" ]; then
-+  ldconfig
-+fi
-+
-+#DEBHELPER#
---- motif-2.1.10.orig/debian/README.Debian
-+++ motif-2.1.10/debian/README.Debian
-@@ -0,0 +1,10 @@
-+Motif for Debian
-+----------------
-+
-+For compatibility with Lesstif the Motif window manager configuration
-+file system.mwmrc is placed in /etc/X11/mwm on Debian systems.
-+
-+If the `menu' package is installed, system.mwmrc is automatically
-+generated from /etc/X11/mwm/system.mwmrc-menu.
-+
-+ -- Andreas Voegele <andreas.voegele@gmx.de>  Tue, 16 Nov 1999 19:31:03 +0100
---- motif-2.1.10.orig/debian/menu-template
-+++ motif-2.1.10/debian/menu-template
-@@ -0,0 +1,6 @@
-+?package(#PACKAGE#):\
-+ needs="wm"\
-+ section="WindowManagers"\
-+ title="Mwm"\
-+ longtitle="Motif window manager"\
-+ command="/usr/X11R6/bin/mwm"