* merges from fixes branch

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
 

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

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
 #

install/debian/fp-compiler.conffiles

@@ -0,0 +1 @@
+/etc/ppc386.cfg

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

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#

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#

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 

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
 
 

install/fpc-1.00.spec → 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 ([email protected])
 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}
 

install/fpc-docs-1.00.spec → 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 ([email protected])
 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}
 

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