Index: install/debian/control
===================================================================
--- install/debian/control	(revision 150)
+++ install/debian/control	(working copy)
@@ -1,169 +0,0 @@
-Source: fpc
-Section: devel
-Priority: optional
-Maintainer: Carlos Laviola <claviola@debian.org>
-Standards-Version: 3.6.1
-Build-Depends: fp-compiler, fp-utils, debhelper (>= 4.2), tetex-bin, tetex-extra, awk, gs-common, libncurses5-dev, libgpmg1-dev
-
-Package: fp-compiler
-Architecture: i386 powerpc sparc
-Depends: fp-units-rtl (= 2.0.0-2)
-Suggests: fp-utils, fp-docs (>= 2.0.0)
-Description: Free Pascal -- Compiler
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- Some extensions are added to the language, like function overloading. Shared
- libraries can be linked and created. Basic Delphi support is already
- implemented (classes, exceptions, ansistrings). This package contains the
- command line compiler. You need at least the RTL package before you can start
- compiling anything.
-
-Package: fp-ide
-Architecture: i386 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2)
-Suggests: fp-utils, fp-docs (>= 2.0.0)
-Description: Free Pascal -- IDE
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- Some extensions are added to the language, like function overloading. Shared
- libraries can be linked and created. Basic Delphi support is already
- implemented (classes, exceptions, ansistrings). This package contains the
- Integrated Development Environment (IDE). The IDE has an internal compiler.
- You need at least the RTL package before you can start  compiling anything.
-
-Package: fp-utils
-Architecture: i386 powerpc sparc 
-Recommends: fp-compiler (= 2.0.0-2)
-Description: Free Pascal -- Utils
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- 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
-   - data2inc    Convert binary/text data to include files
-   - plex/pyacc  Pascal Lex/Yacc implementation
-
-Package: fp-docs
-Section: doc
-Architecture: all
-Description: Free Pascal -- Documentation
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains the documentation for the Free Pascal Compiler.
- The documentation is available in HTML and in PDF.
-
-Package: fp-units-rtl
-Architecture: i386 powerpc sparc 
-Recommends: fp-compiler (= 2.0.0-2)
-Description: Free Pascal -- Runtime Library
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains the Runtime Libraries for the Free Pascal Compiler.
-
-Package: fp-units-base
-Architecture: i386 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2)
-Description: Free Pascal -- base units
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains 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 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2), fp-units-base (= 2.0.0-2)
-Description: Free Pascal -- Free Component Library
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains the Free Component Library for the Free Pascal Compiler.
-
-Package: fp-units-fv
-Architecture: i386 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2)
-Description: Free Pascal -- Free Vision units
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains the Free Vision units for the Free Pascal Compiler.
-
-Package: fp-units-gtk
-Architecture: i386 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2), fp-units-fcl (= 2.0.0-2)
-Description: Free Pascal -- GTK 1.2 units 
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains Free Pascal units and examples to create
- programs with GTK 1.2.
-
-Package: fp-units-gtk2
-Architecture: i386 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2), fp-units-fcl (= 2.0.0-2)
-Description: Free Pascal -- GTK 2.x units 
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains Free Pascal units and examples to create
- programs with GTK 2.x.
-
-Package: fp-units-gnome1
-Architecture: i386 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2), fp-units-gtk (= 2.0.0-2)
-Description: Free Pascal -- GNOME 1 units 
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains Free Pascal units and examples to create
- programs for GNOME 1.
-
-Package: fp-units-db
-Architecture: i386 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2)
-Description: Free Pascal -- database libraries units 
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains Free Pascal units with bindings for:
-  - MySQL
-  - Interbase
-  - PostgreSQL
-  - Oracle
-  - ODBC
-  - GDBM
-  - SQLite
-  
-Package: fp-units-gfx
-Architecture: i386 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2), fp-units-base (= 2.0.0-2)
-Description: Free Pascal -- graphics libraries units
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains Free Pascal units with bindings for:
-  - Forms 0.88
-  - Svgalib
-  - GGI
-  - OpenGL
-
-Package: fp-units-net
-Architecture: i386 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2)
-Description: Free Pascal -- networking units 
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- This package contains Free Pascal units for creating network tools:
-  - NetDB unit for TCP/IP handling
-  - LibAsync unit for easy Asynchronous IO
-
-Package: fp-units-misc
-Architecture: i386 powerpc sparc 
-Depends: fp-units-rtl (= 2.0.0-2)
-Description: Free Pascal -- miscellaneous units
- The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32/64-bit
- Pascal Compiler. It comes with a fully compatible TP 7.0 runtime library.
- Free Pascal miscellaneous units for:
-  - Utmp
-  - PasZLib (Pascal-only zlib implementation)
Index: install/debian/README.Debian.in
===================================================================
--- install/debian/README.Debian.in	(revision 150)
+++ install/debian/README.Debian.in	(working copy)
@@ -3,7 +3,7 @@
 
 The source tree was checked out from the subversion repository at
 svn.freepascal.org with
