From fa60f05f85449addfcea542ae8dd3939da51e727 Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 25 Feb 2017 20:18:37 +0000 Subject: [PATCH] deb: the self made fpc, fpc-src conflicts with the official packages, so users cannot accidentally mix them git-svn-id: trunk@54273 - --- tools/install/debian_fpc-src/control | 16 +++++++--------- tools/install/debian_fpc/control | 5 +++-- tools/install/debian_lazarus/control | 6 ++++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tools/install/debian_fpc-src/control b/tools/install/debian_fpc-src/control index 9297f4fe9a..b86273d52d 100644 --- a/tools/install/debian_fpc-src/control +++ b/tools/install/debian_fpc-src/control @@ -2,16 +2,14 @@ Package: fpc-src Version: FPCVERSION Section: devel Priority: optional -Maintainer: Mattias Gaertner +Maintainer: Mattias Gaertner Architecture: ARCH -Replaces: fpc-source +Replaces: fpc-source, fpc-source-FPCVERSION +Conflicts: fpc-source, fpc-source-FPCVERSION Installed-Size: DEBSIZE Description: Free Pascal Sources - The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible - 32/64bit Object Pascal Compiler. It comes with fully TP 7.0 - compatible run-time 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 - sources for the compiler, the rtl, fcl and packages. + The Free Pascal Compiler is a Delphi and Turbo Pascal 7.0 compatible + 32/64bit Object Pascal Compiler. It comes with a huge run-time library. + Shared libraries can be linked and created. + This package contains the sources for the compiler, the rtl, fcl and packages. diff --git a/tools/install/debian_fpc/control b/tools/install/debian_fpc/control index b1605f3b99..8c4caab9ec 100644 --- a/tools/install/debian_fpc/control +++ b/tools/install/debian_fpc/control @@ -2,10 +2,11 @@ Package: fpc Version: FPCVERSION Section: devel Priority: optional -Maintainer: Mattias Gaertner +Maintainer: Mattias Gaertner Architecture: ARCH Pre-Depends: binutils -Replaces: fp-compiler, fp-utils, fp-ide, fp-units-rtl, fp-units-base, fp-units-fcl, fp-units-fv, fp-units-gtk, fp-units-gtk2, fp-units-gnome1, fp-units-db, fp-units-gfx, fp-units-net, fp-units-misc +Replaces: fpc, fp-compiler, fp-compiler-FPCVERSION, fp-utils, fp-ide, fp-units-rtl, fp-units-base, fp-units-fcl, fp-units-fv, fp-units-gtk, fp-units-gtk2, fp-units-gnome1, fp-units-db, fp-units-gfx, fp-units-net, fp-units-math, fp-units-misc, fp-units-multimedia +Conflicts: fpc, fp-compiler, fp-compiler-FPCVERSION, fp-utils, fp-ide, fp-units-rtl, fp-units-base, fp-units-fcl, fp-units-fv, fp-units-gtk, fp-units-gtk2, fp-units-gnome1, fp-units-db, fp-units-gfx, fp-units-net, fp-units-math, fp-units-misc, fp-units-multimedia Installed-Size: DEBSIZE Description: Free Pascal Compiler Freepascal is a free 32/64bit Pascal Compiler. It comes with a diff --git a/tools/install/debian_lazarus/control b/tools/install/debian_lazarus/control index e0259844e0..ebe7734dca 100644 --- a/tools/install/debian_lazarus/control +++ b/tools/install/debian_lazarus/control @@ -4,8 +4,10 @@ Version: LAZVERSION Section: devel Priority: optional Maintainer: Mattias Gaertner -Architecture: ARCH -Depends: libgtk2.0-dev (>=2.6.0), fpc (>=FPCVERSION) | fp-compiler (>=FPCVERSION), fpc-src (>=FPCVERSION) | fpc-source (>=FPCVERSION), fpc (>=FPCVERSION) | fp-ide (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-base (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-db (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-fcl (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-fv (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-gfx (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-gnome1 (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-gtk (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-gtk2 (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-misc (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-net (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-rtl (>=FPCVERSION), fpc (>=FPCVERSION) | fp-utils (>=FPCVERSION) +Architecture: ARCH +Replaces: lazarus, lazarus-doc, lazarus-ide, lazarus-ide-gtk2, lazarus-ide-qt4, lazarus-src +Conflicts: lazarus, lazarus-doc, lazarus-ide, lazarus-ide-gtk2, lazarus-ide-qt4, lazarus-src +Depends: libgtk2.0-dev (>=2.6.0), fpc (=FPCVERSION) | fp-compiler (=FPCVERSION), fpc-src (=FPCVERSION) | fpc-source (=FPCVERSION), fpc (>=FPCVERSION) | fp-ide (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-base (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-db (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-fcl (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-fv (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-gfx (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-gnome1 (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-gtk (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-gtk2 (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-misc (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-net (>=FPCVERSION), fpc (>=FPCVERSION) | fp-units-rtl (>=FPCVERSION), fpc (>=FPCVERSION) | fp-utils (>=FPCVERSION) Installed-Size: LAZSIZE Description: RAD tool for freepascal Lazarus is a free and opensource IDE and RAD tool for Free Pascal using the