* debian updates

base/Makefile

@@ -187,7 +187,7 @@ compiler_all: rtl_all
 	$(MAKE) -C $(COMPILERDIR) all
 
 compiler_clean:
-	$(MAKE) -C $(COMPILERDIR) clean
+	$(MAKE) -C $(COMPILERDIR) distclean
 
 compiler_install:
 	$(MAKE) -C $(COMPILERDIR) install
@@ -443,7 +443,10 @@ utilszip: utils_clean rtl_clean
 
 #
 # $Log$
-# Revision 1.17  1999-06-08 18:28:11  peter
+# Revision 1.18  1999-06-08 22:11:26  peter
+#   * debian updates
+#
+# Revision 1.17  1999/06/08 18:28:11  peter
 #   * fixes for 0.99.12 release
 #
 # Revision 1.16  1999/05/16 02:37:29  peter

compiler/Makefile

@@ -231,7 +231,7 @@ execlean :
 	-$(DEL) $(EXENAME)
 
 distclean: clean
-	-$(DEL) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3)
+	-$(DEL) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC)
 
 
 #####################################################################
@@ -395,7 +395,10 @@ $(M68KEXENAME): $(PASFILES) $(INCFILES)
 
 #
 # $Log$
-# Revision 1.32  1999-06-08 18:28:12  peter
+# Revision 1.33  1999-06-08 22:11:27  peter
+#   * debian updates
+#
+# Revision 1.32  1999/06/08 18:28:12  peter
 #   * fixes for 0.99.12 release
 #
 # Revision 1.31  1999/05/19 11:44:13  pierre

docs/Makefile

@@ -25,8 +25,12 @@
 HTML = user units ref prog
 
 # Where do you want the html files to be put ?
+ifndef PREFIXINSTALLDIR
+PREFIXINSTALLDIR=/usr
+endif
+
 ifndef DOCINSTALLDIR
-DOCINSTALLDIR=/usr/doc/fpc-0.99.12
+DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc-0.99.12
 endif 
 
 #
@@ -398,7 +402,10 @@ linuxexamples: examples
 
 #
 # $Log$
-# Revision 1.25  1999-06-08 18:28:13  peter
+# Revision 1.26  1999-06-08 22:11:28  peter
+#   * debian updates
+#
+# Revision 1.25  1999/06/08 18:28:13  peter
 #   * fixes for 0.99.12 release
 #
 # Revision 1.24  1999/06/03 00:06:42  peter

install/debian/changelog

@@ -1,8 +1,8 @@
-fpc (0.99.11-1) unstable; urgency=low
+fpc (0.99.12-1) unstable; urgency=low
 
   * Initial Release.
 
- -- Peter Vreman <pfv@cooldown.demon.nl>  Tue, 12 May 1999 12:00:00 +0200
+ -- Peter Vreman <pfv@cooldown.demon.nl>  Thu, 10 Jun 1999 12:00:00 +0200
 
 fpc (0.99.10-1) unstable; urgency=low
 

install/debian/control

@@ -6,7 +6,8 @@ Standards-Version: 2.5.1.0
 
 Package: fp-compiler
 Architecture: i386
-Depends: fp-rtl (= 0.99.11-1)
+Depends: fp-rtl (= 0.99.12-1)
+Recommends: fp-docs (= 0.99.12-1)
 Suggests: fp-utils
 Replaces: fpc
 Description: Free Pascal Compiler
@@ -20,14 +21,14 @@ Description: Free Pascal Compiler
  
 Package: fp-rtl
 Architecture: i386
-Recommends: fp-compiler (= 0.99.11-1)
+Recommends: fp-compiler (= 0.99.12-1)
 Replaces: fpc
 Description: Free Pascal Runtime Library
  Runtime Libraries for the Free Pascal Compiler.
  
 Package: fp-utils
 Architecture: i386
-Recommends: fp-compiler (= 0.99.11-1)
+Recommends: fp-compiler (= 0.99.12-1)
 Replaces: fpc
 Description: Free Pascal Utils
  This package contains some handy utils for usage with the Free Pascal
@@ -38,27 +39,50 @@ Description: Free Pascal Utils
    - ppudump : Dump the information stored in a .ppu (unit) file
    - ppumove : Place multiple units in a shared library
 