- 'svn co http://svn.freepascal.org/svn/fpcbuild/tags/%{fpcsvntag}'
+ 'svn co http://svn.freepascal.org/svn/fpcbuild/tags/%{fpcsvnpath}'
 
 Only PDF docs are built as shipped. You may want to make the HTML files with
 tex4ht by yourself and eventually adapt the doc-base file.
Index: install/debian/fp-compiler.preinst.in
===================================================================
--- install/debian/fp-compiler.preinst.in	(revision 0)
+++ install/debian/fp-compiler.preinst.in	(revision 0)
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+set -e
+
+# Remove fpc from pc alternative if buggy 2.0.0-{1,2} versions are upgraded
+
+if [ "$1" = "upgrade" ] && [ "$2" = "2.0.0-1" ] || [ "$2" = "2.0.0-2" ]; then
+    /usr/sbin/update-alternatives --remove pc /usr/bin/fpc
+fi
+
+# Debhelper code
+#DEBHELPER#

Property changes on: install/debian/fp-compiler.preinst.in
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Index: install/debian/fp-compiler.prerm.in
===================================================================
--- install/debian/fp-compiler.prerm.in	(revision 0)
+++ install/debian/fp-compiler.prerm.in	(revision 0)
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+set -e
+
+# remove alternative
+update-alternatives --remove pc /usr/bin/fpc
+
+# Debhelper code
+#DEBHELPER#

Property changes on: install/debian/fp-compiler.prerm.in
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Index: install/debian/changelog
===================================================================
--- install/debian/changelog	(revision 150)
+++ install/debian/changelog	(working copy)
@@ -4,6 +4,20 @@
 
  -- Peter Vreman <peter@freepascal.org>  Thu, 07 Jul 2006 12:00:00 +0100
 
+fpc (2.0.0-4) unstable; urgency=low
+
+  * debian/control.in: add amd64 to the Architecture field.
+
+ -- Carlos Laviola <claviola@debian.org>  Fri,  9 Sep 2005 18:38:26 -0300
+
+fpc (2.0.0-3) unstable; urgency=medium
+
+  * Created a prerm and preinst for fp-compiler, as /usr/bin/fpc needs to
+    be removed from the list of 'pc' alternatives.  (Closes: #311436)
+  * Added amd64 to the architecture list.  (Closes: #315220)
+
+ -- Carlos Laviola <claviola@debian.org>  Fri,  2 Sep 2005 10:27:21 -0300
+
 fpc (2.0.0-2) unstable; urgency=low
 
   * debian/fp-compiler.postinst.in: forgot to reapply the patch that
Index: install/debian/copyright
===================================================================
--- install/debian/copyright	(revision 150)
+++ install/debian/copyright	(working copy)
@@ -1,13 +0,0 @@
-The packages were originally put together by:
-  Peter Vreman <peter@freepascal.org>
-
-Debian maintainer:
-  Carlos Laviola <claviola@debian.org>
-
-With sources obtained from:
-  'cvs -d :pserver:cvs@cvs.freepascal.org:/FPC/CVS -z3 co -r RELEASE_2_0_0 fpc'
-  (password: 'cvs')
-
-The files and libraries are released under the terms of the GNU Library
-General Public License, which can be found in the file
-/usr/share/common-licenses/LGPL-2 on a Debian system.
Index: install/debian/copyright.in
===================================================================
--- install/debian/copyright.in	(revision 144)
+++ install/debian/copyright.in	(working copy)
@@ -5,8 +5,7 @@
   Carlos Laviola <claviola@debian.org>
 
 With sources obtained from:
-  'cvs -d :pserver:cvs@cvs.freepascal.org:/FPC/CVS -z3 co -r RELEASE_2_0_0 fpc'
-  (password: 'cvs')
+ 'svn co http://svn.freepascal.org/svn/fpcbuild/tags/%{fpcsvnpath}'
 
 The files and libraries are released under the terms of the GNU Library
 General Public License, which can be found in the file
