* updates

install/debian/changelog

@@ -1,3 +1,10 @@
+fpc (0.99.13.19990730-1) unstable; urgency=low
+
+  * New maintainer
+  * Updated to policy 3.0.1
+
+ -- Joseph Carter <[email protected]>  Tue, 27 Jul 1999 18:05:05 -0700
+
 fpc (0.99.12b-1) unstable; urgency=low
 
   * New Upstream Release

install/debian/control

@@ -1,8 +1,8 @@
 Source: fpc
 Section: devel
 Priority: optional
-Maintainer: Peter Vreman <[email protected]>
-Standards-Version: 2.5.1.0
+Maintainer: Joseph Carter <[email protected]>
+Standards-Version: 3.0.1
 
 Package: fp-compiler
 Architecture: i386

install/debian/fixdeb

@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Create debian files from *.in files.
+#
+# Supported are .files.in, .docs.in, control.in
+# 
+# $1 = path
+# $2 = version
+#
+if [ $# != 2 ]; then
+  echo 'Usage : fixdeb path version'
+  exit 1
+fi
+
+#
+# .files.in
+#
+for i in $1/*.files.in
+do
+  j=${i/.files.in/.files}
+  sed -e s/'#FPCVERSION#'/$2/ $i > $j
+done
+
+#
+# .docs.in
+#
+for i in $1/*.docs.in
+do
+  j=${i/.docs.in/.docs}
+  sed -e s/'#FPCVERSION#'/$2/ $i > $j
+done

install/debian/fp-compiler.examples.in

@@ -0,0 +1,18 @@
+demo/Makefile
+demo/blackbox.pp
+demo/eratos.pp
+demo/fpctris.pp
+demo/fpctris.txt
+demo/gameunit.pp
+demo/hello.pp
+demo/lines.pp
+demo/magic.pp
+demo/mandel.pp
+demo/qsort.pp
+demo/samegame.pp
+demo/win32
+demo/win32/winhello.pp
+demo/win32/dlltest.pp
+demo/win32/testdll.pp
+demo/win32/menu.pp
+

install/debian/fp-docs.docs

@@ -1,4 +0,0 @@
-debian/tmp/usr/doc/fpc/0.99.12/user.pdf
-debian/tmp/usr/doc/fpc/0.99.12/prog.pdf
-debian/tmp/usr/doc/fpc/0.99.12/ref.pdf
-debian/tmp/usr/doc/fpc/0.99.12/units.pdf

install/debian/fp-docs.docs.in

@@ -0,0 +1,4 @@
+debian/tmp/usr/doc/fpc/#FPCVERSION#/user.pdf
+debian/tmp/usr/doc/fpc/#FPCVERSION#/prog.pdf
+debian/tmp/usr/doc/fpc/#FPCVERSION#/ref.pdf
+debian/tmp/usr/doc/fpc/#FPCVERSION#/units.pdf

install/debian/fp-extra.files

@@ -1,30 +0,0 @@
-/usr/lib/fpc/0.99.12/units/linux/ibase.ppu
-/usr/lib/fpc/0.99.12/units/linux/ibase.o
-/usr/lib/fpc/0.99.12/units/linux/mysql_com.ppu
-/usr/lib/fpc/0.99.12/units/linux/mysql_version.ppu
-/usr/lib/fpc/0.99.12/units/linux/mysql.ppu
-/usr/lib/fpc/0.99.12/units/linux/mysql_com.o
-/usr/lib/fpc/0.99.12/units/linux/mysql_version.o
-/usr/lib/fpc/0.99.12/units/linux/mysql.o
-/usr/lib/fpc/0.99.12/units/linux/uncgi.ppu
-/usr/lib/fpc/0.99.12/units/linux/uncgi.o
-/usr/lib/fpc/0.99.12/units/linux/utmp.ppu
-/usr/lib/fpc/0.99.12/units/linux/utmp.o
-/usr/lib/fpc/0.99.12/units/linux/inet.ppu
-/usr/lib/fpc/0.99.12/units/linux/inet.o
-/usr/lib/fpc/0.99.12/units/linux/dllist.ppu
-/usr/lib/fpc/0.99.12/units/linux/postgres.ppu
-/usr/lib/fpc/0.99.12/units/linux/dllist.o
-/usr/lib/fpc/0.99.12/units/linux/postgres.o
-/usr/lib/fpc/0.99.12/units/linux/ncurses.ppu
-/usr/lib/fpc/0.99.12/units/linux/ncurses.o
-/usr/lib/fpc/0.99.12/units/linux/x.ppu
-/usr/lib/fpc/0.99.12/units/linux/xresource.ppu
-/usr/lib/fpc/0.99.12/units/linux/xlib.ppu
-/usr/lib/fpc/0.99.12/units/linux/xutil.ppu
-/usr/lib/fpc/0.99.12/units/linux/forms.ppu
-/usr/lib/fpc/0.99.12/units/linux/xlib.o
-/usr/lib/fpc/0.99.12/units/linux/forms.o
-/usr/lib/fpc/0.99.12/units/linux/svgalib.ppu
-/usr/lib/fpc/0.99.12/units/linux/vgamouse.ppu
-/usr/lib/fpc/0.99.12/units/linux/svgalib.o

install/debian/fp-extra.files.in

@@ -0,0 +1,30 @@
+/usr/lib/fpc/#FPCVERSION#/units/linux/ibase.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/ibase.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/mysql_com.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/mysql_version.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/mysql.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/mysql_com.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/mysql_version.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/mysql.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/uncgi.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/uncgi.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/utmp.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/utmp.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/inet.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/inet.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/dllist.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/postgres.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/dllist.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/postgres.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/ncurses.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/ncurses.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/x.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/xresource.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/xlib.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/xutil.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/forms.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/xlib.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/forms.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/svgalib.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/vgamouse.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/svgalib.o

install/debian/fp-fcl.files

@@ -1,16 +0,0 @@
-/usr/lib/fpc/0.99.12/units/linux/classes.o
-/usr/lib/fpc/0.99.12/units/linux/classes.ppu
-/usr/lib/fpc/0.99.12/units/linux/dom.o
-/usr/lib/fpc/0.99.12/units/linux/dom.ppu
-/usr/lib/fpc/0.99.12/units/linux/ezcgi.o
-/usr/lib/fpc/0.99.12/units/linux/ezcgi.ppu
-/usr/lib/fpc/0.99.12/units/linux/inifiles.o
-/usr/lib/fpc/0.99.12/units/linux/inifiles.ppu
-/usr/lib/fpc/0.99.12/units/linux/pipes.o
-/usr/lib/fpc/0.99.12/units/linux/pipes.ppu
-/usr/lib/fpc/0.99.12/units/linux/xmlcfg.o
-/usr/lib/fpc/0.99.12/units/linux/xmlcfg.ppu
-/usr/lib/fpc/0.99.12/units/linux/xmlread.o
-/usr/lib/fpc/0.99.12/units/linux/xmlread.ppu
-/usr/lib/fpc/0.99.12/units/linux/xmlwrite.o
-/usr/lib/fpc/0.99.12/units/linux/xmlwrite.ppu

install/debian/fp-fcl.files.in

@@ -0,0 +1,16 @@
+/usr/lib/fpc/#FPCVERSION#/units/linux/classes.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/classes.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/dom.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/dom.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/ezcgi.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/ezcgi.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/inifiles.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/inifiles.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/pipes.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/pipes.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/xmlcfg.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/xmlcfg.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/xmlread.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/xmlread.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/xmlwrite.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/xmlwrite.ppu

install/debian/fp-fv.files

@@ -1,54 +0,0 @@
-/usr/lib/fpc/0.99.12/units/linux/validate.ppu 
-/usr/lib/fpc/0.99.12/units/linux/history.ppu 
-/usr/lib/fpc/0.99.12/units/linux/commands.ppu 
-/usr/lib/fpc/0.99.12/units/linux/drivers.ppu 
-/usr/lib/fpc/0.99.12/units/linux/helpctx.ppu 
-/usr/lib/fpc/0.99.12/units/linux/memory.ppu 
-/usr/lib/fpc/0.99.12/units/linux/objtypes.ppu 
-/usr/lib/fpc/0.99.12/units/linux/views.ppu 
-/usr/lib/fpc/0.99.12/units/linux/resource.ppu 
-/usr/lib/fpc/0.99.12/units/linux/msgbox.ppu 
-/usr/lib/fpc/0.99.12/units/linux/dialogs.ppu 
-/usr/lib/fpc/0.99.12/units/linux/menus.ppu 
-/usr/lib/fpc/0.99.12/units/linux/app.ppu 
-/usr/lib/fpc/0.99.12/units/linux/histlist.ppu 
-/usr/lib/fpc/0.99.12/units/linux/colortxt.ppu 
-/usr/lib/fpc/0.99.12/units/linux/gadgets.ppu 
-/usr/lib/fpc/0.99.12/units/linux/colorsel.ppu 
-/usr/lib/fpc/0.99.12/units/linux/inplong.ppu 
-/usr/lib/fpc/0.99.12/units/linux/stddlg.ppu 
-/usr/lib/fpc/0.99.12/units/linux/mousedlg.ppu 
-/usr/lib/fpc/0.99.12/units/linux/outline.ppu 
-/usr/lib/fpc/0.99.12/units/linux/textview.ppu 
-/usr/lib/fpc/0.99.12/units/linux/calc.ppu 
-/usr/lib/fpc/0.99.12/units/linux/asciitab.ppu 
-/usr/lib/fpc/0.99.12/units/linux/calendar.ppu 
-/usr/lib/fpc/0.99.12/units/linux/helpfile.ppu 
-/usr/lib/fpc/0.99.12/units/linux/editors.ppu
-/usr/lib/fpc/0.99.12/units/linux/tabs.ppu
-
-/usr/lib/fpc/0.99.12/units/linux/validate.o 
-/usr/lib/fpc/0.99.12/units/linux/drivers.o 
-/usr/lib/fpc/0.99.12/units/linux/helpctx.o 
-/usr/lib/fpc/0.99.12/units/linux/memory.o 
-/usr/lib/fpc/0.99.12/units/linux/views.o 
-/usr/lib/fpc/0.99.12/units/linux/resource.o 
-/usr/lib/fpc/0.99.12/units/linux/msgbox.o 
-/usr/lib/fpc/0.99.12/units/linux/dialogs.o 
-/usr/lib/fpc/0.99.12/units/linux/menus.o 
-/usr/lib/fpc/0.99.12/units/linux/app.o 
-/usr/lib/fpc/0.99.12/units/linux/histlist.o 
-/usr/lib/fpc/0.99.12/units/linux/colortxt.o 
-/usr/lib/fpc/0.99.12/units/linux/gadgets.o 
-/usr/lib/fpc/0.99.12/units/linux/colorsel.o 
-/usr/lib/fpc/0.99.12/units/linux/inplong.o 
-/usr/lib/fpc/0.99.12/units/linux/stddlg.o 
-/usr/lib/fpc/0.99.12/units/linux/mousedlg.o 
-/usr/lib/fpc/0.99.12/units/linux/outline.o 
-/usr/lib/fpc/0.99.12/units/linux/textview.o 
-/usr/lib/fpc/0.99.12/units/linux/calc.o 
-/usr/lib/fpc/0.99.12/units/linux/asciitab.o 
-/usr/lib/fpc/0.99.12/units/linux/calendar.o 
-/usr/lib/fpc/0.99.12/units/linux/helpfile.o 
-/usr/lib/fpc/0.99.12/units/linux/editors.o
-/usr/lib/fpc/0.99.12/units/linux/tabs.o

install/debian/fp-fv.files.in

@@ -0,0 +1,54 @@
+/usr/lib/fpc/#FPCVERSION#/units/linux/validate.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/history.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/commands.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/drivers.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/helpctx.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/memory.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/objtypes.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/views.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/resource.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/msgbox.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/dialogs.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/menus.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/app.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/histlist.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/colortxt.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/gadgets.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/colorsel.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/inplong.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/stddlg.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/mousedlg.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/outline.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/textview.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/calc.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/asciitab.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/calendar.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/helpfile.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/editors.ppu
+/usr/lib/fpc/#FPCVERSION#/units/linux/tabs.ppu
+
+/usr/lib/fpc/#FPCVERSION#/units/linux/validate.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/drivers.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/helpctx.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/memory.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/views.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/resource.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/msgbox.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/dialogs.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/menus.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/app.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/histlist.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/colortxt.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/gadgets.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/colorsel.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/inplong.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/stddlg.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/mousedlg.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/outline.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/textview.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/calc.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/asciitab.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/calendar.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/helpfile.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/editors.o
+/usr/lib/fpc/#FPCVERSION#/units/linux/tabs.o

install/debian/fp-gtk.examples.in

@@ -0,0 +1,9 @@
+gtk/examples/ttt_test.pp
+gtk/examples/notebook.pp
+gtk/examples/entry.pp
+gtk/examples/tictactoe.pp
+gtk/examples/pixmap.pp
+gtk/examples/clist.pp
+gtk/examples/list.pp
+gtk/examples/scribble-simple.pp
+gtk/examples/editform.pp

install/debian/fp-gtk.files

@@ -1,9 +0,0 @@
-
-/usr/lib/fpc/0.99.12/units/linux/glib.ppu 
-/usr/lib/fpc/0.99.12/units/linux/gmodule.ppu 
-/usr/lib/fpc/0.99.12/units/linux/gdk.ppu 
-/usr/lib/fpc/0.99.12/units/linux/gtk.ppu
-
-/usr/lib/fpc/0.99.12/units/linux/glib.o 
-/usr/lib/fpc/0.99.12/units/linux/gdk.o 
-/usr/lib/fpc/0.99.12/units/linux/gtk.o

install/debian/fp-gtk.files.in

@@ -0,0 +1,9 @@
+
+/usr/lib/fpc/#FPCVERSION#/units/linux/glib.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/gmodule.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/gdk.ppu 
+/usr/lib/fpc/#FPCVERSION#/units/linux/gtk.ppu
+
+/usr/lib/fpc/#FPCVERSION#/units/linux/glib.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/gdk.o 
+/usr/lib/fpc/#FPCVERSION#/units/linux/gtk.o

install/debian/fp-rtl.files

@@ -1 +0,0 @@
-/usr/lib/fpc/0.99.12/rtl

install/debian/fp-rtl.files.in

@@ -0,0 +1 @@
+/usr/lib/fpc/#FPCVERSION#/rtl

install/debian/fp-utils.undocumented

@@ -0,0 +1 @@
+h2pas.1

install/debian/rules

@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules for Free Pascal 0.99.12 
+# debian/rules for Free Pascal
 
 # Don't load the system makefile.fpc
 export FPCMAKE=
@@ -8,56 +8,79 @@ export FPCDIR=
 # Get current dir
 PWD=$(shell pwd)
 
-INSTALL_VERSION=0.99.12
+# Documentation type to use pdf/html
+DOCTYPE=pdf
+
+INSTALL_VERSION=$(shell cat base/VERSION)
 BUILD_DIR=$(PWD)/debian/build
 INSTALL_DIR=$(PWD)/debian/tmp
 NEWPP=$(PWD)/compiler/ppc386
 
 #export DH_VERBOSE=1
 
+
 ###################
-# Binary
+# Clean
 #
 
-buildbin: buildbin-stamp
-buildbin-stamp:
-	@echo "--- Building"
-	dh_testdir
-
-# First make a new Compiler and RTL using a make cycle
-	$(MAKE) compiler_cycle
-	$(MAKE) utils_all PP=$(NEWPP)
-
-	$(MAKE) fcl_all PP=$(NEWPP)
-	$(MAKE) gtk_all PP=$(NEWPP)
-	$(MAKE) api_all PP=$(NEWPP)
-	$(MAKE) fv_all PP=$(NEWPP)
-	$(MAKE) -C packages all PP=$(NEWPP) RELEASE=1
-	
-	touch buildbin-stamp
-
-cleanbin:
+clean:
 	@echo "--- Cleaning"
 	dh_testdir
 	dh_testroot
-
-	rm -f buildbin-stamp installbin-stamp
-	rm -rf $(BUILD_DIR)
+	rm -f build-arch-stamp install-arch-stamp
+	rm -f build-indep-stamp install-indep-stamp
+	
+	rm -f debian-files-stamp
+	rm -f debian/*.files debian/*.docs
 	
 	$(MAKE) compiler_clean
 	$(MAKE) rtl_clean
 	$(MAKE) utils_clean
-
 	$(MAKE) fcl_clean
 	$(MAKE) gtk_clean
 	$(MAKE) api_clean
 	$(MAKE) fv_clean
 	$(MAKE) -C packages clean
+	$(MAKE) -C docs clean
 
 	dh_clean
 
-installbin: installbin-stamp
-installbin-stamp: buildbin
+###################
+# Debian files
+#
+
+debian-files: debian-files-stamp
+debian-files-stamp:    
+	@echo "--- Creating debian files"
+	debian/fixdeb debian $(INSTALL_VERSION)
+
+	touch debian-files-stamp
+
+
+###################
+# Arch packages
+#
+
+build-arch: build-arch-stamp
+build-arch-stamp:
+	@echo "--- Building"
+	dh_testdir
+
+# First make a new Compiler and RTL using a make cycle
+	$(MAKE) compiler_cycle
+	$(MAKE) utils_all PP=$(NEWPP)
+
+	$(MAKE) fcl_all PP=$(NEWPP)
+	$(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-arch-stamp
+
+
+install-arch: install-arch-stamp
+install-arch-stamp: build-arch
 	@echo "--- Installing"
 	dh_testdir
 	dh_testroot
@@ -78,124 +101,81 @@ installbin-stamp: buildbin
 	$(MAKE) fv_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
 	$(MAKE) -C packages install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
 	
-	touch installbin-stamp
+	touch install-arch-stamp
 
 ###################
 # Documentation
 #
 
-builddoc: builddoc-stamp
-builddoc-stamp:
+build-indep: build-indep-stamp
+build-indep-stamp:
 	@echo "--- Building Documentation"
 	dh_testdir
 
-	$(MAKE) -C docs pdf
+	$(MAKE) -C docs $(DOCTYPE)
 
-	touch builddoc-stamp
+	touch build-indep-stamp
 
-installdoc: installdoc-stamp
-installdoc-stamp: builddoc
+install-indep: install-indep-stamp
+install-indep-stamp: build-indep
 	@echo "--- Installing Documentation"
 	dh_testdir
 	dh_testroot
 	dh_clean
 
-	$(MAKE) -C docs pdfinstall DOCINSTALLDIR=$(INSTALL_DIR)/usr/doc/fpc/$(INSTALL_VERSION)/
+	$(MAKE) -C docs $(DOCTYPE)install DOCINSTALLDIR=$(INSTALL_DIR)/usr/doc/fpc/$(INSTALL_VERSION)/
 	
-	touch installdoc-stamp
+	touch install-indep-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
+build: build-arch build-indep
 
-install: installbin installdoc
+install: install-arch install-indep
 
-clean: cleanbin cleandoc
+binary: binary-indep binary-arch
 
 
 ###################
 # Deb building
 #
 
-binary-indep: fp-docs \
-
-binary-arch: fp-compiler \
-	fp-rtl \
-	fp-utils \
-	fp-fcl \
-	fp-gtk \
-	fp-api \
-	fp-fv \
-	fp-extra
-
-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
-	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)/$@
-	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-docs: installdoc
-	@echo "--- Building: $@"
-	dh_installdocs		-p$@ -P$(BUILD_DIR)/$@
-	dh_installchangelogs 	-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_gencontrol	 	-p$@ -P$(BUILD_DIR)/$@
-	dh_md5sums		-p$@ -P$(BUILD_DIR)/$@
-	dh_builddeb		-p$@ -P$(BUILD_DIR)/$@
-
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+binary-indep: build-indep install-indep debian-files
+	@echo "--- Building: arch-indep packages"
+	dh_testversion 2
+	dh_testdir
+	dh_testroot
+	dh_installdocs -i
+	dh_installchangelogs -i
+	dh_movefiles -i
+	dh_compress -i -X.pdf
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: build-arch install-arch debian-files
+	@echo "--- Building: arch packages"
+	dh_testversion 2
+	dh_testdir
+	dh_testroot
+	dh_installdocs -a
+	dh_installchangelogs -a
+	dh_undocumented -a
+	dh_installexamples -a
+	dh_movefiles -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+#	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
 
 binary: binary-indep binary-arch  
 .PHONY: build clean binary-indep binary-arch binary