From 6bf27d1c7a01b91cdc16719162ba2ce6f2e006c6 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 4 Aug 2000 21:50:37 +0000 Subject: [PATCH] * merges from fixes branch --- install/debian/changelog | 2 +- install/debian/control | 24 +++++++++---------- install/debian/fixdeb | 2 +- install/debian/fp-compiler.conffiles | 1 + install/debian/fp-compiler.files.in | 1 + install/debian/fp-compiler.postinst.in | 3 --- install/debian/fp-compiler.postrm.in | 9 +++++++ install/debian/fp-units-misc.files.in | 1 - install/debian/rules | 5 +++- install/{fpc-1.00.spec => fpc-1.0.1.spec} | 6 ++--- ...fpc-docs-1.00.spec => fpc-docs-1.0.1.spec} | 6 ++--- install/makepack | 5 ++-- 12 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 install/debian/fp-compiler.conffiles create mode 100644 install/debian/fp-compiler.postrm.in rename install/{fpc-1.00.spec => fpc-1.0.1.spec} (97%) rename install/{fpc-docs-1.00.spec => fpc-docs-1.0.1.spec} (92%) diff --git a/install/debian/changelog b/install/debian/changelog index 26ef49035d..86774d8248 100644 --- a/install/debian/changelog +++ b/install/debian/changelog @@ -1,4 +1,4 @@ -fpc (1.00-0) unstable; urgency=low +fpc (1.0.1-0) unstable; urgency=low * New Upstream Release diff --git a/install/debian/control b/install/debian/control index 0b24b7abae..5f29aaefea 100644 --- a/install/debian/control +++ b/install/debian/control @@ -7,8 +7,8 @@ Standards-Version: 3.1.1 Package: fp-compiler Architecture: i386 -Depends: fp-units-rtl (= 0.99.15-0) -Suggests: fp-utils, fp-docs (>= 0.99.15) +Depends: fp-units-rtl (= 1.0.1-0) +Suggests: fp-utils, fp-docs (>= 1.0.1) Replaces: fpc Description: Free Pascal Compiler The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit @@ -21,7 +21,7 @@ Description: Free Pascal Compiler Package: fp-utils Architecture: i386 -Recommends: fp-compiler (= 0.99.15-0) +Recommends: fp-compiler (= 1.0.1-0) Replaces: fpc Description: Free Pascal Utils This package contains some handy utils for usage with the Free Pascal @@ -45,14 +45,14 @@ Description: Free Pascal Documentation Package: fp-units-rtl Architecture: i386 -Recommends: fp-compiler (= 0.99.15-0) +Recommends: fp-compiler (= 1.0.1-0) Replaces: fpc, fp-rtl Description: Free Pascal Runtime Library Runtime Libraries for the Free Pascal Compiler. Package: fp-units-base Architecture: i386 -Depends: fp-units-rtl (= 0.99.15-0) +Depends: fp-units-rtl (= 1.0.1-0) Description: Free Pascal base units Free Pascal units for common libraries, some of these units are also required by the Free Component Library : @@ -62,28 +62,28 @@ Description: Free Pascal base units Package: fp-units-fcl Architecture: i386 -Depends: fp-units-rtl (= 0.99.15-0), fp-units-base (= 0.99.15-0) +Depends: fp-units-rtl (= 1.0.1-0), fp-units-base (= 1.0.1-0) Replaces: fp-fcl Description: Free Pascal Free Component Library Free Component Library for the Free Pascal Compiler. Package: fp-units-api Architecture: i386 -Depends: fp-units-rtl (= 0.99.15-0) +Depends: fp-units-rtl (= 1.0.1-0) Replaces: fp-api Description: Free Pascal API units Free Pascal units for console keyboard,mouse,video and file handling. Package: fp-units-gtk Architecture: i386 -Depends: fp-units-rtl (= 0.99.15-0) +Depends: fp-units-rtl (= 1.0.1-0) Replaces: fp-gtk Description: Free Pascal units for GTK 1.2.x Free Pascal units and examples to create programs with GTK 1.2.x Package: fp-units-db Architecture: i386 -Depends: fp-units-rtl (= 0.99.15-0) +Depends: fp-units-rtl (= 1.0.1-0) Description: Free Pascal units for some database libraries Free Pascal units with bindings for: - Mysql @@ -92,7 +92,7 @@ Description: Free Pascal units for some database libraries Package: fp-units-gfx Architecture: i386 -Depends: fp-units-rtl (= 0.99.15-0), fp-units-base (= 0.99.15-0) +Depends: fp-units-rtl (= 1.0.1-0), fp-units-base (= 1.0.1-0) Description: Free Pascal units for some graphics libraries Free Pascal units with bindings for: - Forms 0.88 @@ -102,7 +102,7 @@ Description: Free Pascal units for some graphics libraries Package: fp-units-net Architecture: i386 -Depends: fp-units-rtl (= 0.99.15-0) +Depends: fp-units-rtl (= 1.0.1-0) Description: Free Pascal units for networking Free Pascal units for creating network tools: - Inet unit for easier tcp/ip handling @@ -110,7 +110,7 @@ Description: Free Pascal units for networking Package: fp-units-misc Architecture: i386 -Depends: fp-units-rtl (= 0.99.15-0) +Depends: fp-units-rtl (= 1.0.1-0) Description: Free Pascal miscellaneous units Free Pascal miscellaneous units for: - Utmp diff --git a/install/debian/fixdeb b/install/debian/fixdeb index e92d98edcb..eefc335905 100644 --- a/install/debian/fixdeb +++ b/install/debian/fixdeb @@ -1,6 +1,6 @@ #!/bin/bash # -# Create debian files from *.in files. +# Create debian files from *.in files # # $1 = path to debian files # diff --git a/install/debian/fp-compiler.conffiles b/install/debian/fp-compiler.conffiles new file mode 100644 index 0000000000..d5ee34382a --- /dev/null +++ b/install/debian/fp-compiler.conffiles @@ -0,0 +1 @@ +/etc/ppc386.cfg diff --git a/install/debian/fp-compiler.files.in b/install/debian/fp-compiler.files.in index 3ecab54734..3c458698bf 100644 --- a/install/debian/fp-compiler.files.in +++ b/install/debian/fp-compiler.files.in @@ -1,3 +1,4 @@ +/etc/ppc386.cfg /usr/lib/fpc/%{fpcversion}/ppc386 /usr/lib/fpc/%{fpcversion}/samplecfg /usr/lib/fpc/%{fpcversion}/msg diff --git a/install/debian/fp-compiler.postinst.in b/install/debian/fp-compiler.postinst.in index 2db6841a0a..56fdbed018 100644 --- a/install/debian/fp-compiler.postinst.in +++ b/install/debian/fp-compiler.postinst.in @@ -5,8 +5,5 @@ FPCDIR=/usr/lib/fpc/%{fpcversion} # create link ln -sf $FPCDIR/ppc386 /usr/bin/ppc386 -# create /etc/ppc386.cfg -$FPCDIR/samplecfg $FPCDIR - # Debhelper code #DEBHELPER# diff --git a/install/debian/fp-compiler.postrm.in b/install/debian/fp-compiler.postrm.in new file mode 100644 index 0000000000..9b4f68c7d5 --- /dev/null +++ b/install/debian/fp-compiler.postrm.in @@ -0,0 +1,9 @@ +#! /bin/sh + +FPCDIR=/usr/lib/fpc/%{fpcversion} + +# remove link +rm -f /usr/bin/ppc386 + +# Debhelper code +#DEBHELPER# diff --git a/install/debian/fp-units-misc.files.in b/install/debian/fp-units-misc.files.in index ad2c67f26f..8cd484dd27 100644 --- a/install/debian/fp-units-misc.files.in +++ b/install/debian/fp-units-misc.files.in @@ -20,7 +20,6 @@ /usr/lib/fpc/%{fpcversion}/units/linux/libgdbcon.a /usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.o -/usr/lib/fpc/%{fpcversion}/units/linux/libgdbint.a /usr/lib/fpc/%{fpcversion}/units/linux/gdbint.o /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.ppu diff --git a/install/debian/rules b/install/debian/rules index 4e6dd7b920..0ea787e206 100644 --- a/install/debian/rules +++ b/install/debian/rules @@ -36,7 +36,7 @@ clean: rm -f build-indep-stamp install-indep-stamp rm -f debian-files-stamp - rm -f debian/*.files debian/*.docs debian/*.examples debian/*.postinst + rm -f debian/*.files debian/*.docs debian/*.examples debian/*.postinst debian/*.postrm $(MAKE) compiler_distclean $(MAKE) rtl_distclean @@ -113,6 +113,9 @@ install-arch-stamp: build-arch-stamp debian-files-stamp $(MAKE) demo_install $(INSTALLOPTS) DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fp-compiler $(MAKE) doc_install $(INSTALLOPTS) DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fp-compiler +# Create ppc386.cfg which is included as conffile + chmod 755 compiler/utils/samplecfg + compiler/utils/samplecfg /usr/lib/fpc/$(FPCVERSION) $(INSTALL_DIR)/etc touch install-arch-stamp diff --git a/install/fpc-1.00.spec b/install/fpc-1.0.1.spec similarity index 97% rename from install/fpc-1.00.spec rename to install/fpc-1.0.1.spec index 1015160c1e..a13718b19b 100644 --- a/install/fpc-1.00.spec +++ b/install/fpc-1.0.1.spec @@ -1,15 +1,15 @@ Name: fpc -Version: 1.00 +Version: 1.0.1 Release: 1 ExclusiveArch: i386 Copyright: GPL Group: Development/Languages -Source: fpc-1.00-src.tar.gz +Source: fpc-1.0.1-src.tar.gz Summary: Free Pascal Compiler Packager: Peter Vreman (peter@freepascal.org) URL: http://www.freepascal.org/ -%define fpcversion 1.00 +%define fpcversion 1.0.1 %define fpcdir /usr/lib/fpc/%{fpcversion} %define docdir /usr/doc/fpc-%{fpcversion} diff --git a/install/fpc-docs-1.00.spec b/install/fpc-docs-1.0.1.spec similarity index 92% rename from install/fpc-docs-1.00.spec rename to install/fpc-docs-1.0.1.spec index 26606660d1..c0256fd78a 100644 --- a/install/fpc-docs-1.00.spec +++ b/install/fpc-docs-1.0.1.spec @@ -1,15 +1,15 @@ Name: fpc-docs -Version: 1.00 +Version: 1.0.1 Release: 1 ExclusiveArch: i386 Copyright: GPL Group: Development/Languages -Source: fpc-docs-1.00-src.tar.gz +Source: fpc-docs-1.0.1-src.tar.gz Summary: Free Pascal Compiler Documentation Packager: Peter Vreman (peter@freepascal.org) URL: http://www.freepascal.org/ -%define fpcversion 1.00 +%define fpcversion 1.0.1 %define fpcdir /usr/lib/fpc/%{fpcversion} %define docdir /usr/doc/fpc-%{fpcversion} diff --git a/install/makepack b/install/makepack index b1aad735d2..8675ad563c 100644 --- a/install/makepack +++ b/install/makepack @@ -13,8 +13,9 @@ unset FPCDIR # Goto the toplevel if necessary [ -d install ] || cd .. -make linux -make source +make linuxzip +make sourcezip +make docsrc make docs make demo