Browse Source

* moving of examples fixed

peter 21 years ago
parent
commit
a1665b9f87
3 changed files with 58 additions and 49 deletions
  1. 24 24
      install/debian/control
  2. 12 12
      install/debian/control.in
  3. 22 13
      install/debian/moveexamples

+ 24 - 24
install/debian/control

@@ -3,12 +3,12 @@ Section: devel
 Priority: optional
 Priority: optional
 Maintainer: Carlos Laviola <[email protected]>
 Maintainer: Carlos Laviola <[email protected]>
 Standards-Version: 3.6.1
 Standards-Version: 3.6.1
-Build-Depends: fp-compiler, debhelper, tetex-bin, tetex-extra, awk, dvipdfm, latex2html
+Build-Depends: fp-compiler, debhelper >= 4.2, tetex-bin, tetex-extra, awk, dvipdf
 
 
 Package: fp-compiler
 Package: fp-compiler
-Architecture: i386
-Depends: fp-units-rtl (= 1.9.3-20040319)
-Suggests: fp-utils, fp-docs (>= 1.9.3)
+Architecture: i386 powerpc
+Depends: fp-units-rtl (= 1.9.4-0.1)
+Suggests: fp-utils, fp-docs (>= 1.9.4)
 Description: Free Pascal Compiler
 Description: Free Pascal Compiler
  The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
  The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
  Pascal Compiler. It comes with fully TP 7.0 compatible run-time library.
  Pascal Compiler. It comes with fully TP 7.0 compatible run-time library.
@@ -19,8 +19,8 @@ Description: Free Pascal Compiler
  can start compiling anything.
  can start compiling anything.
 
 
 Package: fp-utils
 Package: fp-utils
-Architecture: i386
-Recommends: fp-compiler (= 1.9.3-20040319)
+Architecture: i386 powerpc
+Recommends: fp-compiler (= 1.9.4-0.1)
 Description: Free Pascal Utils
 Description: Free Pascal Utils
  This package contains some handy utils for usage with the Free Pascal
  This package contains some handy utils for usage with the Free Pascal
  Compiler:
  Compiler:
@@ -41,14 +41,14 @@ Description: Free Pascal Documentation
  only available in PDF format.
  only available in PDF format.
 
 
 Package: fp-units-rtl
 Package: fp-units-rtl
-Architecture: i386
-Recommends: fp-compiler (= 1.9.3-20040319)
+Architecture: i386 powerpc
+Recommends: fp-compiler (= 1.9.4-0.1)
 Description: Free Pascal Runtime Library
 Description: Free Pascal Runtime Library
  Runtime Libraries for the Free Pascal Compiler.
  Runtime Libraries for the Free Pascal Compiler.
 
 
 Package: fp-units-base
 Package: fp-units-base
-Architecture: i386
-Depends: fp-units-rtl (= 1.9.3-20040319)
+Architecture: i386 powerpc
+Depends: fp-units-rtl (= 1.9.4-0.1)
 Description: Free Pascal base units
 Description: Free Pascal base units
  Free Pascal units for common libraries, some of these units are also
  Free Pascal units for common libraries, some of these units are also
  required by the Free Component Library :
  required by the Free Component Library :
@@ -57,26 +57,26 @@ Description: Free Pascal base units
   - ZLib
   - ZLib
 
 
 Package: fp-units-fcl
 Package: fp-units-fcl
-Architecture: i386
-Depends: fp-units-rtl (= 1.9.3-20040319), fp-units-base (= 1.9.3-20040319)
+Architecture: i386 powerpc
+Depends: fp-units-rtl (= 1.9.4-0.1), fp-units-base (= 1.9.4-0.1)
 Description: Free Pascal Free Component Library
 Description: Free Pascal Free Component Library
  Free Component Library for the Free Pascal Compiler.
  Free Component Library for the Free Pascal Compiler.
 
 
 Package: fp-units-gtk
 Package: fp-units-gtk
-Architecture: i386
-Depends: fp-units-rtl (= 1.9.3-20040319), fp-units-fcl (= 1.9.3-20040319)
+Architecture: i386 powerpc
+Depends: fp-units-rtl (= 1.9.4-0.1), fp-units-fcl (= 1.9.4-0.1)
 Description: Free Pascal units for GTK 1.2.x
 Description: Free Pascal units for GTK 1.2.x
  Free Pascal units and examples to create programs with GTK 1.2.x
  Free Pascal units and examples to create programs with GTK 1.2.x
 
 
 Package: fp-units-gnome1
 Package: fp-units-gnome1
