From e106d9666424ee2f5c7de368137b65d45cdcf1e2 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 26 Oct 2001 18:28:28 +0000 Subject: [PATCH] prerelease --- Alien/Package/Deb.pm | 42 +- Alien/Package/Pkg.pm | 330 +++++++++++ alien.pl | 34 +- debian/changelog | 26 + debian/control | 2 +- debian/copyright | 3 + patches/applix-english_4.3-2.diff | 108 ---- patches/applix_4.2-2.diff | 126 ---- patches/applix_4.3-2.diff | 163 ------ patches/apxeng_4.4.1-13.diff | 104 ---- patches/axbase_4.4.1-13.diff | 150 ----- patches/axfont_4.4.1-13.diff | 114 ---- patches/axlang_4.4.1-13.diff | 107 ---- patches/xbf-i740-glibc_1.0.0-3.diff | 636 --------------------- patches/xf86config-glibc_1.0.0.i386-3.diff | 296 ---------- 15 files changed, 430 insertions(+), 1811 deletions(-) create mode 100644 Alien/Package/Pkg.pm delete mode 100644 patches/applix-english_4.3-2.diff delete mode 100644 patches/applix_4.2-2.diff delete mode 100644 patches/applix_4.3-2.diff delete mode 100644 patches/apxeng_4.4.1-13.diff delete mode 100644 patches/axbase_4.4.1-13.diff delete mode 100644 patches/axfont_4.4.1-13.diff delete mode 100644 patches/axlang_4.4.1-13.diff delete mode 100644 patches/xbf-i740-glibc_1.0.0-3.diff delete mode 100644 patches/xf86config-glibc_1.0.0.i386-3.diff diff --git a/Alien/Package/Deb.pm b/Alien/Package/Deb.pm index e108794..ec783b4 100644 --- a/Alien/Package/Deb.pm +++ b/Alien/Package/Deb.pm @@ -23,6 +23,11 @@ Alien::Package. Set to a true value if dpkg-deb is available. +=item dirtrans + +After the build stage, set to a hash reference of the directories we moved +files from and to, so these moves can be reverted in the cleantree stage. + =back =head1 METHODS @@ -339,7 +344,7 @@ binary-arch: build dh_installdirs cp -a `ls -1 |grep -v debian` debian/$(PACKAGE) # -# If you need to move files around in debian//$(PACKAGE) or do some +# If you need to move files around in debian/$(PACKAGE) or do some # binary patching, do it here # dh_installdocs @@ -372,6 +377,28 @@ EOF print OUT $data; close OUT; } + + my %dirtrans=( # Note: no trailing slahshes on these directory names! + # Move files to FHS-compliant locations, if possible. + '/usr/man' => '/usr/share/man', + '/usr/info' => '/usr/share/info', + '/usr/doc' => '/usr/share/doc', + ); + foreach my $olddir (keys %dirtrans) { + if (-d "$dir/$olddir" && ! -e "$dir/$dirtrans{$olddir}") { + # Ignore failure.. + my ($dirbase)=$dirtrans{$olddir}=~/(.*)\//; + system("install", "-d", "$dir/$dirbase"); + system("mv", "$dir/$olddir", "$dir/$dirtrans{$olddir}"); + if (-d "$dir/$olddir") { + system("rmdir", "-p", "$dir/$olddir"); + } + } + else { + delete $dirtrans{$olddir}; + } + } + $this->dirtrans(\%dirtrans); # store for cleantree } =item build @@ -403,6 +430,19 @@ sub cleantree { my $this=shift; my $dir=$this->unpacked_tree || die "The package must be unpacked first!"; + my %dirtrans=%{$this->dirtrans}; + foreach my $olddir (keys %dirtrans) { + if (! -e "$dir/$olddir" && -d "$dir/$dirtrans{$olddir}") { + # Ignore failure.. (should I?) + my ($dirbase)=$dir=~/(.*)\//; + system("install", "-d", "$dir/$dirbase"); + system("mv", "$dir/$dirtrans{$olddir}", "$dir/$olddir"); + if (-d "$dir/$dirtrans{$olddir}") { + system("rmdir", "-p", "$dir/$dirtrans{$olddir}"); + } + } + } + system("rm", "-rf", "$dir/debian"); } diff --git a/Alien/Package/Pkg.pm b/Alien/Package/Pkg.pm new file mode 100644 index 0000000..b76c909 --- /dev/null +++ b/Alien/Package/Pkg.pm @@ -0,0 +1,330 @@ +#!/usr/bin/perl -w + +=head1 NAME + +Alien::Package::Pkg - an object that represents a Solaris pkg package + +=cut + +package Alien::Package::Pkg; +use strict; +use base qw(Alien::Package); + +=head1 DESCRIPTION + +This is an object class that represents a pkg package, as used in Solaris. +It is derived from Alien::Package. + +=head1 CLASS DATA + +=over 4 + +=item scripttrans + +Translation table between canoical script names and the names used in +pkg's. + +=cut + +use constant scripttrans => { + postinst => 'postinstall', + preinst => 'preinstall', +}; + +=back + +=head1 METHODS + +=over 4 + +=item init + +This class needs the Solaris pkginfo and kgtrans tools to work. + +=cut + +sub init { + foreach (qw(/usr/bin/pkginfo /usr/bin/pkgtrans)) { + -x || die "$_ is needed to use ".__PACKAGE__."\n"; + } +} + +=item converted_name + +Convert name from something debian-like to something that the +Solaris constraints will handle (i.e. 9 chars max). + +=cut + +sub converted_name { + my $this = shift; + my $prefix = "ALN"; + my $name = $this->name; + + for ($name) { # A Short list to start us off. + # Still, this is risky since we need + # unique names. + s/^lib/l/; + s/-perl$/p/; + s/^perl-/pl/; + } + + $name = substr($name, 0, 9); + + return $prefix.$name; +} + +=item checkfile + +Detect pkg files by their contents. + +=cut + +sub checkfile { + my $this=shift; + my $file=shift; + + open(F, $file) || die "Couldn't open $file: $!\n"; + my $line = ; + close F; + + if($line =~ "# PaCkAgE DaTaStReAm") { + return 1; + } +} + +=item install + +Install a pkg with pkgadd. Pass in the filename of the pkg to install. + +=cut + +sub install { + my $this=shift; + my $pkg=shift; + + if (-x "/usr/sbin/pkgadd") { + system("/usr/sbin/pkgadd", "-d .", "$pkg") == 0 + or die "Unable to install"; + } + else { + die "Sorry, I cannot install the generated .pkg file because /usr/sbin/pkgadd is not present.\n"; + } +} + +=item scan + +Scan a pkg file for fields. + +=cut + +sub scan { + my $this=shift; + $this->SUPER::scan(@_); + my $file=$this->filename; + my $tdir="pkg-scan-tmp.$$"; + + mkdir $tdir, 0755 || die "Error making $tdir: $!\n"; + + my $pkgname; + if (-x "/usr/bin/pkginfo" && -x "/usr/bin/pkgtrans") { + my $pkginfo; + + open(INFO, "/usr/bin/pkginfo -d $file|") + || die "Couldn't open pkginfo: $!\n"; + $_ = ; + ($pkgname) = /\S+\s+(\S+)/; + close INFO; + + # Extract the files + system("/usr/bin/pkgtrans -i $file $tdir $pkgname") == 0 + || die "Error running pkgtrans: $!\n"; + + open(INFO, "$tdir/$pkgname/pkginfo") + || die "Couldn't open pkgparam: $!\n"; + my ($key, $value); + while () { + if (/^([^=]+)=(.*)$/) { + $key = $1; + $value = $2; + } + else { + $value = $_; + } + push @{$pkginfo->{$key}}, $value + } + close INFO; + $file =~ m,([^/]+)-[^-]+(?:.pkg)$,; + $this->name($1); + $this->arch($pkginfo->{ARCH}->[0]); + $this->summary("Converted Solaris pkg package"); + $this->description(join("", @{[$pkginfo->{DESC} || "."]})); + $this->version($pkginfo->{VERSION}->[0]); + $this->distribution("Solaris"); + $this->group("unknown"); # *** FIXME + $this->origformat('pkg'); + $this->changelogtext(''); + $this->binary_info('unknown'); # *** FIXME + + if (-f "$tdir/$pkgname/copyright") { + open (COPYRIGHT, "$file/install/copyright") + || die "Couldn't open copyright: $!\n"; + $this->copyright(join("\n",)); + close(COPYRIGHT); + } + else { + $this->copyright("unknown"); + } + } + + # Now figure out the conffiles. Assume anything in etc/ is a + # conffile. + my @conffiles; + my @filelist; + my @scripts; + open (FILELIST,"$tdir/$pkgname/pkgmap") || + die "getting filelist ($file/pkgmap): $!"; + while () { + if (m,^1 f \S+ etc/([^\s=]+),) { + push @conffiles, "/etc/$1"; + } + if (m,^1 [fd] \S+ ([^\s=]+),) { + push @filelist, $1; + } + if (m,^1 i (\S+),) { + push @scripts, $1; + } + } + + $this->conffiles(\@conffiles); + + # Now get the scripts. + foreach my $script (keys %{scripttrans()}) { + $this->$script(scripttrans()->{$script}) + if -e "$file/".scripttrans()->{$script}; + } + + system ("rm -rf $tdir"); + + return 1; +} + +=item unpack + +Unpack pkg. + +=cut + +sub unpack { + my $this=shift; + $this->SUPER::unpack(@_); + my $file=$this->filename; + + my $pkgname; + open(INFO, "/usr/bin/pkginfo -d $file|") + || die "Couldn't open pkginfo: $!\n"; + $_ = ; + ($pkgname) = /\S+\s+(\S+)/; + close INFO; + + if (-x "/usr/bin/pkgtrans") { + my $workdir = $this->name."-".$this->version;; + mkdir $workdir, 0755 || die "unable to mkdir $workdir: $!\n"; + system("/usr/bin/pkgtrans $file $workdir $pkgname") == 0 + || die "unable to extract $file: $!\n"; + rename "$workdir/$pkgname", "$ {workdir}_1" + || die "unable rename $workdir/$pkgname: $!\n"; + rmdir $workdir; + rename "$ {workdir}_1", $workdir + || die "unable to rename $ {workdir}_1: $!\n"; + $this->unpacked_tree($workdir); + } +} + +=item prep + +Adds a populated install directory to the build tree. + +=cut + +sub prep { + my $this=shift; + my $dir=$this->unpacked_tree || die "The package must be unpacked first!"; + +# opendir(DIR, $this->unpacked_tree); +# my @sub = map {$this->unpacked_tree . "$_"} +# grep {/^\./} readdir DIR; +# closedir DIR; + + system("cd $dir; find . -print | pkgproto > ./prototype") == 0 + || die "error during pkgproto: $!\n"; + + open(PKGPROTO, ">>$dir/prototype") + || die "error appending to prototype: $!\n"; + + open(PKGINFO, ">$dir/pkginfo") + || die "error creating pkginfo: $!\n"; + print PKGINFO qq{PKG="}.$this->converted_name.qq{"\n}; + print PKGINFO qq{NAME="}.$this->name.qq{"\n}; + print PKGINFO qq{ARCH="}.$this->arch.qq{"\n}; + print PKGINFO qq{VERSION="}.$this->version.qq{"\n}; + print PKGINFO qq{CATEGORY="application"\n}; + print PKGINFO qq{VENDOR="Alien-converted package"\n}; + print PKGINFO qq{EMAIL=\n}; + print PKGINFO qq{PSTAMP=alien\n}; + print PKGINFO qq{MAXINST=1000\n}; + print PKGINFO qq{BASEDIR="/"\n}; + print PKGINFO qq{CLASSES="none"\n}; + print PKGINFO qq{DESC="}.$this->description.qq{"\n}; + close PKGINFO; + print PKGPROTO "i pkginfo=./pkginfo\n"; + + mkdir "$dir/install", 0755; + open(COPYRIGHT, ">$dir/install/copyright") + || die "error creating copyright: $!\n"; + print COPYRIGHT $this->copyright; + close COPYRIGHT; + print PKGPROTO "i copyright=./install/copyright\n"; + + foreach my $script (keys %{scripttrans()}) { + my $data=$this->$script(); + my $out=$this->unpacked_tree."/install/".${scripttrans()}{$script}; + next if ! defined $data || $data =~ m/^\s*$/; + + open (OUT, ">$out") || die "$out: $!"; + print OUT $data; + close OUT; + chmod 0755, $out; + print PKGPROTO "i $script=$out\n"; + } + close PKGPROTO; +} + +=item build + +Build a pkg. + +=cut + +sub build { + my $this = shift; + my $dir = $this->unpacked_tree; + + system("cd $dir; pkgmk -r / -d .") == 0 + || die "Error during pkgmk: $!\n"; + + my $pkgname = $this->converted_name; + my $name = $this->name."-".$this->version.".pkg"; + system("pkgtrans $dir $name $pkgname") == 0 + || die "Error during pkgtrans: $!\n"; + rename "$dir/$name", $name; + return $name; +} + +=head1 AUTHOR + +Mark Hershberger + +=cut + +1 diff --git a/alien.pl b/alien.pl index bc1d6fd..46aebe8 100755 --- a/alien.pl +++ b/alien.pl @@ -11,9 +11,10 @@ alien - Convert or install an alien binary package =head1 DESCRIPTION B is a program that converts between Redhat rpm, Debian deb, -Stampede slp and Slackware tgz file formats. If you want to use a package from -another linux distribution than the one you have installed on your system, -you can use alien to convert it to your preferred package format and install it. +Stampede slp and Slackware tgz file formats. If you want to use a package +from another linux distribution than the one you have installed on your +system, you can use alien to convert it to your preferred package format +and install it. =head1 WARNING @@ -52,6 +53,12 @@ standard linux directory tree. Do NOT run 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! +=item pkg + +To manipulate packages in the Solaris pkg format (which is really the SV +datastream package format), you will need the Solaris pkginfo and pkgtrans +tools. + =back =head1 OPTIONS @@ -82,6 +89,10 @@ Make tgz packages. Make slp packages. +=item B<-p>, B<--to-pkg> + +Make Solaris pkg packages. + =item B<-i>, B<--install> Automatically install each generated package, and remove the package file @@ -177,12 +188,17 @@ Options to pass to rpm when it is building a package. Options to pass to rpm when it is installing a package. +=item EMAIL + +If set, alien assumes this is your email address. Email addresses are included +in generated debian packages. + =back =head1 NOTES -When using alien to convert a tgz package, all files in /etc in are assumed to be -configuration files. +When using alien to convert a tgz package, all files in /etc in are assumed +to be configuration files. If alien is not run as root, the files in the generated package will have incorrect owners and permissions. @@ -194,6 +210,8 @@ Alien was written by Christoph Lameter, B<>. deb to rpm conversion code was taken from the Martian program by Randolph Chung, B<>. +The Solaris pkg code was written by Mark A. Hershberger B<>. + Alien has been extensively rewritten (3 times) and is now maintained by Joey Hess, B<>. @@ -211,6 +229,7 @@ use Alien::Package::Deb; use Alien::Package::Rpm; use Alien::Package::Tgz; use Alien::Package::Slp; +use Alien::Package::Pkg; # Returns a list of directories to search for patches. sub patchdirs { @@ -241,6 +260,7 @@ Usage: alien [options] file [...] -t, --to-tgz Generate a Slackware tgz package. Enables the following option: --description= Specify package description. + -p, --to-pkg Generate a Solaris pkg package. -i, --install Install generated package. -g, --generate Unpack, but do not generate a new package. -c, --scripts Include scripts in package. @@ -261,6 +281,7 @@ GetOptions( "to-rpm|r", sub { $destformats{rpm}=1 }, "to-tgz|t", sub { $destformats{tgz}=1 }, "to-slp", sub { $destformats{slp}=1 }, + "to-pkg|p", sub { $destformats{pkg}=1 }, "generate|g", \$generate, "install|i", \$install, "single|s", sub { $single=1; $generate=1 }, @@ -328,6 +349,9 @@ foreach my $file (@ARGV) { elsif (Alien::Package::Slp->checkfile($file)) { $package=Alien::Package::Slp->new(filename => $file); } + elsif (Alien::Package::Pkg->checkfile($file)) { + $package=Alien::Package::Pkg->new(filename => $file); + } else { die "Unknown type of package, $file.\n"; } diff --git a/debian/changelog b/debian/changelog index 96746b3..c7f9fda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +alien (7.30pre) unstable; urgency=low + + * Thanks to the excellent work of Mark A. Hershberger , + alien now supports converting to and from Solaris "pkg" packages (which + are really SysV packages). You probably need to run it on Solaris for this + to work, though. This brings the number of possible conversions alien can + do up from 12 to a monstrous 20! + * Documented the EMAIL environment variable. Closes: #116754 + * Threw out a lot of old patches, circa 1999. Probably useless today. + * When converting to debs, move files as follows, if possible, for better + FHS compliance: + /usr/man => /usr/share/man + /usr/info => /usr/share/info + /usr/doc' => /usr/share/doc + * Also moves files as follows, to avoid possibly confusing dpkg with + installing over symlinks (?). Closes: #40012 + /usr/bin/X11 should be /usr/X11R6/bin + /usr/lib/X11 should be /usr/X11R6/lib/X11 + /usr/include/X11 should be /usr/X11R6/include/X11 + * Reverse these moves in the cleantree stage. + * Debian users who have installed alien packages in the past may want to + re-convert and reinstall them, to take advantage of the new FHS + conversions. + + -- Joey Hess Thu, 25 Oct 2001 20:53:33 -0400 + alien (7.27) unstable; urgency=low * Moved as many system calls as I can over to shellless execution. diff --git a/debian/control b/debian/control index 9a647cc..d37d1be 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Build-Depends-Indep: debhelper (>= 3) Maintainer: Joey Hess -Standards-Version: 3.5.5.0 +Standards-Version: 3.5.6.0 Package: alien Architecture: all diff --git a/debian/copyright b/debian/copyright index 41aaf48..3a28efe 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,6 +4,9 @@ This is a package originally written by Christoph Lameter Deb to rpm conversion code was taken from the Martian program by Randolph Chung . +The Solaris pkg code was written by Mark A. Hershberger +. + This package is now maintained by Joey Hess . Copyright: Most recent version of the GPL. diff --git a/patches/applix-english_4.3-2.diff b/patches/applix-english_4.3-2.diff deleted file mode 100644 index e401eda..0000000 --- a/patches/applix-english_4.3-2.diff +++ /dev/null @@ -1,108 +0,0 @@ ---- applix-english-4.3.orig/debian/changelog -+++ applix-english-4.3/debian/changelog -@@ -0,0 +1,10 @@ -+applix-english (4.3-2) unstable; urgency=low -+ -+ * Converted from RPM binary format to debian -+ -+ -- Joey Hess Fri, 16 May 1997 00:40:39 -0400 -+ -+ -+Local variables: -+mode: debian-changelog -+End: ---- applix-english-4.3.orig/debian/control -+++ applix-english-4.3/debian/control -@@ -0,0 +1,14 @@ -+Source: applix-english -+Section: unknown -+Priority: extra -+Maintainer: Joey Hess -+Standards-Version: 2.1.1.0 -+ -+Package: applix-english -+Architecture: i386 -+Depends: applix -+Description: Applixware Menus and Help in English -+ This is a Converted RPM package. -+ . -+ The English versions of the menu structure and some of the -+ basic help documents, for applixware. ---- applix-english-4.3.orig/debian/copyright -+++ applix-english-4.3/debian/copyright -@@ -0,0 +1,17 @@ -+This package was debianized by the alien program by converting -+a binary RPM Package on Fri, 16 May 1997 00:40:39 -0400. -+ -+Copyright: Commercial software. Do not distribute. -+ -+Information from the binary Package: -+Name : applix-english Distribution: Applixware for Red Hat Linux -+Version : 4.3 Vendor: Red Hat Software -+Release : 1 Build Date: Thu Mar 20 15:25:05 1997 -+Install date: (none) Build Host: imp.redhat.com -+Group : X11/Applications Source RPM: applix-4.3-1.nosrc.rpm -+Size : 53181805 -+Summary : Applixware Menus and Help in English -+Description : -+The English versions of the menu structure and some of the -+basic help documents. -+ ---- applix-english-4.3.orig/debian/rules -+++ applix-english-4.3/debian/rules -@@ -0,0 +1,55 @@ -+#!/usr/bin/make -f -+# -+# This is a special rules files for handling alien or binary packages -+# Christoph Lameter, October 30, 1996 -+ -+package=applix-english -+ -+debian/build: -+ $(checkdir) -+ touch debian/build -+ -+clean: -+ $(checkdir) -+ -rm -f debian/build -+ -rm -rf *~ debian/tmp debian/*~ debian/files* -+ -+binary-indep: checkroot debian/build -+ $(checkdir) -+# There are no architecture-independent files to be uploaded -+# generated by this package. If there were any they would be -+# made here. -+ -+binary-arch: checkroot debian/build -+ $(checkdir) -+ -rm -rf debian/tmp -+# Install binary package -+ install -d debian/tmp -+ install -d debian/tmp/usr/X11R6/lib/X11 -+ # Moving the files like this is a little nasty, but this way we -+ # need far less disk space to build the package.. -+ mv opt/applix debian/tmp/usr/X11R6/lib/X11 -+ chmod +rx debian/tmp/usr/X11R6/lib/X11/applix debian/tmp/usr/X11R6/lib/X11/applix/axdata debian/tmp/usr/X11R6/lib/X11/applix/axdata/elflib -+ debstd -+ dpkg-gencontrol -+ dpkg --build debian/tmp .. -+ mv debian/tmp/usr/X11R6/lib/X11/applix opt -+ -+define checkdir -+ test -f debian/rules -+endef -+ -+# Below here is fairly generic really -+ -+binary: binary-indep binary-arch -+ -+build: debian/build -+ -+source diff: -+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false -+ -+checkroot: -+ $(checkdir) -+ test root = "`whoami`" -+ -+.PHONY: binary binary-arch binary-indep clean checkroot diff --git a/patches/applix_4.2-2.diff b/patches/applix_4.2-2.diff deleted file mode 100644 index 5563a88..0000000 --- a/patches/applix_4.2-2.diff +++ /dev/null @@ -1,126 +0,0 @@ ---- applix-4.2.orig/debian/changelog -+++ applix-4.2/debian/changelog -@@ -0,0 +1,9 @@ -+applix (4.2-2) unstable; urgency=low -+ -+ * Converted from RPM binary format to debian -+ -+ -- Joey Hess Fri, 31 Jan 1997 22:50:29 -0500 -+ -+Local variables: -+mode: debian-changelog -+End: ---- applix-4.2.orig/debian/control -+++ applix-4.2/debian/control -@@ -0,0 +1,12 @@ -+Source: applix -+Section: unknown -+Priority: extra -+Maintainer: Joey Hess -+Standards-Version: 2.1.1.0 -+ -+Package: applix -+Architecture: i386 -+Depends: ${shlibs:Depends} -+Description: A Complete X Windows based Office Suite -+ Redhat's Applixware, a Office Suite for X. -+ This is a Converted RPM package. ---- applix-4.2.orig/debian/copyright -+++ applix-4.2/debian/copyright -@@ -0,0 +1,15 @@ -+This package was debianized by the alien program by converting -+a binary RPM Package on Fri, 31 Jan 1997 22:50:29 -0500. -+ -+Copyright: Commercial software. Do not distribute. -+ -+Information from the binary Package: -+Name : applix Distribution: Red Hat Linux Rembrandt -+Version : 4.2 Vendor: Red Hat Software -+Release : 2 Build Date: Wed Jul 03 12:13:21 1996 -+Install date: (none) Build Host: porky.redhat.com -+Group : X11/Applications Source RPM: applix-4.2-2.src.rpm -+Size : 150073902 -+Summary : (none) -+Description : -+A Complete X Windows based Office Suite ---- applix-4.2.orig/debian/rules -+++ applix-4.2/debian/rules -@@ -0,0 +1,57 @@ -+#!/usr/bin/make -f -+# -+# This is a special rules files for handling alien or binary packages -+# Christoph Lameter, October 30, 1996 -+ -+package=applix -+ -+debian/build: -+ $(checkdir) -+ touch debian/build -+ -+clean: -+ $(checkdir) -+ -rm -f debian/build -+ -rm -rf *~ debian/tmp debian/*~ debian/files* -+ -+binary-indep: checkroot debian/build -+ $(checkdir) -+# There are no architecture-independent files to be uploaded -+# generated by this package. If there were any they would be -+# made here. -+ -+binary-arch: checkroot debian/build -+ $(checkdir) -+ -rm -rf debian/tmp -+# Install binary package -+ install -d debian/tmp -+ install -d debian/tmp/usr/X11R6/bin -+ install opt/bin/applix debian/tmp/usr/X11R6/bin -+ install -d debian/tmp/usr/X11R6/lib/X11 -+ # Moving the files like this is a little nasty, but this way we -+ # need far less disk space to build the package.. -+ mv opt/applix debian/tmp/usr/X11R6/lib/X11 -+ chmod +rx debian/tmp/usr/X11R6/lib/X11/applix -+ debstd -+ dpkg-gencontrol -+ dpkg --build debian/tmp .. -+ mv debian/tmp//usr/X11R6/lib/X11/applix opt -+ -+define checkdir -+ test -f debian/rules -+endef -+ -+# Below here is fairly generic really -+ -+binary: binary-indep binary-arch -+ -+build: debian/build -+ -+source diff: -+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false -+ -+checkroot: -+ $(checkdir) -+ test root = "`whoami`" -+ -+.PHONY: binary binary-arch binary-indep clean checkroot ---- applix-4.2.orig/debian/README.debian -+++ applix-4.2/debian/README.debian -@@ -0,0 +1,7 @@ -+This is a converted RPM package. -+ -+I decided to move the files out of /opt, since debian doesn't have an /opt -+yet. If the applix manual talks about files in /opt, look in -+/usr/X11R6/lib/X11/applix, instead. -+ -+-- Joey Hess ---- applix-4.2.orig/debian/menu -+++ applix-4.2/debian/menu -@@ -0,0 +1 @@ -+x11 Apps/Editors applix none "Applixware" applix ---- applix-4.2.orig/opt/bin/applix -+++ applix-4.2/opt/bin/applix -@@ -1,3 +1,3 @@ - #!/bin/sh - --/opt/applix/applix $* -+/usr/X11R6/lib/X11/applix/applix $* diff --git a/patches/applix_4.3-2.diff b/patches/applix_4.3-2.diff deleted file mode 100644 index 190cf05..0000000 --- a/patches/applix_4.3-2.diff +++ /dev/null @@ -1,163 +0,0 @@ ---- applix-4.3.orig/debian/changelog -+++ applix-4.3/debian/changelog -@@ -0,0 +1,9 @@ -+applix (4.3-2) unstable; urgency=low -+ -+ * Converted from RPM binary format to debian -+ -+ -- Joey Hess Thu, 15 May 1997 21:32:19 -0400 -+ -+Local variables: -+mode: debian-changelog -+End: ---- applix-4.3.orig/debian/control -+++ applix-4.3/debian/control -@@ -0,0 +1,18 @@ -+Source: applix -+Section: unknown -+Priority: extra -+Maintainer: Joey Hess -+Standards-Version: 2.1.1.0 -+ -+Package: applix -+Architecture: i386 -+Depends: ${shlibs:Depends} -+Description: A Complete X Windows based Office Suite -+ Redhat's Applixware, a Office Suite for X. -+ This is a Converted RPM package. -+ . -+ Applixware is a complete X-Window-based Office Suite which provides -+ word processing, spreadsheet, presentation graphics, and more. -+ Applixware also includes Applix Builder, a graphical application builder -+ that allows you to build new applications that reuse Applixware -+ components. ---- applix-4.3.orig/debian/copyright -+++ applix-4.3/debian/copyright -@@ -0,0 +1,20 @@ -+This package was debianized by the alien program by converting -+a binary RPM Package on Thu, 15 May 1997 21:33:36 -0400 -+ -+Copyright: Commercial software. Do not distribute. -+ -+Information from the binary Package: -+ -+Name : applix Distribution: Applixware for Red Hat Linux -+Version : 4.3 Vendor: Red Hat Software -+Release : 1 Build Date: Thu Mar 20 15:25:05 1997 -+Install date: (none) Build Host: imp.redhat.com -+Group : X11/Applications Source RPM: applix-4.3-1.nosrc.rpm -+Size : 57787719 -+Summary : A Complete X-Window-based Office Suite -+Description : -+Applixware is a complete X-Window-based Office Suite which provides -+word processing, spreadsheet, presentation graphics, and more. -+Applixware also includes Applix Builder, a graphical application builder -+that allows you to build new applications that reuse Applixware -+components. ---- applix-4.3.orig/debian/rules -+++ applix-4.3/debian/rules -@@ -0,0 +1,57 @@ -+#!/usr/bin/make -f -+# -+# This is a special rules files for handling alien or binary packages -+# Christoph Lameter, October 30, 1996 -+ -+package=applix -+ -+debian/build: -+ $(checkdir) -+ touch debian/build -+ -+clean: -+ $(checkdir) -+ -rm -f debian/build -+ -rm -rf *~ debian/tmp debian/*~ debian/files* -+ -+binary-indep: checkroot debian/build -+ $(checkdir) -+# There are no architecture-independent files to be uploaded -+# generated by this package. If there were any they would be -+# made here. -+ -+binary-arch: checkroot debian/build -+ $(checkdir) -+ -rm -rf debian/tmp -+# Install binary package -+ install -d debian/tmp -+ install -d debian/tmp/usr/X11R6/bin -+ cd debian/tmp/usr/X11R6/bin && ln -sf ../lib/X11/applix/bin/applix -+ install -d debian/tmp/usr/X11R6/lib/X11 -+ # Moving the files like this is a little nasty, but this way we -+ # need far less disk space to build the package.. -+ mv opt/applix debian/tmp/usr/X11R6/lib/X11 -+ chmod +rx debian/tmp/usr/X11R6/lib/X11/applix debian/tmp/usr/X11R6/lib/X11/applix/axdata/elflib -+ debstd -+ dpkg-gencontrol -+ dpkg --build debian/tmp .. -+ mv debian/tmp/usr/X11R6/lib/X11/applix opt -+ -+define checkdir -+ test -f debian/rules -+endef -+ -+# Below here is fairly generic really -+ -+binary: binary-indep binary-arch -+ -+build: debian/build -+ -+source diff: -+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false -+ -+checkroot: -+ $(checkdir) -+ test root = "`whoami`" -+ -+.PHONY: binary binary-arch binary-indep clean checkroot ---- applix-4.3.orig/debian/README.debian -+++ applix-4.3/debian/README.debian -@@ -0,0 +1,7 @@ -+This is a converted RPM package. -+ -+I decided to move the files out of /opt, since debian doesn't have an /opt -+yet. If the applix manual talks about files in /opt, look in -+/usr/X11R6/lib/X11/applix, instead. -+ -+-- Joey Hess ---- applix-4.3.orig/debian/menu -+++ applix-4.3/debian/menu -@@ -0,0 +1 @@ -+?package(applix):needs="x11" section="Apps/Editors" title="Applixware" command="applix" ---- applix-4.3.orig/opt/applix/bin/applix -+++ applix-4.3/opt/applix/bin/applix -@@ -1,11 +1,8 @@ - #!/bin/bash - - # Get the current prefix for the applix package: --if PRE=$(rpm -q --qf '%{INSTALLPREFIX}' applix 2>/dev/null) ; then : ; else -- # applix has not been installed with RPM on this system. Assume that -- # it is in /opt -- PRE=/opt --fi -+# Mod for debian: -+PRE=/usr/X11R6/lib/X11 - - # Choose a default language: Set one of these variables before running - # this script and you will choose the language you want. Otherwise, -@@ -32,11 +29,12 @@ - # We'll enforce 5.3.12 for greatest stability - ldd $PRE/applix/applix | grep "5\.3\.12" >/dev/null 2>&1 || { - [ -d $PRE/applix/lib ] || { -- echo "Please install the applix-libs package; applix may not" >&2 -+ # mod for debian: just warn, don't force them to hit enter. -+ echo "You should condsider installing the applix-libs package; applix may not" >&2 - echo "work with your current C library. " >&2 -- echo >&2 -- echo "Press enter to continue and try to run Applix anyway," >&2 -- echo -n "or press control-c to abort:" >&2 -+# echo >&2 -+# echo "Press enter to continue and try to run Applix anyway," >&2 -+# echo -n "or press control-c to abort:" >&2 - } - export LD_LIBRARY_PATH=$PRE/applix/lib/:$LD_LIBRARY_PATH - } diff --git a/patches/apxeng_4.4.1-13.diff b/patches/apxeng_4.4.1-13.diff deleted file mode 100644 index 2820f5f..0000000 --- a/patches/apxeng_4.4.1-13.diff +++ /dev/null @@ -1,104 +0,0 @@ ---- apxeng-4.4.1.orig/debian/changelog -+++ apxeng-4.4.1/debian/changelog -@@ -0,0 +1,9 @@ -+apxeng (4.4.1-14) unstable; urgency=low -+ -+ * Converted from RPM binary format to debian -+ -+ -- Joey Hess Wed, 7 Apr 1999 20:26:33 -0700 -+ -+Local variables: -+mode: debian-changelog -+End: ---- apxeng-4.4.1.orig/debian/control -+++ apxeng-4.4.1/debian/control -@@ -0,0 +1,9 @@ -+Source: apxeng -+Section: alien -+Priority: extra -+Maintainer: Joey Hess -+ -+Package: apxeng -+Architecture: i386 -+Description: ApplixWare Office (english) -+ This package contains the english version of ApplixWare Office. ---- apxeng-4.4.1.orig/debian/copyright -+++ apxeng-4.4.1/debian/copyright -@@ -0,0 +1,21 @@ -+This package was debianized by the alien program by converting -+a binary RPM Package on Wed, 7 Apr 1999 20:26:33 -0700. -+ -+Copyright: 1990-1998 Applix, Inc. -+ -+Information from the binary Package: -+Name : apxeng Distribution: SuSE Linux 6.0-BETA (i386) -+Version : 4.4.1 Vendor: SuSE GmbH, Nuernberg, Germany -+Release : 13 Build Date: Tue Dec 1 01:36:41 1998 -+Install date: (not installed) Build Host: neumann.suse.de -+Group : unsorted Source RPM: axbase-4.4.1-13.src.rpm -+Size : 17025358 License: 1990-1998 Applix, Inc. -+Packager : feedback@suse.de -+Summary : ApplixWare Office (english) -+Description : -+This package contains the english version of ApplixWare Office. -+ -+Authors: -+-------- -+ Eric Ding -+ ---- apxeng-4.4.1.orig/debian/rules -+++ apxeng-4.4.1/debian/rules -@@ -0,0 +1,53 @@ -+#!/usr/bin/make -f -+# debian/rules that uses debhelper and alien -+# GNU copyright 1997 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+build: -+ dh_testdir -+ # Nothing to do. -+ -+clean: -+ 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 -+ install -d debian/tmp/usr/X11R6/lib/X11 -+ cp -a opt/* debian/tmp/usr/X11R6/lib/X11 -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installinit -+ dh_installcron -+# dh_installmanpages -+# dh_undocumented -+ dh_installchangelogs -+# dh_strip -+ dh_compress -+ dh_fixperms -+ dh_suidregister -+ 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 diff --git a/patches/axbase_4.4.1-13.diff b/patches/axbase_4.4.1-13.diff deleted file mode 100644 index 61dfdcc..0000000 --- a/patches/axbase_4.4.1-13.diff +++ /dev/null @@ -1,150 +0,0 @@ ---- axbase-4.4.1.orig/usr/X11R6/bin/applixware -+++ axbase-4.4.1/usr/X11R6/bin/applixware -@@ -6,7 +6,7 @@ - # - - DBROOT=/dev/null --APPLIX=/opt/applix/applix -+APPLIX=/usr/X11R6/lib/X11/applix/applix - - # - # embedded jre is buggy -@@ -29,8 +29,8 @@ - # - if [ ! -e ~/.odbc.ini ]; then - 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/share/doc/axbase/.odbc.ini && \ -+ cp /usr/share/doc/axbase/.odbc.ini ${HOME}/.odbc.ini - fi - - # ---- axbase-4.4.1.orig/debian/changelog -+++ axbase-4.4.1/debian/changelog -@@ -0,0 +1,10 @@ -+axbase (4.4.1-14) unstable; urgency=low -+ -+ * Converted from RPM binary format to debian. -+ * Made it not use /opt at all. -+ -+ -- Joey Hess Wed, 7 Apr 1999 19:44:25 -0700 -+ -+Local variables: -+mode: debian-changelog -+End: ---- axbase-4.4.1.orig/debian/control -+++ axbase-4.4.1/debian/control -@@ -0,0 +1,12 @@ -+Source: axbase -+Section: alien -+Priority: extra -+Maintainer: Joey Hess -+ -+Package: axbase -+Architecture: i386 -+Depends: apxeng | apxgrm | apxfrn, axfont, ${shlibs:Depends} -+Description: base system of ApplixWare Office -+ This is the language independent part of ApplixWare Office for -+ linux. The language dependend part has to be installed in any -+ case. This package also contains Applix Builder and Applix Data. ---- axbase-4.4.1.orig/debian/copyright -+++ axbase-4.4.1/debian/copyright -@@ -0,0 +1,23 @@ -+This package was debianized by the alien program by converting -+a binary RPM Package on Wed, 7 Apr 1999 19:44:25 -0700. -+ -+Copyright: 1990-1998 Applix, Inc. -+ -+Information from the binary Package: -+Name : axbase Distribution: SuSE Linux 6.0-BETA (i386) -+Version : 4.4.1 Vendor: SuSE GmbH, Nuernberg, Germany -+Release : 13 Build Date: Tue Dec 1 01:36:41 1998 -+Install date: (not installed) Build Host: neumann.suse.de -+Group : unsorted Source RPM: axbase-4.4.1-13.src.rpm -+Size : 72974144 License: 1990-1998 Applix, Inc. -+Packager : feedback@suse.de -+Summary : base system of ApplixWare Office -+Description : -+This is the language independent part of ApplixWare Office for -+linux. The language dependend part has to be installed in any -+case. This package also contains Applix Builder and Applix Data. -+ -+Authors: -+-------- -+ Eric Ding -+ ---- axbase-4.4.1.orig/debian/rules -+++ axbase-4.4.1/debian/rules -@@ -0,0 +1,57 @@ -+#!/usr/bin/make -f -+# debian/rules that uses debhelper and alien -+# GNU copyright 1997 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+build: -+ dh_testdir -+ # Nothing to do. -+ -+clean: -+ 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 usr/X11R6/bin usr/X11R6/lib/X11 -+ # Moving the files like this is a little nasty, but this way we -+ # need far less disk space to build the package.. -+ mv opt/applix debian/tmp/usr/X11R6/lib/X11 -+ cp -a usr/X11R6/bin/* debian/tmp/usr/X11R6/bin/ -+ dh_installdocs usr/doc/packages/axbase/.* -+ dh_installexamples usr/doc/packages/axbase/contrib -+ dh_installmenu -+# dh_installinit -+ dh_installcron -+# dh_installmanpages -+# dh_undocumented -+ dh_installchangelogs -+# dh_strip -+ dh_compress -+ dh_fixperms -+ dh_suidregister -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -+ dh_makeshlibs -+ dh_md5sums -+ dh_builddeb -+ # Undo the move. -+ mv debian/tmp/usr/X11R6/lib/X11/applix opt -+ -+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 ---- axbase-4.4.1.orig/debian/README.Debian -+++ axbase-4.4.1/debian/README.Debian -@@ -0,0 +1,7 @@ -+This is a converted RPM package. -+ -+I decided to move the files out of /opt, since debian doesn't have an /opt -+yet. If the applix manual talks about files in /opt, look in -+/usr/X11R6/lib/X11/applix, instead. -+ -+-- Joey Hess ---- axbase-4.4.1.orig/debian/menu -+++ axbase-4.4.1/debian/menu -@@ -0,0 +1 @@ -+?package(axbase):needs="x11" section="Apps/Editors" title="Applixware" command="applixware" diff --git a/patches/axfont_4.4.1-13.diff b/patches/axfont_4.4.1-13.diff deleted file mode 100644 index 2c11b78..0000000 --- a/patches/axfont_4.4.1-13.diff +++ /dev/null @@ -1,114 +0,0 @@ ---- axfont-4.4.1.orig/debian/changelog -+++ axfont-4.4.1/debian/changelog -@@ -0,0 +1,9 @@ -+axfont (4.4.1-14) unstable; urgency=low -+ -+ * Converted from RPM binary format to debian. -+ -+ -- Joey Hess Wed, 7 Apr 1999 20:34:59 -0700 -+ -+Local variables: -+mode: debian-changelog -+End: ---- axfont-4.4.1.orig/debian/control -+++ axfont-4.4.1/debian/control -@@ -0,0 +1,10 @@ -+Source: axfont -+Section: alien -+Priority: extra -+Maintainer: Joey Hess -+ -+Package: axfont -+Architecture: i386 -+Depends: ${shlibs:Depends} -+Description: Applixware Fonts -+ This package contains the fonts for Applixware Office. ---- axfont-4.4.1.orig/debian/copyright -+++ axfont-4.4.1/debian/copyright -@@ -0,0 +1,21 @@ -+This package was debianized by the alien program by converting -+a binary RPM Package on Wed, 7 Apr 1999 20:34:59 -0700. -+ -+Copyright: 1990-1998 Applix, Inc. -+ -+Information from the binary Package: -+Name : axfont Distribution: SuSE Linux 6.0-BETA (i386) -+Version : 4.4.1 Vendor: SuSE GmbH, Nuernberg, Germany -+Release : 13 Build Date: Tue Dec 1 01:36:41 1998 -+Install date: (not installed) Build Host: neumann.suse.de -+Group : unsorted Source RPM: axbase-4.4.1-13.src.rpm -+Size : 17723034 License: 1990-1998 Applix, Inc. -+Packager : feedback@suse.de -+Summary : Applixware Fonts -+Description : -+This package contains the fonts for Applixware Office. -+ -+Authors: -+-------- -+ Eric Ding -+ ---- axfont-4.4.1.orig/debian/rules -+++ axfont-4.4.1/debian/rules -@@ -0,0 +1,55 @@ -+#!/usr/bin/make -f -+# debian/rules that uses debhelper and alien -+# GNU copyright 1997 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+build: -+ dh_testdir -+ # Nothing to do. -+ -+clean: -+ 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 -+ install -d debian/tmp/usr/X11R6/lib/X11 -+ cp -a opt/* debian/tmp/usr/X11R6/lib/X11 -+ # These cause applix to crash. -+ rm -rf debian/tmp/usr/X11R6/lib/X11/applix/axdata/fontmetrics/gallium -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installinit -+ dh_installcron -+# dh_installmanpages -+# dh_undocumented -+ dh_installchangelogs -+# dh_strip -+ dh_compress -+ dh_fixperms -+ dh_suidregister -+ 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 ---- axfont-4.4.1.orig/debian/README.Debian -+++ axfont-4.4.1/debian/README.Debian -@@ -0,0 +1,4 @@ -+Note that the truetype fonts have been removed from this package because -+they cause applix to crash for some reason. -+ -+-- Joey Hess diff --git a/patches/axlang_4.4.1-13.diff b/patches/axlang_4.4.1-13.diff deleted file mode 100644 index 55983d7..0000000 --- a/patches/axlang_4.4.1-13.diff +++ /dev/null @@ -1,107 +0,0 @@ ---- axlang-4.4.1.orig/debian/changelog -+++ axlang-4.4.1/debian/changelog -@@ -0,0 +1,9 @@ -+axlang (4.4.1-14) unstable; urgency=low -+ -+ * Converted from RPM binary format to debian -+ -+ -- Joey Hess Wed, 7 Apr 1999 21:55:48 -0700 -+ -+Local variables: -+mode: debian-changelog -+End: ---- axlang-4.4.1.orig/debian/control -+++ axlang-4.4.1/debian/control -@@ -0,0 +1,11 @@ -+Source: axlang -+Section: alien -+Priority: extra -+Maintainer: Joey Hess -+ -+Package: axlang -+Architecture: i386 -+Depends: ${shlibs:Depends} -+Description: Thesaurus and spell-checker for ApplixWare Office -+ This package contains the spell-checker as well as a thesaurus for -+ ApplixWare Office for Linux. ---- axlang-4.4.1.orig/debian/copyright -+++ axlang-4.4.1/debian/copyright -@@ -0,0 +1,22 @@ -+This package was debianized by the alien program by converting -+a binary RPM Package on Wed, 7 Apr 1999 21:55:48 -0700. -+ -+Copyright: 1990-1998 Applix, Inc. -+ -+Information from the binary Package: -+Name : axlang Distribution: SuSE Linux 6.0-BETA (i386) -+Version : 4.4.1 Vendor: SuSE GmbH, Nuernberg, Germany -+Release : 13 Build Date: Tue Dec 1 01:36:41 1998 -+Install date: (not installed) Build Host: neumann.suse.de -+Group : unsorted Source RPM: axbase-4.4.1-13.src.rpm -+Size : 20793103 License: 1990-1998 Applix, Inc. -+Packager : feedback@suse.de -+Summary : Thesaurus and spell-checker for ApplixWare Office -+Description : -+This package contains the spell-checker as well as a thesaurus for -+ApplixWare Office for Linux. -+ -+Authors: -+-------- -+ Eric Ding -+ ---- axlang-4.4.1.orig/debian/rules -+++ axlang-4.4.1/debian/rules -@@ -0,0 +1,53 @@ -+#!/usr/bin/make -f -+# debian/rules that uses debhelper and alien -+# GNU copyright 1997 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+build: -+ dh_testdir -+ # Nothing to do. -+ -+clean: -+ 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 -+ install -d debian/tmp/usr/X11R6/lib/X11 -+ cp -a opt/* debian/tmp/usr/X11R6/lib/X11 -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installinit -+ dh_installcron -+# dh_installmanpages -+# dh_undocumented -+ dh_installchangelogs -+# dh_strip -+ dh_compress -+ dh_fixperms -+ dh_suidregister -+ 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 diff --git a/patches/xbf-i740-glibc_1.0.0-3.diff b/patches/xbf-i740-glibc_1.0.0-3.diff deleted file mode 100644 index 3c6ac9f..0000000 --- a/patches/xbf-i740-glibc_1.0.0-3.diff +++ /dev/null @@ -1,636 +0,0 @@ ---- xbf-i740-glibc-1.0.0.orig/usr/doc/XBF-i740-glibc-1.0.0/README.i740 -+++ xbf-i740-glibc-1.0.0/usr/doc/XBF-i740-glibc-1.0.0/README.i740 -@@ -0,0 +1,313 @@ -+ XBF_i740, Version 1.0.0, 21 December 1998 -+ -+ -+This FREE (see the license below) full featured X Server contains: -+ -+ * Full support for 8, 15, 16, 24 and 32 bit per pixel depths. -+ * Hardware cursor support to reduce sprite flicker. -+ * Hardware accelerated 2D drawing engine support for 8, 15, 16 and 24 -+ bit per pixel depths. -+ * Support for high resolution video modes up to 1600x1200. -+ * Support for doublescan video modes (e.g., 320x200 and 320x240). -+ * Support for gamma correction at all pixel depths. -+ * Fully programmable clock supported. -+ * Robust text mode restore for VT switching. -+ -+ -+Tested Video Cards -+ -+ * Real3D Starfighter AGP -+ * Diamond Stealth II/G460 AGP -+ -+Reported Working Video Cards: -+ -+ * 3DVision-i740 AGP -+ * ABIT G740 8MB SDRAM -+ * AGP 2D/3D V. 1N, AGP-740D -+ * ARISTO i740 AGP (ART-i740-G) -+ * ASUS AGP-V2740 -+ * Chaintech AGP-740D -+ * EliteGroup(ECS) 3DVision-i740 AGP -+ * EONtronics Picasso 740 -+ * EONtronics Van Gogh -+ * Everex MVGA i740/AG -+ * Flagpoint Shocker i740 8MB -+ * Gainward CardExpert 740 8MB -+ * Gigabyte Predator i740 8MB AGP -+ * Hercules Terminator 128 2X/i AGP -+ * Intel Express 3D AGP -+ * Jaton Video-740 AGP 3D -+ * Joymedia Apollo 7400 -+ * Leadtek Winfast S900 -+ * Machspeed Raptor i740 AGP 4600 -+ * Magic-Pro MP-740DVD -+ * MAXI Gamer AGP 8 MB -+ * Palit Daytona AGP740 -+ * QDI Amazing I -+ * Soyo AGP (SY-740 AGP) -+ * VideoExcel AGP 740 -+ * ViewTop ZeusL 8MB -+ * Winfast S900 i740 AGP 8MB -+ -+ -+CAUTION: Running this server on untested video cards poses a potential -+risk of damaging your video card and display. You assume all risks in -+using this X server on untested video cards; however, if you -+successfully run this server on a video card not listed here, we would -+like to hear from you. Please e-mail your video card make and model -+to us at "xbf_support@redhat.com". -+ -+Red Hat and Precision Insight, Inc. disclaim all warranties with -+regard to this X server. In no event shall Red Hat or Precision -+Insight, Inc. be liable for any damages whatsoever resulting from the -+use of this X server. -+ -+This commercial quality X Server has been tested with only the Real3D -+Starfighter AGP and the Diamond Stealth II/G460 AGP card at this time. -+ -+This Free server is distributed in binary form only to conform with -+the Non Disclosure Agreement required by Intel. If and when this non -+disclosure requirement is removed by Intel, all of the source code for -+this driver will be contributed to the XFree86 project. -+ -+ -+Download and Installation Instructions -+ -+Although you can place the downloaded .rpm file in any directory of -+your choosing, we suggest you ftp the file into the /tmp directory and -+then execute the appropriate RPM command from that directory to -+install the .rpm file. When the RPM command runs, it will -+automatically place the component files of the X Server into the -+correct locations in your system. -+ -+ -+Red Hat 5.x (glibc) systems:- -+ 1) get the file to your system -+ cd /tmp -+ ftp://ftp.redhat.com/pub/XBF/XBF-i740-glibc-1.0.0-1.i386.rpm -+ 2) install the files using RPM -+ rpm -ivh XBF-i740-glibc-1.0.0-1.i386.rpm -+ 3) after installing, run (as root): -+ ln -sf /usr/X11R6/bin/XBF_i740 /etc/X11/X -+ -+Red Hat 4.x (libc5 systems):- -+ 1) get the file to your system -+ cd /tmp -+ ftp://ftp.redhat.com/pub/XBF/XBF-i740-libc5-1.0.0-1.i386.rpm -+ 2) install the files using RPM -+ rpm -ivh XBF-i740-libc5-1.0.0-1.i386.rpm -+ 3) after installing, run (as root): -+ ln -sf /usr/X11R6/bin/XBF_i740 /etc/X11/X -+ chmod 4711 /usr/X11R6/bin/XBF_i740 -+ -+IMPORTANT NOTE: -+ -+After installing the X server, an XF86Config file needs to be set up -+for your computer. For Red Hat 4.x and 5.x systems, this file is in -+"/etc/X11/XF86Config". See the manual page for XF86Config for more -+information on how to properly setup this file for your computer. For -+a description of the supported device configuration options, see the -+README file included in this release. -+ -+To ease the setting up of the XF86Config file, a new "xf86config" -+program that has support for the XBF_i740 X server can be found in the -+same directory as the X server. To use this program: -+ -+Red Hat 5.x (glibc) systems:- -+ 1) get the file to your system -+ cd /tmp -+ ftp://ftp.redhat.com/pub/XBF/xf86config-glibc-1.0.0.i386.tgz -+ 2) install the files (as root): -+ cd / -+ tar xvzf /tmp/xf86config-glibc-1.0.0.i386.tgz -+ 3) run "xf86config" as root -+ -+ -+Red Hat 4.x (libc5 systems):- -+ 1) get the file to your system -+ cd /tmp -+ ftp://ftp.redhat.com/pub/XBF/xf86config-libc5-1.0.0.i386.tgz -+ 2) install the files (as root): -+ cd / -+ tar xvzf /tmp/xf86config-libc5-1.0.0.i386.tgz -+ 3) run "xf86config" as root -+ -+ -+Here are some hints as to how to use xf86config: -+ -+1) While running xf86config, you will need to answer several questions -+ about your mouse, monitor and video card. This information should -+ be found in the manuals that came with your system. -+ -+2) When you reach the section to choose a particular video card, -+ xf86config will ask you: -+ -+ Do you want to look at the card database? -+ -+ Answer, "yes" and choose the number of the video card that most -+ closely matches your system. The cards that have been tested or -+ have been reported to work (see above) are included in this list. -+ -+3) Next, xf86config will ask you: -+ -+ Which one of these screen types do you intend to run by default (1-5)? -+ -+ Answer, "5" since that is the one that corresponds to the card -+ definition you just choose (from hint #2, above). -+ -+4) Since you have already set the symbolic link (above), you do not -+ want xf86config to set it again, so answer "no" to this question. -+ -+5) No special RAMDAC is needed with the XBF_i740 X server, so when -+ xf86config asks you to choose a RAMDAC, you can enter "q" to safely -+ quit without selecting a RAMDAC. -+ -+6) No special Clockchip setting is required with the XBF_i740 X -+ server, so you can simply press Enter, when xf86config asks you -+ what Clockchip setting you want. -+ -+7) It is not necessary to probe the clocks with the XBF_i740 X server, -+ so you do not need to have xf86config run 'X -probeonly'. -+ -+8) For RedHat 4.x and RedHat 5.x systems, the XF86Config file should -+ be written to /etc/X11/XF86Config. For other systems, it should be -+ written to /etc/XF86Config. -+ -+ -+If you have any questions or problems with this X server: -+ -+PLEASE CHECK THE FAQ AT http://www.precisioninsight.com/faq.html BEFORE -+SENDING EMAIL TO THE SUPPORT EMAIL ADDRESS -+ -+If the FAQ does not help you solve the problem, you may send email to -+"xbf_support@redhat.com". Please do NOT send any email to XFree86 -+regarding this X server. -+ -+ -+Please note that this software is released under the XBF License below. -+ -+ -+ -+ -+End User License Agreement for the XBF X server ("Software") -+ -+ -+ -+I. PREAMBLE -+ -+ -+This License Agreement ("License") sets forth the terms and conditions -+under which Red Hat Software, Inc. grants you certain rights and -+licenses with respect to the Software. Please review this agreement -+carefully before you use the Software or install it on a computer. -+ -+ -+This License generally allows you to copy, sublicense and distribute -+the Software, subject to the following terms and conditions. However, -+nothing in this License grants you any right, license or interest with -+respect to the source code for the Software. -+ -+ -+ -+II. GRANT OF RIGHTS: -+ -+ -+A. The rights stated in this License are non-exclusive and are granted -+to you without fee. -+ -+ -+B. You may install and/or use the Software on as many computers as you -+wish at any time. -+ -+ -+C. You may copy, sublicense and distribute the Software in its entirety -+provided that you: -+ -+1. Conspicuously publish on each copy of the Software the appropriate -+copyright notice and the complete terms and conditions of this License; -+ -+2. Keep intact all notices that refer to this License and to the -+absence of any warranty; and -+ -+3. Give any other recipients and sublicensees of the Software a copy of -+this License along with the Software, and make it clear to any and all -+recipients and sublicensees that the terms and conditions of this -+License shall govern their use of the Software. -+ -+ -+D. You may, but are not required to, charge a fee to persons to whom -+you copy and redistribute the Software, and you may at your option -+offer warranty protection for a fee to any person to whom you -+distribute the Software. Each person or entity to whom you sublicense -+the Software must receive it under no more restrictive terms and -+conditions than set forth in this License. -+ -+ -+ -+III. YOU MAY NOT: -+ -+ -+A. Modify, decompile, reverse assemble or otherwise reverse engineer -+the Software, or create derivative works based on the Software, or -+authorize any third party to do any of the above; and -+ -+ -+B. Copy, sublicense, or distribute the Software except as expressly -+permitted in this License. Any attempt to copy, sublicense or -+distribute the Program in a manner inconsistent with this License is -+void, and will automatically terminate your rights under this License. -+ -+ -+ -+IV. TITLE -+ -+ -+The Software is protected by copyright and other laws. Title, -+ownership rights, and intellectual property rights in the Software -+shall remain with Red Hat Software, Inc. and/or its suppliers. You -+acknowledge these ownership and intellectual property rights, and agree -+not to take any action to jeopardize or infringe upon any of these -+rights with respect to the Software. The rights granted to you in this -+License do not include any interest in any intellectual property rights -+in the Software. -+ -+ -+ -+V. NO WARRANTY -+ -+ -+THERE IS NO WARRANTY FOR THE SOFTWARE, TO THE EXTENT PERMITTED BY -+APPLICABLE LAW. EXCEPT AS OTHERWISE STATED IN WRITING, THE SOFTWARE IS -+PROVIDED AND LICENSED "AS IS" WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+ -+VI. LIMITATION OF LIABILITY -+ -+ -+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL RED -+HAT SOFTWARE, INC. OR ITS SUPPLIERS BE LIABLE TO YOU FOR ANY DAMAGES, -+INCLUDING LOST PROFITS, LOST SAVINGS, OR OTHER INCIDENTAL OR -+CONSEQUENTIAL DAMAGES, ARISING OUT OF THE USE OR INABILITY TO USE THE -+SOFTWARE, EVEN IF RED HAT SOFTWARE, INC. OR A DEALER AUTHORIZED BY RED -+HAT SOFTWARE, INC. HAD BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -+ -+ -+ -+VII. GENERAL -+ -+ -+This License represents the complete agreement concerning the rights -+granted in this License, and may be amended only in a writing signed by -+both parties. If any provision of this Agreement is held to be -+unenforceable, the enforceability of the remaining provisions shall in -+no way be affected or impaired. This Agreement shall be governed by -+the laws of the United States. -+ -+ -+ -+ -+ -+Copyright © 1998 Red Hat Software, Inc. All rights reserved. ---- xbf-i740-glibc-1.0.0.orig/debian/changelog -+++ xbf-i740-glibc-1.0.0/debian/changelog -@@ -0,0 +1,19 @@ -+xbf-i740-glibc (1.0.0-3) unstable; urgency=low -+ -+ * Added README.i740 from redhat mirror to the doc directory -+ * debian/rules: Modified doc directory from XBF-i740-glibc-VERSION to xbf-i740-glibc -+ * Added [pre|post][inst|rm] shamelessly borrowed from xserver-svga -+ -+ -- Agustín Martín Domingo Thu, 15 Apr 1999 16:36:31 +0200 -+ -+xbf-i740-glibc (1.0.0-2) unstable; urgency=low -+ -+ * Converted from RPM binary format to debian -+ -+ -- Agustín Martín Domingo Thu, 15 Apr 1999 15:47:07 +0200 -+ -+ -+ -+Local variables: -+mode: debian-changelog -+End: ---- xbf-i740-glibc-1.0.0.orig/debian/control -+++ xbf-i740-glibc-1.0.0/debian/control -@@ -0,0 +1,16 @@ -+Source: xbf-i740-glibc -+Section: alien -+Priority: extra -+Maintainer: Agustín Martín Domingo -+ -+Package: xbf-i740-glibc -+Architecture: i386 -+Recommends: xf86config-i740g -+Provides: xserver -+Depends: ${shlibs:Depends} -+Description: Binary-only X server for i740 on glibc systems -+ X server for the Intel i740 base graphics cards. -+ . -+ Details on installing this server are available at -+ /usr/doc/xbf-i740-glibc (From ftp://ftp.redhat.com/pub/XBF/README.i740) -+ ---- xbf-i740-glibc-1.0.0.orig/debian/copyright -+++ xbf-i740-glibc-1.0.0/debian/copyright -@@ -0,0 +1,19 @@ -+This package was debianized by the alien program by converting -+a binary RPM Package on Thu, 15 Apr 1999 15:47:07 +0200. -+ -+Copyright: XBF -+ -+Information from the binary Package: -+Name : XBF-i740-glibc Distribution: (none) -+Version : 1.0.0 Vendor: (none) -+Release : 1 Build Date: Sun Dec 20 02:12:52 1998 -+Install date: (not installed) Build Host: audrey.kem.org -+Group : X11/XFree86/Servers Source RPM: XBF-i740-glibc-1.0.0-1.src.rpm -+Size : 2136768 -+Summary : Binary-only X server for i740 on glibc systems -+Description : -+X server for the Intel i740 base graphics cards. -+ -+Details on installing this server are available at -+ftp://ftp.redhat.com/pub/XBF/README.i740 -+ ---- xbf-i740-glibc-1.0.0.orig/debian/rules -+++ xbf-i740-glibc-1.0.0/debian/rules -@@ -0,0 +1,58 @@ -+#!/usr/bin/make -f -+# debian/rules that uses debhelper and alien -+# GNU copyright 1997 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+build: -+ dh_testdir -+ # Nothing to do. -+ -+clean: -+ 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 -+ install -d debian/tmp -+ cp -a `ls |grep -v debian` debian/tmp -+# -+# If you need to move files around in debian/tmp or do some -+# binary patching ... Insert it here -+# -+ ( cd `pwd`/debian/tmp/usr/doc ; mv XBF* xbf-i740-glibc ) -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installinit -+ dh_installcron -+ dh_installmanpages -+# dh_undocumented -+ dh_installchangelogs -+# dh_strip -+ dh_compress -+ dh_fixperms -+ dh_suidregister -+ 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 ---- xbf-i740-glibc-1.0.0.orig/debian/preinst -+++ xbf-i740-glibc-1.0.0/debian/preinst -@@ -0,0 +1,34 @@ -+#!/bin/sh -+# Debian xserver-xserver-i740 package pre-installation script -+# Modifications to the original xserver-svga preinst script -+# Copyright 1999 A. Martín. Licensed under the GNU GPL. -+# (Very) Mostly from -+# Debian xserver-svga package pre-installation script -+# Copyright 1998 Branden Robinson. Licensed under the GNU GPL. -+# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava. -+ -+set -e -+ -+trap "echo ;\ -+ echo 'Received signal. Aborting installation of xserver-xserver-i740 package.' ;\ -+ echo ;\ -+ exit 1" 1 2 3 15 -+ -+package=xbf-i740-glibc -+ -+case "$1" in -+ install) touch /etc/X11/newxserver.$package ;; -+ upgrade) ;; -+ abort-upgrade) exit 0 ;; -+ *) -+ echo "ERROR: xserver-xserver-i740 preinst called with unknown argument \"$1\"." -+ echo "Aborting installation of xserver-xserver-i740 package." -+ exit 1 ;; -+esac -+ -+# clean up a mess made in 3.3.2.2-4 -+if [ "$2" = "3.3.2.2-4" ]; then -+ rm -f /etc/X11/newxserver.[0-9A-Z]* -+fi -+ -+exit ---- xbf-i740-glibc-1.0.0.orig/debian/postinst -+++ xbf-i740-glibc-1.0.0/debian/postinst -@@ -0,0 +1,119 @@ -+#!/bin/sh -+# Debian xserver-xserver-i740 package post-installation script -+# Modifications to the original xserver-svga preinst script -+# Copyright 1999 A. Martín. Licensed under the GNU GPL. -+# (Very) Mostly from -+# Debian xserver-svga package post-installation script -+# Copyright 1998 Branden Robinson. Licensed under the GNU GPL. -+# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava. -+ -+set -e -+ -+package=xbf-i740-glibc -+xserver=i740 -+serverbin=XBF_i740 -+ -+cleanup () { -+ # unroll changes in xserver-i740 preinst -+ for file in /etc/X11/newxserver.$package; do -+ if [ -e $file ]; then -+ rm $file -+ fi -+ done; -+} -+ -+trap "echo ;\ -+ echo 'Received signal. Aborting configuration of xserver-i740 package.' ;\ -+ echo -n 'Cleaning up...' ;\ -+ cleanup ;\ -+ echo 'done.' ;\ -+ echo ;\ -+ exit 1" 1 2 3 15 -+ -+case "$1" in -+ configure) ;; -+ abort-upgrade|abort-remove|abort-deconfigure) -+ cleanup -+ exit 0 ;; -+ *) -+ echo "ERROR: xserver-i740 postinst called with unknown argument \"$1\"." -+ echo "Aborting configuration of xserver-i740 package." -+ echo -n "Cleaning up..." -+ cleanup -+ echo "done." -+ exit 1 ;; -+esac -+ -+# I know there is redundant logic in some of the following, I'll rewrite it -+# pretty someday -+ -+# while I'm at it, switch to string variables instead of numeric ones -+ -+fixname=0 -+prompt=0 -+oldxserverpresent=0 -+oldxserver=`head -1 /etc/X11/Xserver` -+servername=`echo $oldxserver | sed 's/X11R6\/bin/bin\/X11/'` -+if [ -x $oldxserver ]; then -+ oldxserverpresent=1 -+fi -+if [ $oldxserverpresent = 1 ]; then -+ # case 1: we're just upgrading the existing server -+ if [ "$oldxserver" = "/usr/bin/X11/$serverbin" ]; then -+ prompt=0 -+ # case 2: we're just upgrading, but need to canonicalize the pathname -+ elif [ "$servername" = "/usr/bin/X11/$serverbin" ]; then -+ fixname=1 -+ # case 3: we're installing a new X server -+ elif [ -e /etc/X11/newxserver.$package ]; then -+ rm /etc/X11/newxserver.$package -+ prompt=1 -+ $condecho -+ echo "Current default X server $oldxserver found." -+ echo -n "Do you want to make $xserver the default instead? (y/n) [n] " -+ default=n -+ # case 4: we're upgrading an alternative X server already installed -+ else -+ prompt=0 -+ fi -+else # old server not present -+ prompt=1 -+ $condecho -+ echo -n "No default X server previously set, or previous default has been " -+ echo "removed." -+ echo -n "Do you want to make the $xserver X server the default? (y/n) [y] " -+ default=y -+fi -+ -+if [ $prompt = 1 ]; then -+ condecho=echo -+ read input -+ case "$input" in -+ Y|y) input=y ;; -+ N|n) input=n ;; -+ '') input=$default ;; -+ *) -+ echo "'$input' not understood. Using default of '$default'." -+ input=$default -+ ;; -+ esac -+fi -+ -+if [ "$input" = "y" -o $fixname = 1 ]; then -+ mv /etc/X11/Xserver /etc/X11/Xserver.debian.$$ -+ sed -e "1s/^.*$/\\/usr\\/bin\\/X11\\/$serverbin/" \ -+ /etc/X11/Xserver.debian.$$ > /etc/X11/Xserver -+ rm /etc/X11/Xserver.debian.$$ -+ if [ $fixname = 0 ]; then -+ $condecho -+ echo "The $xserver X server is now the default." -+ condecho=echo -+ fi -+fi -+ -+# invoke xserver-configure -+if [ -x /usr/sbin/xserver-configure ]; then -+ . /usr/sbin/xserver-configure -+fi -+ -+exit ---- xbf-i740-glibc-1.0.0.orig/debian/postrm -+++ xbf-i740-glibc-1.0.0/debian/postrm -@@ -0,0 +1,34 @@ -+#!/bin/sh -+# Debian xserver-xserver-i740 package post-removal script -+# Modifications to the original xserver-svga postrm script -+# Copyright 1999 A. Martín. Licensed under the GNU GPL. -+# (Very) Mostly from -+# Debian xserver-svga package post-removal script -+# Copyright 1998 Branden Robinson. Licensed under the GNU GPL. -+# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava. -+ -+set -e -+ -+package=xbf-i740-glibc -+serverbin=XBF_i740 -+ -+trap "echo ;\ -+ echo 'Received signal. Aborting removal of xserver-xserver-i740 package.' ;\ -+ echo ;\ -+ exit 1" 1 2 3 15 -+ -+case "$1" in -+ remove) ;; -+ purge) ;; -+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) exit 0 ;; -+ *) -+ echo "ERROR: xserver-xserver-i740 postrm called with unknown argument \"$1\"." -+ echo "Aborting removal of xserver-xserver-i740 package." -+ exit 1 ;; -+esac -+ -+sed "1s:/usr/bin/X11/$serverbin:/usr/bin/X11/XF86_NONE:" /etc/X11/Xserver > \ -+ /etc/X11/Xserver.debian.$$ -+mv /etc/X11/Xserver.debian.$$ /etc/X11/Xserver -+ -+exit diff --git a/patches/xf86config-glibc_1.0.0.i386-3.diff b/patches/xf86config-glibc_1.0.0.i386-3.diff deleted file mode 100644 index ca4be60..0000000 --- a/patches/xf86config-glibc_1.0.0.i386-3.diff +++ /dev/null @@ -1,296 +0,0 @@ ---- xf86config-glibc-1.0.0.i386.orig/debian/changelog -+++ xf86config-glibc-1.0.0.i386/debian/changelog -@@ -0,0 +1,30 @@ -+xf86config-glibc (1.0.0.i386-3) unstable; urgency=low -+ -+ * postrm: Old diversions code moved to preinst -+ * preinst: Force the user to remove previous package if is (1.0.0.i386-1) -+ -+ -- Agustín Martín Domingo Wed, 5 May 1999 15:03:25 +0200 -+ -+xf86config-glibc (1.0.0.i386-2) unstable; urgency=low -+ -+ * Changed section from unknown to alien -+ * Cards: renamed to Ci740 to avoid diversion -+ * xf86config: patched to look for Ci740 and renamed to xf86config-i740 -+ * Added xf86config wrapper script to warn about xf86config diversion -+ * postrm: Cleared old diversions if existing and renamed the remaining -+ to xf86config.xfree86 -+ * preinst: removed diversion of Cards and renamed that of xf86config -+ to xf86conig.xfree86 -+ -+ -- Agustín Martín Domingo Wed, 5 May 1999 12:00:06 +0200 -+ -+xf86config-glibc (1.0.0.i386-1) unstable; urgency=low -+ -+ * Added preinst and postrm for xf86config and Card files diversion -+ * Converted from Slackware .tgz binary format to debian -+ -+ -- Agustín Martín Domingo Thu, 15 Apr 1999 15:47:14 +0200 -+ -+Local variables: -+mode: debian-changelog -+End: ---- xf86config-glibc-1.0.0.i386.orig/debian/control -+++ xf86config-glibc-1.0.0.i386/debian/control -@@ -0,0 +1,14 @@ -+Source: xf86config-glibc -+Section: alien -+Priority: extra -+Maintainer: Agustín Martín Domingo -+ -+Package: xf86config-i740g -+Architecture: any -+Depends: ${shlibs:Depends}, xbf-i740-glibc -+Description: xf86config for XBF-i740 binary-only X server -+ xf86 configuration tool for the binary-only XBF-i740 X server -+ for Intel i740 chipset based graphic cards -+ . -+ Diverts the XFree86 xf86config to xf86config.xfree86 -+ ---- xf86config-glibc-1.0.0.i386.orig/debian/copyright -+++ xf86config-glibc-1.0.0.i386/debian/copyright -@@ -0,0 +1,4 @@ -+This package was debianized by the alien program by converting -+a binary Slackware tgz Package on Thu, 15 Apr 1999 15:47:14 +0200. -+ -+Copyright: Unknown ---- xf86config-glibc-1.0.0.i386.orig/debian/rules -+++ xf86config-glibc-1.0.0.i386/debian/rules -@@ -0,0 +1,64 @@ -+#!/usr/bin/make -f -+# debian/rules that uses debhelper and alien -+# GNU copyright 1997 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+build: -+ dh_testdir -+ # Nothing to do. -+ -+clean: -+ 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 -+ install -d debian/tmp -+ cp -a `ls |grep -v debian` debian/tmp -+# -+# If you need to move files around in debian/tmp or do some -+# binary patching ... Insert it here -+# -+# Patching the binary to look for /usr/X11R6/lib/X11/Ci740 instead of -+# /usr/X11R6/lib/X11/Cards -+ ( cd debian/tmp/usr/X11R6/bin ; sed 's/\/X11\/Cards/\/X11\/Ci740/g' xf86config > xf86config-i740 ; chmod +x xf86config-i740 ; rm xf86config ) -+# Renaming /usr/X11R6/lib/X11/Cards to /usr/X11R6/lib/X11/Ci740 -+ ( cd debian/tmp/usr/X11R6/lib/X11/ ; mv Cards Ci740 ) -+ ( install debian/xf86config debian/tmp/usr/X11R6/bin/xf86config ) -+# -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installinit -+ dh_installcron -+ dh_installmanpages -+# dh_undocumented -+ dh_installchangelogs -+# dh_strip -+ dh_compress -+ dh_fixperms -+ dh_suidregister -+ 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 ---- xf86config-glibc-1.0.0.i386.orig/debian/preinst -+++ xf86config-glibc-1.0.0.i386/debian/preinst -@@ -0,0 +1,30 @@ -+#!/bin/sh -e -+ -+# Fixing some previous mess -+ -+if [ upgrade = "$1" ]; then -+ if [ -e /usr/X11R6/lib/X11/Ci740 -a -e /usr/X11R6/bin/xf86config-i740 ]; then -+ echo "OK, preserving old diversions" -+ else -+ echo "--------------------------------------------------------------" -+ echo " /usr/X11R6/lib/X11/Ci740 or /usr/X11R6/bin/xf86config-i740" -+ echo "do not exist." -+ echo "That means you are upgrading xf86config-i740g_1.0.0.i386-1.deb" -+ echo "" -+ echo " Due to changes in the diversions YOU HAVE FIRST TO REMOVE" -+ echo " PREVIOUS PACKAGE with dpkg -r xf86config-i740g" -+ echo "--------------------------------------------------------------" -+ exit 1 -+ fi -+fi -+ -+if [ install = "$1" ]; then -+ dpkg-divert --package xf86config-i740g --add --rename \ -+ --divert /usr/X11R6/bin/xf86config.xfree86 /usr/X11R6/bin/xf86config -+fi -+ -+ -+ -+ -+ -+ ---- xf86config-glibc-1.0.0.i386.orig/debian/patch-xf86config -+++ xf86config-glibc-1.0.0.i386/debian/patch-xf86config -@@ -0,0 +1 @@ -+sed 's/\/X11\/Cards/\/X11\/Ci740/g' xf86config > xf86config-i740 ---- xf86config-glibc-1.0.0.i386.orig/debian/postrm -+++ xf86config-glibc-1.0.0.i386/debian/postrm -@@ -0,0 +1,9 @@ -+#!/bin/sh -e -+ -+ -+# Now the real diversion -+ -+if [ remove = "$1" ]; then -+ dpkg-divert --package xf86config-i740g --remove --rename \ -+ --divert /usr/X11R6/bin/xf86config.xfree86 /usr/X11R6/bin/xf86config -+fi ---- xf86config-glibc-1.0.0.i386.orig/debian/preinst.0 -+++ xf86config-glibc-1.0.0.i386/debian/preinst.0 -@@ -0,0 +1,32 @@ -+#!/bin/sh -e -+ -+# Fixing some previous mess -+ -+if [ upgrade = "$1" ]; then -+ if [ -e /usr/X11R6/lib/X11/Ci740 ]; then -+ echo "OK, preserving old diversions" -+ else -+ echo "Removing obsolete diversion of Cards to Cards.dpkg-old" -+ rm /usr/X11R6/lib/X11/Cards -+ dpkg-divert --package xf86config-i740g --remove --rename \ -+ --divert /usr/X11R6/lib/X11/Cards.dpkg-old /usr/X11R6/lib/X11/Cards -+ fi -+ -+ if [ -x /usr/X11R6/bin/xf86config-i740 ]; then -+ echo "OK, preserving old diversions" -+ else -+ echo "Removing obsolete diversion of xf86config to xf86config.dpkg-old" -+ rm /usr/X11R6/bin/xf86config -+ dpkg-divert --package xf86config-i740g --remove --rename \ -+ --divert /usr/X11R6/bin/xf86config.dpkg-old /usr/X11R6/bin/xf86config -+ dpkg-divert --package xf86config-i740g --add --rename \ -+ --divert /usr/X11R6/bin/xf86config.xfree86 /usr/X11R6/bin/xf86config -+ fi -+fi -+ -+if [ install = "$1" ]; then -+ dpkg-divert --package xf86config-i740g --add --rename \ -+ --divert /usr/X11R6/bin/xf86config.xfree86 /usr/X11R6/bin/xf86config -+fi -+ -+ ---- xf86config-glibc-1.0.0.i386.orig/debian/xf86config -+++ xf86config-glibc-1.0.0.i386/debian/xf86config -@@ -0,0 +1,60 @@ -+#!/bin/sh -+ -+# A wrapper to warn about the diversion of xf86config -+ -+ -+message="\ -+This is a wrapper script to remind you that you are using the -+xf86config-i740 script provided by RedHat when XBF-i740 was a -+binary-only server. The original XFree86 xf86config has been -+diverted to xf86config.xfree86 by the package xfree86-i740g. -+ -+Since Intel has released the i740 specs to the XFree team, there -+will probably be native support for this card in the next XFree86 -+release (XFree86 4), and this script will only be valid if you want -+to configure the binary-only XBF-i740 server, with the Card database -+probably outdated. -+ -+For any other use you will need to use the script -+xf86config.xfree86 or XF86Setup. -+" -+warning_msg="WARNING!" -+ -+if [ "$LANG" ]; then -+ LINGUA=`echo $LANG | sed -e 's/_.*//'` -+ if [ "$LINGUA" = "es" ]; then -+message="\ -+Este es un script filtro para recordar que se está utilizando el -+script xf86config-i740 suministrado por RedHat cuando XBF-i740 era -+un servidor sólo-binario. El xf86config original de las XFree86 -+ha sido redirigido a xf86config.xfree86 por el paquete xfree86-i740g. -+ -+Ya que Intel ha suministrado las especificaciones de las i740 al equipo -+de las XFree, probablemente haya soporte nativo para esta tarjeta en la -+siguiente edición de las XFree86 (XFree86 4), y este script tendrá -+sentido únicamente para configurar el servidor sólo-binario XBF-i740, -+con la base de datos de tarjetas i740 posiblemente anticuada. -+ -+Para cualquier otro uso será necesario utilizar -+xf86config.xfree86 o XF86Setup -+" -+warning_msg="ˇATENCIÓN!" -+ fi -+fi -+ -+if [ -x /usr/bin/whiptail ]; then -+ whiptail --clear --title "$warning_msg" --msgbox "$message" 0 0 -+ echo "Using whiptail" -+elif [ -x /usr/bin/dialog ]; then -+ dialog --clear --title "$warning_msg" --msgbox "$message" 0 0 -+ echo "Using dialog" -+else -+ echo $warning_msg -+ echo "---------------------------------" -+ echo $message | fmt -+ echo "---------------------------------" -+ echo "Press enter to continue" -+ read reply -+fi -+ -+xf86config-i740 ---- xf86config-glibc-1.0.0.i386.orig/debian/preinst.pruebas -+++ xf86config-glibc-1.0.0.i386/debian/preinst.pruebas -@@ -0,0 +1,22 @@ -+#!/bin/sh -e -+ -+action="$1" -+divext="dpkg-old" -+ -+default_divert () -+{ -+if [ install = "$action" -o ! -e "$1" ]; then -+ dpkg-divert --package $package --add --rename \ -+ --divert $1.$divext $1 -+fi -+} -+ -+default_divert /usr/X11R6/bin/xf86config -+default_divert /usr/X11R6/lib/X11/Cards -+ -+#if [ install = "$1" ]; then -+# dpkg-divert --package xf86config-i740g --add --rename \ -+# --divert /usr/X11R6/bin/xf86config.dpkg-old /usr/X11R6/bin/xf86config -+# dpkg-divert --package xf86config-i740g --add --rename \ -+# --divert /usr/X11R6/lib/X11/Cards.dpkg-old /usr/X11R6/lib/X11/Cards -+#fi