+Package: fp-docs
+Architecture: all
+Recommends: fp-docs (= 0.99.12-1)
+Replaces: fpc
+Description: Free Pascal Documentation
+ Documentation for the Free Pascal Compiler.
+  
 Package: fp-fcl
 Architecture: i386
-Depends: fp-compiler (= 0.99.11-1), fp-rtl (= 0.99.11-1)
+Depends: fp-compiler (= 0.99.12-1), fp-rtl (= 0.99.12-1)
 Description: Free Pascal Free Component Library
  Free Component Library for the Free Pascal Compiler.
  
 Package: fp-gtk
 Architecture: i386
-Depends: fp-compiler (= 0.99.11-1), fp-rtl (= 0.99.11-1)
+Depends: fp-compiler (= 0.99.12-1), fp-rtl (= 0.99.12-1)
 Description: Free Pascal GTK Bindings
  GTK 1.2.x bindings for the Free Pascal Compiler.
  
 Package: fp-api
 Architecture: i386
-Depends: fp-compiler (= 0.99.11-1), fp-rtl (= 0.99.11-1)
+Depends: fp-compiler (= 0.99.12-1), fp-rtl (= 0.99.12-1)
 Description: Free Pascal API Units
  API Units needed by Free Vision.
  
 Package: fp-fv
 Architecture: i386
-Depends: fp-compiler (= 0.99.11-1), fp-rtl (= 0.99.11-1), fp-api (= 0.99.11-1)
+Depends: fp-compiler (= 0.99.12-1), fp-rtl (= 0.99.12-1), fp-api (= 0.99.12-1)
 Description: Free Pascal Free Vision
  Free Turbo Vision clone for the Free Pascal Compiler.
  
+Package: fp-extra
+Architecture: i386
+Depends: fp-compiler (= 0.99.12-1), fp-rtl (= 0.99.12-1)
+Description: Free Pascal Extra Packages
+ Some different packages for the Free Pascal Compiler
+ Bindings to libraries:
+ - MySql bindings
+ - InterBase bindings
+ - Postgres bindings
+ - Ncurses bindings
+ - Forms 0.88/0.86 bindings
+ - Svgalib bindings
+ Other units:
+ - Inet unit for easier tcp/ip handling
+ - Uncgi unit
+ - Utmp unit

install/debian/fp-compiler.files

@@ -1,3 +1,8 @@
-usr/lib/fpc/0.99.11/ppc386
+/usr/lib/fpc/0.99.12/ppc386
-usr/lib/fpc/0.99.11/samplecfg
+/usr/lib/fpc/0.99.12/samplecfg
-usr/lib/fpc/0.99.11/msg
+/usr/lib/fpc/0.99.12/msg
+/usr/lib/fpc/0.99.12/Makefile
+/usr/lib/fpc/0.99.12/makefile.fpc
+/usr/man/man1/ppc386.1
+/usr/man/man5/ppc386.cfg.5
+

install/debian/fp-compiler.postinst

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-FPCDIR=/usr/lib/fpc/0.99.11
+FPCDIR=/usr/lib/fpc/0.99.12
 
 # create link
 ln -sf $FPCDIR/ppc386 /usr/bin/ppc386
@@ -12,4 +12,4 @@ GCCDIR=`dirname $GCCSPEC`
 $FPCDIR/samplecfg $FPCDIR $GCCDIR
 
 # update ld.so cache
-ldconfig
+# ldconfig

install/debian/fp-docs.doc-base