-Architecture: i386
-Depends: fp-units-rtl (= 1.9.3-20040319), fp-units-gtk (= 1.9.3-20040319)
+Architecture: i386 powerpc
+Depends: fp-units-rtl (= 1.9.4-0.1), fp-units-gtk (= 1.9.4-0.1)
 Description: Free Pascal units for GNOME 1
 Description: Free Pascal units for GNOME 1
  Free Pascal units and examples to create programs for GNOME 1
  Free Pascal units and examples to create programs for GNOME 1
 
 
 Package: fp-units-db
 Package: fp-units-db
-Architecture: i386
-Depends: fp-units-rtl (= 1.9.3-20040319)
+Architecture: i386 powerpc
+Depends: fp-units-rtl (= 1.9.4-0.1)
 Description: Free Pascal units for some database libraries
 Description: Free Pascal units for some database libraries
  Free Pascal units with bindings for:
  Free Pascal units with bindings for:
   - Mysql
   - Mysql
@@ -88,8 +88,8 @@ Description: Free Pascal units for some database libraries
   - Sqlite
   - Sqlite
   
   
 Package: fp-units-gfx
 Package: fp-units-gfx
-Architecture: i386
-Depends: fp-units-rtl (= 1.9.3-20040319), fp-units-base (= 1.9.3-20040319)
+Architecture: i386 powerpc
+Depends: fp-units-rtl (= 1.9.4-0.1), fp-units-base (= 1.9.4-0.1)
 Description: Free Pascal units for some graphics libraries
 Description: Free Pascal units for some graphics libraries
  Free Pascal units with bindings for:
  Free Pascal units with bindings for:
   - Forms 0.88
   - Forms 0.88
@@ -98,16 +98,16 @@ Description: Free Pascal units for some graphics libraries
   - OpenGL
   - OpenGL
 
 
 Package: fp-units-net
 Package: fp-units-net
-Architecture: i386
-Depends: fp-units-rtl (= 1.9.3-20040319)
+Architecture: i386 powerpc
+Depends: fp-units-rtl (= 1.9.4-0.1)
 Description: Free Pascal units for networking
 Description: Free Pascal units for networking
  Free Pascal units for creating network tools:
  Free Pascal units for creating network tools:
   - Inet unit for easier tcp/ip handling
   - Inet unit for easier tcp/ip handling
   - UnCGI unit for easy cgi handling
   - UnCGI unit for easy cgi handling
 
 
 Package: fp-units-misc
 Package: fp-units-misc
-Architecture: i386
-Depends: fp-units-rtl (= 1.9.3-20040319)
+Architecture: i386 powerpc
+Depends: fp-units-rtl (= 1.9.4-0.1)
 Description: Free Pascal miscellaneous units
 Description: Free Pascal miscellaneous units
  Free Pascal miscellaneous units for:
  Free Pascal miscellaneous units for:
   - Utmp
   - Utmp

+ 12 - 12
install/debian/control.in

@@ -3,10 +3,10 @@ Section: devel
 Priority: optional
 Priority: optional
 Maintainer: Carlos Laviola <[email protected]>
 Maintainer: Carlos Laviola <[email protected]>
 Standards-Version: 3.6.1
 Standards-Version: 3.6.1
-Build-Depends: fp-compiler, debhelper, tetex-bin, tetex-extra, awk, dvipdfm, latex2html
+Build-Depends: fp-compiler, debhelper >= 4.2, tetex-bin, tetex-extra, awk, dvipdf
 
 
 Package: fp-compiler
 Package: fp-compiler
-Architecture: i386
+Architecture: i386 powerpc
 Depends: fp-units-rtl (= %{packageversion})
 Depends: fp-units-rtl (= %{packageversion})
 Suggests: fp-utils, fp-docs (>= %{fpcversion})
 Suggests: fp-utils, fp-docs (>= %{fpcversion})
 Description: Free Pascal Compiler
 Description: Free Pascal Compiler
