From 046afb14d4f0b7ca03d5be736984d58150ccfc42 Mon Sep 17 00:00:00 2001 From: joey Date: Mon, 6 Sep 1999 21:29:23 +0000 Subject: [PATCH] * Now FHS compliant. But the packages it builds will probably not be.. --- Makefile | 4 ++-- debian/changelog | 6 ++++++ debian/control | 18 +++++++++++------- lib/Fromdeb.pm | 2 +- patches/axbase_4.4.1-13.diff | 6 +++--- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 1f71e63..a287d06 100644 --- a/Makefile +++ b/Makefile @@ -22,8 +22,8 @@ install: cp -f patches/* $(DESTDIR)/$(PREFIX)/lib/alien/patches/ -rm -f $(DESTDIR)/$(PREFIX)/lib/alien/patches/*.gz gzip -qf9 $(DESTDIR)/$(PREFIX)/lib/alien/patches/* - install -d $(DESTDIR)/$(PREFIX)/man/man1 - cp -f alien.1 $(DESTDIR)/$(PREFIX)/man/man1 + install -d $(DESTDIR)/$(PREFIX)/share/man/man1 + cp -f alien.1 $(DESTDIR)/$(PREFIX)/share/man/man1 # This updates the version number in various files. version: diff --git a/debian/changelog b/debian/changelog index a439aa4..c7aa6bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +alien (6.47) unstable; urgency=low + + * Now FHS compliant. But the packages it builds will probably not be.. + + -- Joey Hess Mon, 6 Sep 1999 14:25:01 -0700 + alien (6.46) unstable; urgency=low * Fixed alien.slp file generation. diff --git a/debian/control b/debian/control index 78541d4..fdc6210 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,18 @@ Source: alien Section: admin Priority: extra -Maintainer: Christoph Lameter -Standards-Version: 2.1.2.2 +Maintainer: Joey Hess +Standards-Version: 3.0.1.1 Package: alien Architecture: all Section: admin -Depends: debmake -Recommends: rpm -Description: Install RedHat and Slackware Packages with dpkg. - Allows the integration of packages from other sources (Red Hat, Slackware etc) - called "Aliens". This is a tool only suitable for binary packages. +Depends: debhelper (>= 0.88), perl5 | perl (>= 5.004), rpm (>= 2.4.4-2), dpkg-dev, make, cpio +Suggests: patch, bzip2 +Description: Install Red Hat, Stampede, and Slackware Packages with dpkg. + Alien allows you to convert Red Hat, Stampede and Slackware Packages into + Debian packages, which can be installed with dpkg. + . + It can also convert into Slackware, Red Hat, and Stampede packages. + . + This is a tool only suitable for binary packages. diff --git a/lib/Fromdeb.pm b/lib/Fromdeb.pm index 1558151..d80dd05 100644 --- a/lib/Fromdeb.pm +++ b/lib/Fromdeb.pm @@ -58,7 +58,7 @@ sub GetFields { my ($self,$file)=@_; $i++; } - $fields{COPYRIGHT}="see /usr/doc/$fields{NAME}/copyright"; + $fields{COPYRIGHT}="see /usr/share/doc/$fields{NAME}/copyright"; $fields{GROUP}="unknown" if (!$fields{GROUP}); $fields{DISTRIBUTION}="Debian"; if ($fields{VERSION} =~ /(.+)-(.+)/) { diff --git a/patches/axbase_4.4.1-13.diff b/patches/axbase_4.4.1-13.diff index 8775003..61dfdcc 100644 --- a/patches/axbase_4.4.1-13.diff +++ b/patches/axbase_4.4.1-13.diff @@ -15,8 +15,8 @@ echo "Copying .odbc.ini to $HOME" - test -f /usr/doc/packages/axbase/.odbc.ini && \ - cp /usr/doc/packages/axbase/.odbc.ini ${HOME}/.odbc.ini -+ test -f /usr/doc/axbase/.odbc.ini && \ -+ cp /usr/doc/axbase/.odbc.ini ${HOME}/.odbc.ini ++ test -f /usr/share/doc/axbase/.odbc.ini && \ ++ cp /usr/share/doc/axbase/.odbc.ini ${HOME}/.odbc.ini fi # @@ -147,4 +147,4 @@ --- axbase-4.4.1.orig/debian/menu +++ axbase-4.4.1/debian/menu @@ -0,0 +1 @@ -+?package(applix):needs="x11" section="Apps/Editors" title="Applixware" command="applixware" ++?package(axbase):needs="x11" section="Apps/Editors" title="Applixware" command="applixware"