diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 5d42584..0000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -debian/changelog merge=dpkg-mergechangelogs diff --git a/Alien/Package.pm b/Alien/Package.pm index 4c97e45..0bce1b1 100644 --- a/Alien/Package.pm +++ b/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 diff --git a/Alien/Package/Deb.pm b/Alien/Package/Deb.pm index 4ad968d..08bd683 100644 --- a/Alien/Package/Deb.pm +++ b/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 @@ -614,7 +614,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 diff --git a/Alien/Package/Rpm.pm b/Alien/Package/Rpm.pm index f83c45d..d53be2b 100644 --- a/Alien/Package/Rpm.pm +++ b/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 @@ -392,7 +392,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 @@ -564,7 +564,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 diff --git a/Alien/Package/Slp.pm b/Alien/Package/Slp.pm index ec19e18..e3f415a 100644 --- a/Alien/Package/Slp.pm +++ b/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 diff --git a/Alien/Package/Tgz.pm b/Alien/Package/Tgz.pm index 7ab6e8b..e5193e6 100644 --- a/Alien/Package/Tgz.pm +++ b/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\.?]+).*/) { diff --git a/Makefile.PL b/Makefile.PL index 1573b93..3431ad4 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -19,17 +19,11 @@ VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'alien.lsm perl -i -pe "s/\@version\@/$(VER)/g" 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 } diff --git a/alien.lsm b/alien.lsm index 807c9a6..5393487 100644 --- a/alien.lsm +++ b/alien.lsm @@ -1,6 +1,6 @@ Begin3 Title: alien -Version: 8.93 +Version: 8.95 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.93.tar.gz + 80 alien-8.95.tar.gz Copying-policy: GPL End diff --git a/alien.pl b/alien.pl index 059cdd4..b55c5bc 100755 --- a/alien.pl +++ b/alien.pl @@ -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> diff --git a/alien.spec b/alien.spec index b72e2c9..ffcd7af 100644 --- a/alien.spec +++ b/alien.spec @@ -1,12 +1,12 @@ Summary: Install Debian, Slackware, and Stampede packages with rpm. Name: alien Packager: Joey Hess -Version: 8.93 +Version: 8.95 Release: 1 -Source: ftp://kitenet.net/pub/code/debian/alien_8.93.tar.gz +Source: ftp://kitenet.net/pub/code/debian/alien_8.95.tar.gz License: GPL Group: Utilities/File -Buildroot: /tmp/alien-8.93.build +Buildroot: /tmp/alien-8.95.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.93.build +rm -rf /tmp/alien-8.95.build %install perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr diff --git a/debian/changelog b/debian/changelog index 3fa34fa..236eaba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +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 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 Sat, 25 Jul 2015 21:24:15 +0200 + alien (8.93) unstable; urgency=medium * Alien needs a new maintainer, both in Debian and upstream. diff --git a/debian/control b/debian/control index 21434b5..f6f0af0 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,12 @@ Section: admin Priority: optional Build-Depends: debhelper (>= 9) Maintainer: Debian QA Group -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Git: git://git.kitenet.net/alien Homepage: http://kitenet.net/~joey/code/alien/ Package: alien Architecture: all -Section: admin Depends: debhelper (>= 7), ${misc:Depends}, ${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 diff --git a/debian/copyright b/debian/copyright index 1c3d161..034b6bb 100644 --- a/debian/copyright +++ b/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: - 1996, 1997 Christoph Lameter - 1997 Randolph Chung - 2001 Mark A. Hershberger - 1997-2011 Joey Hess +Copyright: 1996-1997 Christoph Lameter + 1997 Randolph Chung + 2001 Mark A. Hershberger + 1997-2011 Joey Hess +License: GPL-2+ + +Files: debian/* +Copyright: 1996-1997 Christoph Lameter + 1997 Randolph Chung + 2001 Mark A. Hershberger + 1997-2011 Joey Hess + 2015 Fabiano Antunes License: GPL-2+ - On Debian systems, the complete text of the GPL can be found in - /usr/share/common-licenses/GPL. +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 + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/rules b/debian/rules index ccf07d0..ce45295 100755 --- a/debian/rules +++ b/debian/rules @@ -6,11 +6,6 @@ override_dh_auto_test: # simple smoke test ./alien.pl -V -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 if [ -e Makefile ]; then $(MAKE) realclean; fi diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native)