@@ -19,7 +19,7 @@ Description: Free Pascal Compiler
  can start compiling anything.
  can start compiling anything.
 
 
 Package: fp-utils
 Package: fp-utils
-Architecture: i386
+Architecture: i386 powerpc
 Recommends: fp-compiler (= %{packageversion})
 Recommends: fp-compiler (= %{packageversion})
 Description: Free Pascal Utils
 Description: Free Pascal Utils
  This package contains some handy utils for usage with the Free Pascal
  This package contains some handy utils for usage with the Free Pascal
@@ -41,13 +41,13 @@ Description: Free Pascal Documentation
  only available in PDF format.
  only available in PDF format.
 
 
 Package: fp-units-rtl
 Package: fp-units-rtl
-Architecture: i386
+Architecture: i386 powerpc
 Recommends: fp-compiler (= %{packageversion})
 Recommends: fp-compiler (= %{packageversion})
 Description: Free Pascal Runtime Library
 Description: Free Pascal Runtime Library
  Runtime Libraries for the Free Pascal Compiler.
  Runtime Libraries for the Free Pascal Compiler.
 
 
 Package: fp-units-base
 Package: fp-units-base
-Architecture: i386
+Architecture: i386 powerpc
 Depends: fp-units-rtl (= %{packageversion})
 Depends: fp-units-rtl (= %{packageversion})
 Description: Free Pascal base units
 Description: Free Pascal base units
  Free Pascal units for common libraries, some of these units are also
  Free Pascal units for common libraries, some of these units are also
@@ -57,25 +57,25 @@ Description: Free Pascal base units
   - ZLib
   - ZLib
 
 
 Package: fp-units-fcl
 Package: fp-units-fcl
-Architecture: i386
+Architecture: i386 powerpc
 Depends: fp-units-rtl (= %{packageversion}), fp-units-base (= %{packageversion})
 Depends: fp-units-rtl (= %{packageversion}), fp-units-base (= %{packageversion})
 Description: Free Pascal Free Component Library
 Description: Free Pascal Free Component Library
  Free Component Library for the Free Pascal Compiler.
  Free Component Library for the Free Pascal Compiler.
 
 
 Package: fp-units-gtk
 Package: fp-units-gtk
-Architecture: i386
+Architecture: i386 powerpc
 Depends: fp-units-rtl (= %{packageversion}), fp-units-fcl (= %{packageversion})
 Depends: fp-units-rtl (= %{packageversion}), fp-units-fcl (= %{packageversion})
 Description: Free Pascal units for GTK 1.2.x
 Description: Free Pascal units for GTK 1.2.x
  Free Pascal units and examples to create programs with GTK 1.2.x
  Free Pascal units and examples to create programs with GTK 1.2.x
 
 
 Package: fp-units-gnome1
 Package: fp-units-gnome1
-Architecture: i386
+Architecture: i386 powerpc
 Depends: fp-units-rtl (= %{packageversion}), fp-units-gtk (= %{packageversion})
 Depends: fp-units-rtl (= %{packageversion}), fp-units-gtk (= %{packageversion})
 Description: Free Pascal units for GNOME 1
 Description: Free Pascal units for GNOME 1
  Free Pascal units and examples to create programs for GNOME 1
  Free Pascal units and examples to create programs for GNOME 1
 
 
 Package: fp-units-db
 Package: fp-units-db
-Architecture: i386
+Architecture: i386 powerpc
 Depends: fp-units-rtl (= %{packageversion})
 Depends: fp-units-rtl (= %{packageversion})
 Description: Free Pascal units for some database libraries
 Description: Free Pascal units for some database libraries
  Free Pascal units with bindings for:
  Free Pascal units with bindings for:
@@ -88,7 +88,7 @@ Description: Free Pascal units for some database libraries
   - Sqlite
   - Sqlite
   
   
 Package: fp-units-gfx
 Package: fp-units-gfx
-Architecture: i386
+Architecture: i386 powerpc
 Depends: fp-units-rtl (= %{packageversion}), fp-units-base (= %{packageversion})
 Depends: fp-units-rtl (= %{packageversion}), fp-units-base (= %{packageversion})
 Description: Free Pascal units for some graphics libraries
 Description: Free Pascal units for some graphics libraries
  Free Pascal units with bindings for:
  Free Pascal units with bindings for:
