* fp-units-rtl instead of fp-rtl

  * fp-units-base instead of fp-units-linux

install/debian/control

@@ -7,7 +7,7 @@ Standards-Version: 3.1.1
 
 Package: fp-compiler
 Architecture: i386
-Depends: fp-rtl (= 0.99.13-19991013-4)
+Depends: fp-units-rtl (= 0.99.13-19991013-4)
 Suggests: fp-utils, fp-docs (>= 0.99.13)
 Replaces: fpc
 Description: Free Pascal Compiler
@@ -19,13 +19,6 @@ Description: Free Pascal Compiler
  the commandline compiler. You need at least the RTL package before you
  can start compiling anything.
 
-Package: fp-rtl
-Architecture: i386
-Recommends: fp-compiler (= 0.99.13-19991013-4)
-Replaces: fpc
-Description: Free Pascal Runtime Library
- Runtime Libraries for the Free Pascal Compiler.
-
 Package: fp-utils
 Architecture: i386
 Recommends: fp-compiler (= 0.99.13-19991013-4)
@@ -33,13 +26,15 @@ Replaces: fpc
 Description: Free Pascal Utils
  This package contains some handy utils for usage with the Free Pascal
  Compiler:
-   - ppumove   Place multiple units in a shared library
-   - ppufiles  Show needed files for units
-   - ppudump   Dump the information stored in a .ppu (unit) file
-   - fpcmake   Create Makefile from Makefile.fpc
-   - h2pas     Convert .h files to pascal units
-   - ppdep     Create a dependency file which can be used with Makefiles
-   - ptop      Source beautifier
+   - ppumove     Place multiple units in a shared library
+   - ppufiles    Show needed files for units
+   - ppudump     Dump the information stored in a .ppu (unit) file
+   - fpcmake     Create Makefile from Makefile.fpc
+   - h2pas       Convert .h files to pascal units
+   - ppdep       Create a dependency file which can be used with Makefiles
+   - ptop        Source beautifier
+   - data2inc    Convert binary/text data to include files
+   - plex/pyacc  Pascal Lex/Yacc implementation
 
 Package: fp-docs
 Architecture: all
@@ -48,27 +43,47 @@ Description: Free Pascal Documentation
  Documentation for the Free Pascal Compiler. The documentation is
  only available in PDF format.
 
+Package: fp-units-rtl
+Architecture: i386
+Recommends: fp-compiler (= 0.99.13-19991013-4)
+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.13-19991013-4)
+Description: Free Pascal base units
+ Free Pascal units for common libraries, some of these units are also
+ required by the Free Component Library :
+  - X11 (Xlib, Xutil)
+  - NCurses
+  - ZLib
+  
 Package: fp-units-fcl
 Architecture: i386
-Depends: fp-compiler (= 0.99.13-19991013-4), fp-rtl (= 0.99.13-19991013-4), fp-units-linux (= 0.99.13-19991013-4)
+Depends: fp-units-rtl (= 0.99.13-19991013-4), fp-units-base (= 0.99.13-19991013-4)
+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-compiler (= 0.99.13-19991013-4), fp-rtl (= 0.99.13-19991013-4)
-Description: Free Pascal API Units
+Depends: fp-units-rtl (= 0.99.13-19991013-4)
+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-compiler (= 0.99.13-19991013-4), fp-rtl (= 0.99.13-19991013-4)
+Depends: fp-units-rtl (= 0.99.13-19991013-4)
+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-compiler (= 0.99.13-19991013-4), fp-rtl (= 0.99.13-19991013-4)
+Depends: fp-units-rtl (= 0.99.13-19991013-4)
 Description: Free Pascal units for some database libraries
  Free Pascal units with bindings for:
   - Mysql
@@ -77,7 +92,7 @@ Description: Free Pascal units for some database libraries
 
 Package: fp-units-gfx
 Architecture: i386
-Depends: fp-compiler (= 0.99.13-19991013-4), fp-rtl (= 0.99.13-19991013-4)
+Depends: fp-units-rtl (= 0.99.13-19991013-4), fp-units-base (= 0.99.13-19991013-4)
 Description: Free Pascal units for some graphics libraries
  Free Pascal units with bindings for:
   - Forms 0.88
@@ -85,18 +100,9 @@ Description: Free Pascal units for some graphics libraries
   - GGI
   - OpenGL
 
-Package: fp-units-linux
-Architecture: i386
-Depends: fp-compiler (= 0.99.13-19991013-4), fp-rtl (= 0.99.13-19991013-4)
-Description: Free Pascal Bindings for common linux libraries
- Free Pascal units with bindings for:
-  - X11 (Xlib, Xutil)
-  - NCurses
-  - ZLib
-  
 Package: fp-units-net
 Architecture: i386
-Depends: fp-compiler (= 0.99.13-19991013-4), fp-rtl (= 0.99.13-19991013-4)
+Depends: fp-units-rtl (= 0.99.13-19991013-4)
 Description: Free Pascal units for networking
  Free Pascal units for creating network tools:
   - Inet unit for easier tcp/ip handling
@@ -104,7 +110,7 @@ Description: Free Pascal units for networking
 
 Package: fp-units-misc
 Architecture: i386
-Depends: fp-compiler (= 0.99.13-19991013-4), fp-rtl (= 0.99.13-19991013-4)
+Depends: fp-units-rtl (= 0.99.13-19991013-4)
 Description: Free Pascal miscellaneous units
  Free Pascal miscellaneous units for:
   - Utmp

install/debian/control.in

@@ -7,7 +7,7 @@ Standards-Version: 3.1.1
 
 Package: fp-compiler
 Architecture: i386
