Prepare new upload.

This reverts commit 18e40eeabb.

.gitattributes

@@ -1 +0,0 @@
-debian/changelog merge=dpkg-mergechangelogs

Alien/Package.pm

@@ -62,7 +62,7 @@ The package's maintainer.
 
 =item depends
 
-The package's dependancies. Only dependencies that should exist on all
+The package's dependencies. Only dependencies that should exist on all
 target distributions can be put in here though (ie: lsb).
 
 =item group
@@ -173,7 +173,7 @@ sub install {
 =item test
 
 Test a package file. The filename is passed, should return an array of lines
-of test results. Child classses may implement this.
+of test results. Child classes may implement this.
 
 =cut
 

Alien/Package/Deb.pm

@@ -71,7 +71,7 @@ sub init {
 
 =item checkfile
 
-Detect deb files by their extention.
+Detect deb files by their extension.
 
 =cut
 
@@ -459,7 +459,7 @@ sub prep {
 
 	# Use debhelper v7
 	open (OUT, ">$dir/debian/compat") || die "$dir/debian/compat: $!";
-	print OUT "7\n";
+	print OUT "10\n";
 	close OUT;
 
 	# A minimal rules file.
@@ -471,48 +471,37 @@ sub prep {
 
 PACKAGE=\$(shell dh_listpackages)
 
-build:
+%:
-	dh_testdir
+	dh \$\@
 
-clean:
+override_dh_clean:
-	dh_testdir
-	dh_testroot
 	dh_clean -d
 
-binary-indep: build
+override_dh_auto_configure:
 
-binary-arch: build
+override_dh_auto_build:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	dh_installdocs
-	dh_installchangelogs
 
+override_dh_auto_install:
+	mkdir -p debian/\$(PACKAGE)
 	# Copy the packages's files.
 	find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \\
-		xargs -0 -r -i cp -a {} debian/\$(PACKAGE)
+		sed -e s#'./'##g | \\
-
+		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
 #
 
-
+override_dh_strip:
 # This has been known to break on some wacky binaries.
 	#	dh_strip
-	dh_compress
-$fixpermscomment	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	-dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
+override_dh_fixperms:
-.PHONY: build clean binary-indep binary-arch binary
+$fixpermscomment	dh_fixperms
+
+override_dh_shlibdeps:
+	-dh_shlibdeps
+
 EOF
 	close OUT;
 	$this->do("chmod", 755, "$dir/debian/rules");
@@ -614,7 +603,7 @@ sub cleantree {
 
 Set/get package name. 
 
-Always returns the packge name in lowercase with all invalid characters
+Always returns the package name in lowercase with all invalid characters
 rmoved. The name is however, stored unchanged.
 
 =cut

Alien/Package/Rpm.pm

@@ -31,7 +31,7 @@ Relocatable rpm packages have a prefixes field.
 
 =item checkfile
 
-Detect rpm files by their extention.
+Detect rpm files by their extension.
 
 =cut
 
@@ -44,7 +44,7 @@ sub checkfile {
 
 =item install
 
-Install a rpm. If RPMINSTALLOPT is set in the environement, the options in
+Install a rpm. If RPMINSTALLOPT is set in the environment, the options in
 it are passed to rpm on its command line.
 
 =cut
@@ -302,10 +302,142 @@ sub prep {
 	my $this=shift;
 	my $dir=$this->unpacked_tree || die "The package must be unpacked first!";
 
+	# Exclude standard system directories
+	# This list is adapted from the rpmlint source code
+	my @standard_dirs = (
+		"/",
+		"/bin/",
+		"/boot/",
+		"/etc/",
+		"/etc/X11/",
+		"/etc/opt/",
+		"/etc/profile.d/",
+		"/etc/skel/",
+		"/etc/xinetd.d/",
+		"/home/",
+		"/lib/",
+		"/lib/modules/",
+		"/lib64/",
+		"/media/",
+		"/mnt/",
+		"/mnt/cdrom/",
+		"/mnt/disk/",
+		"/mnt/floppy/",
+		"/opt/",
+		"/proc/",
+		"/root/",
+		"/run/",
+		"/sbin/",
+		"/selinux/",
+		"/srv/",
+		"/sys/",
+		"/tmp/",
+		"/usr/",
+		"/usr/X11R6/",
+		"/usr/X11R6/bin/",
+		"/usr/X11R6/doc/",
+		"/usr/X11R6/include/",
+		"/usr/X11R6/lib/",
+		"/usr/X11R6/lib64/",
+		"/usr/X11R6/man/",
+		"/usr/X11R6/man/man1/",
+		"/usr/X11R6/man/man2/",
+		"/usr/X11R6/man/man3/",
+		"/usr/X11R6/man/man4/",
+		"/usr/X11R6/man/man5/",
+		"/usr/X11R6/man/man6/",
+		"/usr/X11R6/man/man7/",
+		"/usr/X11R6/man/man8/",
+		"/usr/X11R6/man/man9/",
+		"/usr/X11R6/man/mann/",
+		"/usr/bin/",
+		"/usr/bin/X11/",
+		"/usr/etc/",
+		"/usr/games/",
+		"/usr/include/",
+		"/usr/lib/",
+		"/usr/lib/X11/",
+		"/usr/lib/games/",
+		"/usr/lib/gcc-lib/",
+		"/usr/lib/menu/",
+		"/usr/lib64/",
+		"/usr/lib64/gcc-lib/",
+		"/usr/local/",
+		"/usr/local/bin/",
+		"/usr/local/doc/",
+		"/usr/local/etc/",
+		"/usr/local/games/",
+		"/usr/local/info/",
+		"/usr/local/lib/",
+		"/usr/local/lib64/",
+		"/usr/local/man/",
+		"/usr/local/man/man1/",
+		"/usr/local/man/man2/",
+		"/usr/local/man/man3/",
+		"/usr/local/man/man4/",
+		"/usr/local/man/man5/",
+		"/usr/local/man/man6/",
+		"/usr/local/man/man7/",
+		"/usr/local/man/man8/",
+		"/usr/local/man/man9/",
+		"/usr/local/man/mann/",
+		"/usr/local/sbin/",
+		"/usr/local/share/",
+		"/usr/local/share/man/",
+		"/usr/local/share/man/man1/",
+		"/usr/local/share/man/man2/",
+		"/usr/local/share/man/man3/",
+		"/usr/local/share/man/man4/",
+		"/usr/local/share/man/man5/",
+		"/usr/local/share/man/man6/",
+		"/usr/local/share/man/man7/",
+		"/usr/local/share/man/man8/",
+		"/usr/local/share/man/man9/",
+		"/usr/local/share/man/mann/",
+		"/usr/local/src/",
+		"/usr/sbin/",
+		"/usr/share/",
+		"/usr/share/dict/",
+		"/usr/share/doc/",
+		"/usr/share/icons/",
+		"/usr/share/info/",
+		"/usr/share/man/",
+		"/usr/share/man/man1/",
+		"/usr/share/man/man2/",
+		"/usr/share/man/man3/",
+		"/usr/share/man/man4/",
+		"/usr/share/man/man5/",
+		"/usr/share/man/man6/",
+		"/usr/share/man/man7/",
+		"/usr/share/man/man8/",
+		"/usr/share/man/man9/",
+		"/usr/share/man/mann/",
+		"/usr/share/misc/",
+		"/usr/src/",
+		"/usr/tmp/",
+		"/var/",
+		"/var/cache/",
+		"/var/db/",
+		"/var/lib/",
+		"/var/lib/games/",
+		"/var/lib/misc/",
+		"/var/lib/rpm/",
+		"/var/local/",
+		"/var/log/",
+		"/var/mail/",
+		"/var/nis/",
+		"/var/opt/",
+		"/var/preserve/",
+		"/var/spool/",
+		"/var/spool/mail/",
+		"/var/tmp/"
+		);
+
 	# Place %config in front of files that are conffiles.
 	my @conffiles = @{$this->conffiles};
 	my $filelist;
 	foreach my $fn (@{$this->filelist}) {
+		if (! grep(m:^\Q$fn\E$:,@standard_dirs)) {
 			# Unquote any escaped characters in filenames - needed for
 			# non ascii characters. (eg. iso_8859-1 latin set)
 			if ($fn =~ /\\/) {
@@ -324,6 +456,7 @@ sub prep {
 				$filelist.=qq{"$fn"\n};
 			}
 		}
+	}
 
 	# Write out the spec file.
 	my $spec="$dir/".$this->name."-".$this->version."-".$this->release.".spec";
@@ -392,7 +525,7 @@ sub cleantree {
 
 =item build
 
-Build a rpm. If RPMBUILDOPT is set in the environement, the options in
+Build a rpm. If RPMBUILDOPT is set in the environment, the options in
 it are passed to rpm on its command line.
 
 An optional parameter, if passed, can be used to specify the program to use
@@ -479,7 +612,7 @@ sub version {
 
 Set/get script fields.
 
-When retrieving a value, we have to do some truely sick mangling. Since
+When retrieving a value, we have to do some truly sick mangling. Since
 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.
@@ -564,7 +697,7 @@ sub prerm {
 
 Set/get arch field. When the arch field is set, some sanitizing is done
 first to convert it to the debian format used internally. When it's
-retreived it's converted back to rpm form from the internal form.
+retrieved it's converted back to rpm form from the internal form.
 
 =cut
 
@@ -611,6 +744,10 @@ sub arch {
 			# Treat armv7l as armel.
 			$arch='armel';
 		}
+		elsif ($arch eq 'aarch64') {
+			# Treat aarch64 as arm64.
+			$arch='arm64';
+		}
 		elsif ($arch eq 'parisc') {
 			$arch='hppa';
 		}

Alien/Package/Slp.pm

@@ -35,7 +35,7 @@ character, I=unsigned integer.)
 =item footer_version
 
 What package format are we up to now? (Lowest one this is still
-compatable with.)
+compatible with.)
 
 =item archtrans
 
@@ -93,7 +93,7 @@ Holds the slp package format version of the slp file.
 
 =item checkfile
 
-Detect slp files by their extention.
+Detect slp files by their extension.
 
 =cut
 
@@ -270,7 +270,7 @@ Set/get conffiles.
 
 When the conffiles are set, the format used by slp (a colon-delimited list)
 is turned into the real list that is used internally. The list is changed
-back into slp's internal format when it is retreived.
+back into slp's internal format when it is retrieved.
 
 =cut
 
@@ -291,7 +291,7 @@ Set/get copyright.
 
 When the copyright is set, the number used by slp is changed into a textual
 description. This is changed back into a number when the value is
-retreived.
+retrieved.
 
 =cut
 
@@ -315,7 +315,7 @@ Set/get arch.
 
 When the arch is set, the number used by slp is changed into a textual
 description. This is changed back into a number when the value is
-retreived.
+retrieved.
 
 =cut
 
@@ -341,7 +341,7 @@ sub arch {
 
 Set/get release version.
 
-When the release version is retreived, it is converted to an unsigned
+When the release version is retrieved, it is converted to an unsigned
 integer, as is required by the slp package format.
 
 =cut

Alien/Package/Tgz.pm

@@ -45,7 +45,7 @@ use constant scripttrans => {
 
 =item checkfile
 
-Detect tgz files by their extention.
+Detect tgz files by their extension.
 
 =cut
 
@@ -96,7 +96,7 @@ sub scan {
 	# Get basename of the filename.
 	my ($basename)=('/'.$file)=~m#^/?.*/(.*?)$#;
 
-	# Strip out any tar extentions.
+	# Strip out any tar extensions.
 	$basename=~s/$tarext//;
 
 	if ($basename=~m/([\w-]+)-([0-9\.?]+).*/) {

Makefile.PL

@@ -19,17 +19,11 @@ VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)
 
 all:: extra_build
 clean:: extra_build
-install:: extra_install
-pure_install:: extra_install
 
 extra_build:
 	perl -i -pe "s/\@version\@/$(VER)/g" <alien.lsm.in >alien.lsm
 	perl -i -pe "s/\@version\@/$(VER)/g" <alien.spec.in >alien.spec
 
-extra_install:
-	install -d $(PREFIX)/share/alien/patches \
-		   $(VARPREFIX)/var/lib/alien
-
 alien:
 	perl -pe '$$_="" if /use lib/; $$_="our \$$Version=\"$(VER)\";\n" if /VERSION_AUTOREPLACE/' alien.pl > alien
 }

alien.lsm

@@ -1,6 +1,6 @@
 Begin3
 Title:		alien
-Version:	8.91
+Version:	8.95.2
 Entered-date:	31MAR97
 Description:	Alien converts Slackware .tgz packages, Red Hat .rpm packages,
                 Debian .deb packages, and Stampede .slp packages. It can 
@@ -9,6 +9,6 @@ Description:	Alien converts Slackware .tgz packages, Red Hat .rpm packages,
 Keywords:	debian dpkg deb red hat redhat rpm slackware tgz stampede slp convert package LSB
 Author:		joey@kitenet.net
 Primary-site:	sunsite.unc.edu /pub/Linux/utils/package
-		80	alien-8.91.tar.gz
+		80	alien-8.95.2.tar.gz
 Copying-policy:	GPL
 End

alien.pl

@@ -37,7 +37,7 @@ installed.
 
 =item lsb
 
-Unlike the other package formats, B<alien> can handle the depenendencies of
+Unlike the other package formats, B<alien> can handle the dependencies of
 lsb packages if the destination package format supports dependencies. Note
 that this means that the package generated from a lsb package will depend on
 a package named "lsb" -- your distribution should provide a package by that
@@ -149,7 +149,7 @@ built.
 =item B<--anypatch>
 
 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;
+file for an older version of the package. This is not guaranteed to always work;
 older patches may not necessarily work with newer packages.
 
 =item B<--nopatch>
@@ -158,12 +158,12 @@ Do not use any patch files.
 
 =item B<--description=>I<desc>
 
-Specifiy a description for the package. This only has an effect when
+Specify a description for the package. This only has an effect when
 converting from the tgz package format, which lacks descriptions.
 
 =item B<--version=>I<version>
 
-Specifiy a version for the package. This only has an effect when
+Specify a version for the package. This only has an effect when
 converting from the tgz package format, which may lack version
 information.
 

alien.spec

@@ -1,12 +1,12 @@
 Summary: Install Debian, Slackware, and Stampede packages with rpm.
 Name: alien
 Packager: Joey Hess <joey@kitenet.net>
-Version: 8.91
+Version: 8.95.2
 Release: 1
-Source: ftp://kitenet.net/pub/code/debian/alien_8.91.tar.gz
+Source: ftp://kitenet.net/pub/code/debian/alien_8.95.2.tar.gz
 License: GPL
 Group: Utilities/File
-Buildroot: /tmp/alien-8.91.build
+Buildroot: /tmp/alien-8.95.2.build
 Requires: perl
 BuildArchitectures: noarch
 
@@ -20,7 +20,7 @@ This is a tool only suitable for binary packages.
 
 %prep
 %setup -n alien
-rm -rf /tmp/alien-8.91.build
+rm -rf /tmp/alien-8.95.2.build
 
 %install
 perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr

debian/changelog

@@ -1,3 +1,98 @@
+alien (8.95.4) unstable; urgency=high
+
+  * QA upload.
+  * Alien/Package/Deb.pm: Fix incorrect debian/rules template by
+    properly escaping special characters (dh \$\@ instead of dh $@).
+    Closes: #983492.
+  * Alien/Package/Deb.pm: Fix incorrect file installation path.
+    This fixes the bug in manual override_dh_auto_install that files
+    are placed under / instead of /usr/ (default prefix).
+    Closes: #985835.
+  * Alien/Package/Rpm.pm: Also map aarch64 in rpm to arm64 in deb.
+    This fixes conversion of aarch64 rpm packages.
+    Closes: #985808.
+
+ -- Boyuan Yang <byang@debian.org>  Wed, 07 Apr 2021 12:15:06 -0400
+
+alien (8.95.3) unstable; urgency=medium
+
+  * QA upload.
+  * Upload to unstable.
+
+ -- Adrian Bunk <bunk@debian.org>  Thu, 11 Feb 2021 22:02:09 +0200
+
+alien (8.95.2) experimental; urgency=medium
+
+  * QA upload.
+  * debian/control:
+      + Bump debhelper compat to v13.
+      + Included Rules-Requires-Root: no
+  * debian/changelog:
+      + Removed trailing-whitespaces.
+  * alien.pl:
+      + Fixed some misspelled words.
+  * Alien/Package.pm:
+      + Fixed misspelled word.
+  * Alien/Package/Rpm.pm:
+      + Fixed misspeled word.
+  * debian/rules:
+      + Added a "nocheck" check on override_dh_auto_test.
+
+ -- Thiago da Silva Gracini <tsgracini@outlook.com>  Sun, 01 Nov 2020 15:35:34 -0300
+
+alien (8.95.1) experimental; urgency=medium
+
+  * QA upload.
+  * Rebuild source and binary package.
+  * debian/control:
+    + Bump debhelper compat to v12.
+    + Bump Standards-Version to 4.5.0.
+    + Update Vcs-* fields to use git packaging repo under Salsa
+      Debian group.
+  * Rpm.pm: Do not ship conflicting dirs. (Closes: #759533)
+  * Deb.pm:
+    + Use dh sequencer when generating deb packages.
+    + Bump supported debhelper compatibility level to v10.
+
+ -- Boyuan Yang <byang@debian.org>  Tue, 31 Mar 2020 10:52:19 -0400
+
+alien (8.95) unstable; urgency=medium
+
+  * QA upload.
+  * debian/control:
+      - Bumped Standards-Version to 3.9.6.
+      - Removed duplicated section field.
+  * debian/copyright:
+      - Replaced protocol from http to https in the Format field.
+      - Included authors' e-mail addresses.
+      - Replaced GPL-2+ license reference by actual GPL-2+ license.
+  * debian/source/format: Created as 3.0 (native).
+
+ -- Fabiano Antunes <fabianoantunes@itgen.com.br>  Thu, 10 Sep 2015 17:09:04 -0300
+
+alien (8.94) unstable; urgency=medium
+
+  * QA upload.
+  * Fix "FTBFS with perl 5.22 in experimental (MakeMaker changes)":
+    remove override_dh_auto_install in debian/rules, and
+    use DESTDIR in Makefile.PL.
+    (Closes: #792371)
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 25 Jul 2015 21:24:15 +0200
+
+alien (8.93) unstable; urgency=medium
+
+  * Alien needs a new maintainer, both in Debian and upstream.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 07 Nov 2014 17:25:47 -0400
+
+alien (8.92) unstable; urgency=medium
+
+  * Remove suggests for lsb-rpm, which no longer exists.
+    Closes: #756873
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 31 Aug 2014 14:16:23 -0700
+
 alien (8.91) unstable; urgency=medium
 
   * Support other deb data.tar compression schemes in fallback code.

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -1,17 +1,25 @@
 Source: alien
 Section: admin
 Priority: optional
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper-compat (= 13)
-Maintainer: Joey Hess <joeyh@debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 3.9.5
+Standards-Version: 4.5.0
-Vcs-Git: git://git.kitenet.net/alien
+Rules-Requires-Root: no
+Vcs-Git: https://salsa.debian.org/debian/alien.git
+Vcs-Browser: https://salsa.debian.org/debian/alien
 Homepage: http://kitenet.net/~joey/code/alien/
 
 Package: alien
 Architecture: all
-Section: admin
+Depends: debhelper (>= 10),
-Depends: debhelper (>= 7), ${misc:Depends}, ${perl:Depends}, rpm (>= 2.4.4-2), dpkg-dev, make, cpio, rpm2cpio
+         ${misc:Depends},
-Suggests: patch, bzip2, lsb-rpm, lintian, lzma
+         ${perl:Depends},
+         rpm (>= 2.4.4-2),
+         dpkg-dev,
+         make,
+         cpio,
+         rpm2cpio
+Suggests: patch, bzip2, lintian, lzma
 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/copyright

@@ -1,13 +1,34 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: native package
 
 Files: *
-Copyright:
+Copyright: 1996-1997	Christoph Lameter <clameter@debian.org>
- 1996, 1997 Christoph Lameter
+	   1997		Randolph Chung <rc42@cornell.edu>
- 1997 Randolph Chung
+	   2001		Mark A. Hershberger <mah@everybody.org>
- 2001 Mark A. Hershberger
+	   1997-2011	Joey Hess <joeyh@debian.org>
- 1997-2011 Joey Hess
 License: GPL-2+
- On Debian systems, the complete text of the GPL can be found in
- /usr/share/common-licenses/GPL.
 	   
+Files: debian/*
+Copyright: 1996-1997	Christoph Lameter <clameter@debian.org>
+	   1997		Randolph Chung <rc42@cornell.edu>
+	   2001		Mark A. Hershberger <mah@everybody.org>
+	   1997-2011	Joey Hess <joeyh@debian.org>
+	   2015		Fabiano Antunes <fabianoantunes@itgen.com.br>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/rules

@@ -3,13 +3,10 @@
 	dh $@
 
 override_dh_auto_test:
-	# simple smoke test
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	./alien.pl -V
+endif
 
-override_dh_auto_install:
-	$(MAKE) pure_install INSTALLDIRS=vendor \
-		PREFIX=$(shell pwd)/debian/alien/$(shell perl -MConfig -e 'print $$Config{prefix}') \
-		VARPREFIX=$(shell pwd)/debian/alien
 
 override_dh_auto_clean:
 	# distclean moans about MANIFEST, this is quieter

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)