@@ -98,7 +98,7 @@ Description: Free Pascal units for some graphics libraries
   - OpenGL
   - OpenGL
 
 
 Package: fp-units-net
 Package: fp-units-net
-Architecture: i386
+Architecture: i386 powerpc
 Depends: fp-units-rtl (= %{packageversion})
 Depends: fp-units-rtl (= %{packageversion})
 Description: Free Pascal units for networking
 Description: Free Pascal units for networking
  Free Pascal units for creating network tools:
  Free Pascal units for creating network tools:
@@ -106,7 +106,7 @@ Description: Free Pascal units for networking
   - UnCGI unit for easy cgi handling
   - UnCGI unit for easy cgi handling
 
 
 Package: fp-units-misc
 Package: fp-units-misc
-Architecture: i386
+Architecture: i386 powerpc
 Depends: fp-units-rtl (= %{packageversion})
 Depends: fp-units-rtl (= %{packageversion})
 Description: Free Pascal miscellaneous units
 Description: Free Pascal miscellaneous units
  Free Pascal miscellaneous units for:
  Free Pascal miscellaneous units for:

+ 22 - 13
install/debian/moveexamples

@@ -1,15 +1,21 @@
 #!/bin/bash
 #!/bin/bash
 
 
+set -e
+
 EXAMPLE_TEMP=$1
 EXAMPLE_TEMP=$1
 DOC_DIR=$2
 DOC_DIR=$2
 
 
 move_examples()
 move_examples()
 {
 {
     for package in $2; do
     for package in $2; do
-        # Move dir
-        mv -f $EXAMPLE_TEMP/$package/examples $DOC_DIR/fp-units-$1/examples/
-	# Rename dir
-	mv $DOC_DIR/fp-units-$1/examples/examples $DOC_DIR/fp-units-$1/examples/$package
+        if [ -d $EXAMPLE_TEMP/$package/examples ]; then
+            echo "Moving examples of $package"
+            # Move dir
+            mv -f $EXAMPLE_TEMP/$package/examples $DOC_DIR/fp-units-$1/examples/
+	    # Rename dir
+	    mv -f $DOC_DIR/fp-units-$1/examples/examples $DOC_DIR/fp-units-$1/examples/$package
+            rmdir $EXAMPLE_TEMP/$package
+        fi
     done
     done
 }
 }
 
 
@@ -18,16 +24,19 @@ FCL_PACKAGES="fcl"
 GTK_PACKAGES="gtk"
 GTK_PACKAGES="gtk"
 GNOME1_PACKAGES="imlib zvt gnome gconf"
 GNOME1_PACKAGES="imlib zvt gnome gconf"
 BASE_PACKAGES="paszlib pasjpeg regexpr ncurses"
 BASE_PACKAGES="paszlib pasjpeg regexpr ncurses"
-GFX_PACKAGES="forms ggi libgdb svgalib opengl"
+GFX_PACKAGES="forms ggi libgd svgalib opengl"
 DB_PACKAGES="ibase mysql oracle postgres gdbm odbc"
 DB_PACKAGES="ibase mysql oracle postgres gdbm odbc"
 MISC_PACKAGES="gdbint utmp syslog cdrom tcl"
 MISC_PACKAGES="gdbint utmp syslog cdrom tcl"
 NET_PACKAGES="inet netdb"
 NET_PACKAGES="inet netdb"
 
 
-move_examples fcl $FCL_PACKAGES
-move_examples gtk $GTK_PACKAGES
-move_examples gnome1 $GNOME1_PACKAGES
-move_examples base $BASE_PACKAGES
-move_examples gfx $GFX_PACKAGES
-move_examples db $DB_PACKAGES
-move_examples misc $MISC_PACKAGES
-move_examples net $NET_PACKAGES
+move_examples fcl "$FCL_PACKAGES"
+move_examples gtk "$GTK_PACKAGES"
+move_examples gnome1 "$GNOME1_PACKAGES"
+move_examples base "$BASE_PACKAGES"
+move_examples gfx "$GFX_PACKAGES"
+move_examples db "$DB_PACKAGES"
+move_examples misc "$MISC_PACKAGES"
+move_examples net "$NET_PACKAGES"
+
+rmdir $EXAMPLE_TEMP
+