-Depends: fp-rtl (= #PACKAGEVERSION#)
+Depends: fp-units-rtl (= #PACKAGEVERSION#)
 Suggests: fp-utils, fp-docs (>= #FPCVERSION#)
 Replaces: fpc
 Description: Free Pascal Compiler
@@ -19,13 +19,6 @@ Description: Free Pascal Compiler
  the commandline compiler. You need at least the RTL package before you
  can start compiling anything.
 
-Package: fp-rtl
-Architecture: i386
-Recommends: fp-compiler (= #PACKAGEVERSION#)
-Replaces: fpc
-Description: Free Pascal Runtime Library
- Runtime Libraries for the Free Pascal Compiler.
-
 Package: fp-utils
 Architecture: i386
 Recommends: fp-compiler (= #PACKAGEVERSION#)
@@ -33,13 +26,15 @@ Replaces: fpc
 Description: Free Pascal Utils
  This package contains some handy utils for usage with the Free Pascal
  Compiler:
-   - ppumove   Place multiple units in a shared library
-   - ppufiles  Show needed files for units
-   - ppudump   Dump the information stored in a .ppu (unit) file
-   - fpcmake   Create Makefile from Makefile.fpc
-   - h2pas     Convert .h files to pascal units
-   - ppdep     Create a dependency file which can be used with Makefiles
-   - ptop      Source beautifier
+   - ppumove     Place multiple units in a shared library
+   - ppufiles    Show needed files for units
+   - ppudump     Dump the information stored in a .ppu (unit) file
+   - fpcmake     Create Makefile from Makefile.fpc
+   - h2pas       Convert .h files to pascal units
+   - ppdep       Create a dependency file which can be used with Makefiles
+   - ptop        Source beautifier
+   - data2inc    Convert binary/text data to include files
+   - plex/pyacc  Pascal Lex/Yacc implementation
 
 Package: fp-docs
 Architecture: all
@@ -48,27 +43,47 @@ Description: Free Pascal Documentation
  Documentation for the Free Pascal Compiler. The documentation is
  only available in PDF format.
 
+Package: fp-units-rtl
+Architecture: i386
+Recommends: fp-compiler (= #PACKAGEVERSION#)
+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 (= #PACKAGEVERSION#)
+Description: Free Pascal base units
+ Free Pascal units for common libraries, some of these units are also
+ required by the Free Component Library :
+  - X11 (Xlib, Xutil)
+  - NCurses
+  - ZLib
+  
 Package: fp-units-fcl
 Architecture: i386
-Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#), fp-units-linux (= #PACKAGEVERSION#)
+Depends: fp-units-rtl (= #PACKAGEVERSION#), fp-units-base (= #PACKAGEVERSION#)
+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-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
-Description: Free Pascal API Units
+Depends: fp-units-rtl (= #PACKAGEVERSION#)
+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-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
+Depends: fp-units-rtl (= #PACKAGEVERSION#)
+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-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
+Depends: fp-units-rtl (= #PACKAGEVERSION#)
 Description: Free Pascal units for some database libraries
  Free Pascal units with bindings for:
   - Mysql
@@ -77,7 +92,7 @@ Description: Free Pascal units for some database libraries
 
 Package: fp-units-gfx
 Architecture: i386
-Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
+Depends: fp-units-rtl (= #PACKAGEVERSION#), fp-units-base (= #PACKAGEVERSION#)
 Description: Free Pascal units for some graphics libraries
  Free Pascal units with bindings for:
   - Forms 0.88
@@ -85,18 +100,9 @@ Description: Free Pascal units for some graphics libraries
   - GGI
   - OpenGL
 
-Package: fp-units-linux
-Architecture: i386
-Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
-Description: Free Pascal Bindings for common linux libraries
- Free Pascal units with bindings for:
-  - X11 (Xlib, Xutil)
-  - NCurses
-  - ZLib
-  
 Package: fp-units-net
 Architecture: i386
-Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
+Depends: fp-units-rtl (= #PACKAGEVERSION#)
 Description: Free Pascal units for networking
  Free Pascal units for creating network tools:
   - Inet unit for easier tcp/ip handling
@@ -104,7 +110,7 @@ Description: Free Pascal units for networking
 
 Package: fp-units-misc
 Architecture: i386
-Depends: fp-compiler (= #PACKAGEVERSION#), fp-rtl (= #PACKAGEVERSION#)
+Depends: fp-units-rtl (= #PACKAGEVERSION#)
 Description: Free Pascal miscellaneous units
  Free Pascal miscellaneous units for:
   - Utmp

install/debian/fp-utils.files.in

@@ -5,6 +5,7 @@
 /usr/bin/ptop 
 /usr/bin/rstconv 
 /usr/bin/data2inc 
+/usr/bin/bin2obj
 /usr/bin/delp
 /usr/bin/plex 
 /usr/bin/pyacc
@@ -19,6 +20,7 @@
 /usr/share/man/man1/ppdep.1
 /usr/share/man/man1/ppumove.1
 /usr/share/man/man1/ppudump.1
+/usr/share/man/man1/ppufiles.1
 /usr/share/man/man1/fpcmake.1
 /usr/share/man/man1/ptop.1
 /usr/share/man/man1/h2pas.1

install/debian/fp-utils.undocumented

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

install/debian/rules

@@ -184,7 +184,7 @@ binary-arch: build-arch arrange-arch debian-files
 	dh_installchangelogs -pfp-rtl logs/Changes.rtl
 	dh_installchangelogs -pfp-utils logs/Changes.utils
 	dh_installchangelogs -pfp-units-fcl logs/Changes.fcl
-#	dh_installchangelogs -pfp-units-api logs/Changes.api
+	dh_installchangelogs -pfp-units-api logs/Changes.api
 #	dh_installchangelogs -pfp-units-fv logs/Changes.fv
 
 	dh_undocumented -a