@@ -0,0 +1,10 @@
+Document: fpc-docs
+Title: Free Pascal Documentation
+Author: Michael van Canneyt
+Abstract: Documentation for the Free Pascal Compiler.
+ .
+Section: Development
+
+Format: HTML
+Index: /usr/doc/fp-docs/fpctoc.html
+Files: /usr/doc/fp-docs/*.html

install/debian/fp-docs.docs

@@ -0,0 +1,6 @@
+debian/tmp/usr/doc/fpc/0.99.12/user/
+debian/tmp/usr/doc/fpc/0.99.12/prog/
+debian/tmp/usr/doc/fpc/0.99.12/ref/
+debian/tmp/usr/doc/fpc/0.99.12/units/
+debian/tmp/usr/doc/fpc/0.99.12/buttons/
+debian/tmp/usr/doc/fpc/0.99.12/fpctoc.html

install/debian/fp-rtl.files

@@ -1 +1 @@
-usr/lib/fpc/0.99.11/rtl
+/usr/lib/fpc/0.99.12/rtl

install/debian/fp-utils.files

@@ -1,5 +1,8 @@
-usr/bin/ppudump
+/usr/bin/ppudump
-usr/bin/ppumove
+/usr/bin/ppumove
-usr/bin/ppdep
+/usr/bin/ppdep
-usr/bin/h2pas
+/usr/bin/h2pas
-usr/bin/ptop
+/usr/bin/ptop
+/usr/man/man1/ptop.1
+/usr/man/man1/ppudump.1
+/usr/man/man5/ptop.cfg.5

install/debian/rules

@@ -14,8 +14,12 @@ NEWPP=$(PWD)/compiler/ppc386
 
 #export DH_VERBOSE=1
 
-build: build-stamp
+###################
-build-stamp:
+# Binary
+#
+
+buildbin: buildbin-stamp
+buildbin-stamp:
 	@echo "--- Building"
 	dh_testdir
 
@@ -27,15 +31,16 @@ build-stamp:
 	$(MAKE) gtk_all PP=$(NEWPP)
 	$(MAKE) api_all PP=$(NEWPP)
 	$(MAKE) fv_all PP=$(NEWPP)
+	$(MAKE) -C packages all PP=$(NEWPP) RELEASE=1
 	
-	touch build-stamp
+	touch buildbin-stamp
 
-clean:
+cleanbin:
 	@echo "--- Cleaning"
 	dh_testdir
 	dh_testroot
 
-	rm -f build-stamp install-stamp
+	rm -f buildbin-stamp installbin-stamp
 	rm -rf ${BUILD_DIR}
 	
 	$(MAKE) compiler_clean
@@ -46,11 +51,12 @@ clean:
 	$(MAKE) gtk_clean
 	$(MAKE) api_clean
 	$(MAKE) fv_clean
+	$(MAKE) -C packages clean
 
 	dh_clean
 
-install: install-stamp
+installbin: installbin-stamp
-install-stamp: build
+installbin-stamp: buildbin
 	@echo "--- Installing"
 	dh_testdir
 	dh_testroot
@@ -61,26 +67,107 @@ install-stamp: build
 	$(MAKE) rtl_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
 	$(MAKE) utils_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
 
+	$(MAKE) base_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
+	$(MAKE) man_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
+	$(MAKE) demo_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
+
 	$(MAKE) fcl_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
 	$(MAKE) gtk_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
 	$(MAKE) api_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
 	$(MAKE) fv_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
+	$(MAKE) -C packages install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
 	
-	touch install-stamp
+	touch installbin-stamp
 
-binary-indep:
+###################
-# We have nothing to do by default.
+# Documentation
+#
 
-binary-arch: install \
+builddoc: builddoc-stamp
-	fp-compiler \
+builddoc-stamp:
+	@echo "--- Building Documentation"
+	dh_testdir
+
+	$(MAKE) -C docs html
+
+	touch builddoc-stamp
+
+installdoc: installdoc-stamp
+installdoc-stamp: builddoc
+	@echo "--- Installing Documentation"
+	dh_testdir
+	dh_testroot
+	dh_clean
+
+	$(MAKE) -C docs install DOCINSTALLDIR=${INSTALL_DIR}/usr/doc/fpc/0.99.12/
+	
+	touch installdoc-stamp
+
+cleandoc:
+	@echo "--- Cleaning Documentation"
+	dh_testdir
+	dh_testroot
+
+	rm -f builddoc-stamp installdoc-stamp
+	rm -rf ${BUILD_DIR}
+
+	$(MAKE) -C docs clean
+
+###################
+# Generic
+#
+
+build: buildbin builddoc
+
+install: installbin installdoc
+
+clean: cleanbin cleandoc
+
+
+###################
+# Deb building
+#
+
+binary-indep: fp-docs \
+
+binary-arch: fp-compiler \
 	fp-rtl \
 	fp-utils \
 	fp-fcl \
 	fp-gtk \
 	fp-api \
-	fp-fv
+	fp-fv \
+	fp-extra
 
-fp-compiler:
+fp-compiler: installbin
+	@echo "--- Building: $@"
+	dh_installdocs		-p$@ -P$(BUILD_DIR)/$@
+	dh_installchangelogs	-p$@ -P$(BUILD_DIR)/$@
+	dh_installexamples	-p$@ -P$(BUILD_DIR)/$@
+	dh_movefiles		-p$@ -P$(BUILD_DIR)/$@
+	dh_compress		-p$@ -P$(BUILD_DIR)/$@
+	dh_fixperms		-p$@ -P$(BUILD_DIR)/$@
+	dh_installdeb	 	-p$@ -P$(BUILD_DIR)/$@
+#	dh_shlibdeps	 	-p$@ -P$(BUILD_DIR)/$@
+	dh_gencontrol	 	-p$@ -P$(BUILD_DIR)/$@
+	dh_md5sums		-p$@ -P$(BUILD_DIR)/$@
+	dh_builddeb		-p$@ -P$(BUILD_DIR)/$@
+
+fp-utils: installbin
+	@echo "--- Building: $@"
+	dh_installdocs		-p$@ -P$(BUILD_DIR)/$@
+	dh_installchangelogs	-p$@ -P$(BUILD_DIR)/$@
+	dh_undocumented		-p$@ -P$(BUILD_DIR)/$@ h2pas.1 ppumove.1 ppdep.1
+	dh_movefiles		-p$@ -P$(BUILD_DIR)/$@
+	dh_compress		-p$@ -P$(BUILD_DIR)/$@
+	dh_fixperms		-p$@ -P$(BUILD_DIR)/$@
+	dh_installdeb	 	-p$@ -P$(BUILD_DIR)/$@
+#	dh_shlibdeps	 	-p$@ -P$(BUILD_DIR)/$@
+	dh_gencontrol	 	-p$@ -P$(BUILD_DIR)/$@
+	dh_md5sums		-p$@ -P$(BUILD_DIR)/$@
+	dh_builddeb		-p$@ -P$(BUILD_DIR)/$@
+
+fp-rtl fp-fcl fp-gtk fp-fv fp-api fp-extra: installbin
 	@echo "--- Building: $@"
 	dh_installdocs		-p$@ -P$(BUILD_DIR)/$@
 	dh_installchangelogs	-p$@ -P$(BUILD_DIR)/$@
@@ -93,7 +180,7 @@ fp-compiler:
 	dh_md5sums		-p$@ -P$(BUILD_DIR)/$@
 	dh_builddeb		-p$@ -P$(BUILD_DIR)/$@
 
-fp-rtl fp-utils fp-fcl fp-gtk fp-fv fp-api:
+fp-docs: installdoc
 	@echo "--- Building: $@"
 	dh_installdocs		-p$@ -P$(BUILD_DIR)/$@
 	dh_installchangelogs 	-p$@ -P$(BUILD_DIR)/$@
@@ -101,7 +188,6 @@ fp-rtl fp-utils fp-fcl fp-gtk fp-fv fp-api:
 	dh_compress		-p$@ -P$(BUILD_DIR)/$@
 	dh_fixperms		-p$@ -P$(BUILD_DIR)/$@
 	dh_installdeb	 	-p$@ -P$(BUILD_DIR)/$@
-#	dh_shlibdeps	 	-p$@ -P$(BUILD_DIR)/$@
 	dh_gencontrol	 	-p$@ -P$(BUILD_DIR)/$@
 	dh_md5sums		-p$@ -P$(BUILD_DIR)/$@
 	dh_builddeb		-p$@ -P$(BUILD_DIR)/$@

install/man/Makefile

@@ -2,6 +2,14 @@
 # Man page installation for linux
 #
 
+ifndef PREFIXINSTALLDIR
+PREFIXINSTALLDIR=/usr
+endif
+
+MANINSTALLDIR=$(PREFIXINSTALLDIR)/man
+
 installman:
-	cp *.1 /usr/man/man1
+	install -d -m 755 $(MANINSTALLDIR)/man1
-	cp *.5 /usr/man/man5
+	install -d -m 755 $(MANINSTALLDIR)/man5
+	install -m 644 *.1 $(MANINSTALLDIR)/man1
+	install -m 644 *.5 $(MANINSTALLDIR)/man5