diff --git a/.gitattributes b/.gitattributes index 257793611c..11eb2f0752 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2337,19 +2337,32 @@ debian/copyright svneol=native#text/plain debian/docs svneol=native#text/plain debian/fixdeb svneol=native#text/plain debian/install.sh svneol=native#text/plain +debian/lazarus-doc.doc-base.in svneol=native#text/plain debian/lazarus-doc.install.in svneol=native#text/plain +debian/lazarus-ide-gtk2.install.in svneol=native#text/plain +debian/lazarus-ide-gtk2.postinst.in svneol=native#text/plain +debian/lazarus-ide-gtk2.prerm.in svneol=native#text/plain debian/lazarus-ide.install.in svneol=native#text/plain debian/lazarus-ide.links.in svneol=native#text/plain debian/lazarus-ide.menu svneol=native#text/plain debian/lazarus-src.install.in svneol=native#text/plain +debian/lcl-gtk2.install.in svneol=native#text/plain +debian/lcl-nogui.install.in svneol=native#text/plain +debian/lcl-qt4.install.in svneol=native#text/plain +debian/lcl-units.install.in svneol=native#text/plain +debian/lcl-utils.install.in svneol=native#text/plain +debian/lcl-utils.links.in svneol=native#text/plain debian/orig-tar.sh svneol=native#text/plain debian/overrides/lazarus-ide svneol=native#text/plain -debian/overrides/lazarus-src svneol=native#text/plain +debian/overrides/lazarus-ide-gtk2 svneol=native#text/plain +debian/overrides/lazarus-ide-qt4 svneol=native#text/plain +debian/overrides/lcl-utils svneol=native#text/plain debian/patches/01_topmakefile.diff svneol=native#text/plain debian/patches/02_components.diff svneol=native#text/plain debian/patches/default_config.diff svneol=native#text/plain debian/patches/series svneol=native#text/plain debian/rules svneol=native#text/plain +debian/source/format svneol=native#text/plain debian/watch svneol=native#text/plain debugger/assemblerdlg.lfm svneol=native#text/pascal debugger/assemblerdlg.pp svneol=native#text/pascal diff --git a/debian/changelog b/debian/changelog index c8877a522a..0869c5a799 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,94 @@ lazarus (0.9.29-0) unstable; urgency=low * Snapshot building. - -- Abou Al Montacir Sat, 17 Nov 2009 20:08:00 +0100 + -- Abou Al Montacir Sat, 11 Nov 2010 01:03:00 +0200 + +lazarus (0.9.28.2-12) unstable; urgency=low + + * Fixed a bug causing safe-upgrade to fail because lazarus-ide-qt4 is + installed to fix dependencies of lazarus-ide and that Qt based IDE is not + packaged. The lazarus-ide-qt4 now installs the GTK based IDE by depending + on lazarus-ide-gtk until Qt IDE gets packaged. (Closes: Bug#594611) + * Removed lintian warning by addeing lcl-gtk2 as first alternative for + lcl-units dependency list. + * Bumped standard version to 3.9.1. + + -- Abou Al Montacir Mon, 30 Aug 2010 13:32:00 +0100 + +lazarus (0.9.28.2-11) unstable; urgency=low + + * Fixed scrolling window under GTK implementing ScrollBy method. + * Changed new release scanning to be uscan based. + * Fixed dependency issue : lcl-units depends on lcl-gtk but was providing it + causing lcl-gtk2 not being installed. (Closes: Bug#580557, Bug#579128) + * Fixed logic bug in code tools when adding published field of a class. + + -- Abou Al Montacir Sun, 20 Jun 2010 16:53:00 +0100 + +lazarus (0.9.28.2-10) unstable; urgency=low + + * Fixed memory leak in GTK based lazarus IDE binary (Closes: Bug#571997) + * Fixed crach by avoiding trapping some FPU exceptions which occurs in linked + C code. (Closes: Bug#571998) + + -- Abou Al Montacir Mon, 09 Apr 2010 00:23:00 +0100 + +lazarus (0.9.28.2-9) unstable; urgency=low + + * Bumped standard version. + * Split lazarus-ide package into the following packages in order to reduce + its size and afford more widgetsets support. (Closes: Bug#553519) + + lazarus-ide-gtk2 : contains IDE linked to GTK+2 backend + + lazarus-ide-qt4 : contains IDE linked to Qt4 backend + + lazarus-ide : contains lazarus launcher and depending on either above + packges + + lcl-utils: contains command line tools (lazbuild, ...) + + lcl-units : contains widgetset independent binary units depending on + either follwing packages + + lcl-nogui : contains NOGUI backend based LCL interface units + + lcl-gtk2 : contains GTK+2 backend based LCL interface untis + + lcl-qt4 : contains Qt4 backend based LCL interface units + + lcl : metapackage depending on lcl-units and lcl-utils. + * Fixed help for FPC identifiers applying a ptch from upstream and filled + correct FPC source directory. (Closes: Bug#507523) + + -- Abou Al Montacir Mon, 15 Mar 2010 20:02:00 +0100 + +lazarus (0.9.28.2-8) unstable; urgency=low + + * Added dependency on ${misc:Depends} as required for packages using + debhelper. + * Removed pre-dependency on dpkg (>= 1.10.24). + + -- Abou Al Montacir Mon, 25 Jan 2010 23:48:00 +0100 + +lazarus (0.9.28.2-7) unstable; urgency=low + + * Removed image files from sources as these are not used by the code tool. + + -- Abou Al Montacir Sat, 07 Jan 2010 19:04:00 +0100 + +lazarus (0.9.28.2-6) unstable; urgency=low + + * Removed lintian warnings : empty directories in source package. + * Removed lintian warnings : Fixed spell errors. + + -- Abou Al Montacir Sat, 06 Jan 2010 23:05:00 +0100 + +lazarus (0.9.28.2-5) unstable; urgency=low + + * Included quilt.make in rules file. (Closes: Bug#538553) + * Build against fpc_2.2.4-5. (Closes: Bug#563236) + * Removed lintian warnings. + + -- Abou Al Montacir Sat, 03 Jan 2010 19:18:00 +0100 + +lazarus (0.9.28.2-4) unstable; urgency=low + + * Use default X web browser instead of epiphany. + * Fixed online help default page URL. + + -- Abou Al Montacir Sat, 29 Nov 2009 22:52:00 +0100 lazarus (0.9.28.2-3) unstable; urgency=low @@ -205,7 +292,7 @@ lazarus (0.9.24-0-6) unstable; urgency=low + lazarus-ide : for IDE and binary files + lazarus-src : for source files + lazarus-doc : for documentation - + lazarus : a meta package depending on previous packages + + lazarus : a metapackage depending on previous packages [ Torsten Werner ] * Add Build-Depends: fp-units-gtk2, fp-units-i386 [i386]. diff --git a/debian/control b/debian/control index 24ce9360ef..7bde48600c 100644 --- a/debian/control +++ b/debian/control @@ -4,21 +4,18 @@ Priority: optional Maintainer: Carlos Laviola Uploaders: Torsten Werner , Abou Al Montacir DM-Upload-Allowed: yes -Standards-Version: 3.8.3 -Build-Depends: debhelper (>= 7), quilt, fpc (>= 2.2.4-3), fpc-source (>= 2.2.4-3), - fp-utils, imagemagick +Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 7), quilt, fpc (>= 2.2.4-3), fpc-source (>= 2.2.4-3), fp-utils, imagemagick Vcs-Svn: https://bollin.googlecode.com/svn/lazarus/trunk Vcs-Browser: http://bollin.googlecode.com/svn/lazarus/trunk Homepage: http://www.lazarus.freepascal.org Package: lazarus Architecture: all -Pre-Depends: dpkg (>= 1.10.24) -Depends: lazarus-ide (>= ${source:Version}), - lazarus-src (>= ${source:Version}), lazarus-doc (>= ${source:Version}) +Depends: ${misc:Depends}, lazarus-ide (>= ${source:Version}), lazarus-src (>= ${source:Version}), lazarus-doc (>= ${source:Version}) Recommends: fpc, fpc-source Suggests: fp-utils, fp-docs -Description: IDE for Free Pascal to create (graphical and console) applications +Description: IDE for Free Pascal - Meta Package Lazarus is an IDE to create (graphical and console) applications with Free Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs on Windows, Linux, Mac OS X, FreeBSD and more. @@ -42,13 +39,11 @@ Description: IDE for Free Pascal to create (graphical and console) applications . Tutorials: http://lazarus-ccr.sourceforge.net - Package: lazarus-src -Section: devel Architecture: all -Pre-Depends: dpkg (>= 1.10.24) +Depends: ${misc:Depends} Suggests: lazarus-ide -Description: IDE for Free Pascal to create (graphical and console) applications +Description: IDE for Free Pascal - LCL Sources Code Lazarus is an IDE to create (graphical and console) applications with Free Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs on Windows, Linux, Mac OS X, FreeBSD and more. @@ -69,14 +64,11 @@ Description: IDE for Free Pascal to create (graphical and console) applications run (retrieving declarations and navigating in code). Package: lazarus-ide -Architecture: i386 powerpc sparc amd64 arm -Pre-Depends: dpkg (>= 1.10.24) -Depends: ${shlibs:Depends}, fp-compiler (>= 2.2.4-3), fp-units-base, - fp-units-rtl, fp-units-fcl, fp-units-gtk2, - ${fpc-abi:Depends}, lazarus-src -Recommends: fpc, gdb +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, ${shlibs:Depends}, fp-compiler, lazarus-src, lazarus-ide-gtk | lazarus-ide-qt +Recommends: fpc, lcl, gdb Suggests: fp-utils -Description: IDE for Free Pascal to create (graphical and console) applications +Description: IDE for Free Pascal - Common IDE files Lazarus is an IDE to create (graphical and console) applications with Free Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs on Windows, Linux, Mac OS X, FreeBSD and more. @@ -93,13 +85,227 @@ Description: IDE for Free Pascal to create (graphical and console) applications In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus Component Library (LCL). . - This package contains the lazarus IDE, LCL and components. + This package contains the commons files required to run lazarus IDE. + +Package: lazarus-ide-gtk2 +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, ${shlibs:Depends}, lazarus-ide +Recommends: fpc, lcl, gdb +Suggests: fp-utils +Provides: lazarus-ide-gtk +Breaks: lazarus-ide (<= 0.9.28.2-2) +Replaces: lazarus-ide (<= 0.9.28.2-2) +Description: IDE for Free Pascal - IDE build on top of GTK+ backend + Lazarus is an IDE to create (graphical and console) applications with Free + Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs + on Windows, Linux, Mac OS X, FreeBSD and more. + . + Lazarus is the missing part of the puzzle that will allow you to develop + programs for all of the above platforms in a Delphi like environment. + The IDE is a RAD tool that includes a form designer. + . + Unlike Java's "write once, run anywhere" motto, Lazarus and Free Pascal + strive for "write once, compile anywhere". Since the exact same compiler + is available on all of the above platforms you don't need to do any recoding + to produce identical products for different platforms. + . + In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus + Component Library (LCL). + . + This package contains the lazarus IDE build on top of GTK+ backend. + +Package: lazarus-ide-qt4 +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, ${shlibs:Depends}, lazarus-ide, lazarus-ide-gtk +Recommends: fpc, lcl, gdb +Suggests: fp-utils +Provides: lazarus-ide-qt +Breaks: lazarus-ide (<= 0.9.28.2-2) +Replaces: lazarus-ide (<= 0.9.28.2-2) +Description: IDE for Free Pascal - IDE build on top of QT backend + Lazarus is an IDE to create (graphical and console) applications with Free + Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs + on Windows, Linux, Mac OS X, FreeBSD and more. + . + Lazarus is the missing part of the puzzle that will allow you to develop + programs for all of the above platforms in a Delphi like environment. + The IDE is a RAD tool that includes a form designer. + . + Unlike Java's "write once, run anywhere" motto, Lazarus and Free Pascal + strive for "write once, compile anywhere". Since the exact same compiler + is available on all of the above platforms you don't need to do any recoding + to produce identical products for different platforms. + . + In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus + Component Library (LCL). + . + This package will contain the lazarus IDE build on top of QT backend, however + for now it just depends on gtk based IDE. + +Package: lcl +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, ${shlibs:Depends}, lcl-units, lcl-utils +Recommends: fpc, lazarus-ide +Suggests: gdb +Breaks: lazarus-ide (<= 0.9.28.2-2) +Replaces: lazarus-ide (<= 0.9.28.2-2) +Description: Lazarus Components Library - LCL metapackage + Lazarus is an IDE to create (graphical and console) applications with Free + Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs + on Windows, Linux, Mac OS X, FreeBSD and more. + . + Lazarus is the missing part of the puzzle that will allow you to develop + programs for all of the above platforms in a Delphi like environment. + The IDE is a RAD tool that includes a form designer. + . + Unlike Java's "write once, run anywhere" motto, Lazarus and Free Pascal + strive for "write once, compile anywhere". Since the exact same compiler + is available on all of the above platforms you don't need to do any recoding + to produce identical products for different platforms. + . + In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus + Component Library (LCL). + . + This is a metapackage to ease installing the LCL and components. + +Package: lcl-utils +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, ${shlibs:Depends}, fp-compiler +Recommends: lcl, lazarus-ide +Breaks: lazarus-ide (<= 0.9.28.2-2) +Replaces: lazarus-ide (<= 0.9.28.2-2) +Description: Lazarus Components Library - Command Line build tools + Lazarus is an IDE to create (graphical and console) applications with Free + Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs + on Windows, Linux, Mac OS X, FreeBSD and more. + . + Lazarus is the missing part of the puzzle that will allow you to develop + programs for all of the above platforms in a Delphi like environment. + The IDE is a RAD tool that includes a form designer. + . + Unlike Java's "write once, run anywhere" motto, Lazarus and Free Pascal + strive for "write once, compile anywhere". Since the exact same compiler + is available on all of the above platforms you don't need to do any recoding + to produce identical products for different platforms. + . + In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus + Component Library (LCL). + . + This package contains command line tools to ease building LCL applications. + +Package: lcl-units +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, ${shlibs:Depends}, ${fpc-abi:Depends}, lcl-gtk2 | lcl-gtk | lcl-qt +Recommends: lazarus-ide, fpc +Suggests: gdb +Provides: lcl-${source:Upstream-Version}, lcl-${source:Version} +Breaks: lazarus-ide (<= 0.9.28.2-2) +Replaces: lazarus-ide (<= 0.9.28.2-2) +Description: Lazarus Components Library - Backend independent components + Lazarus is an IDE to create (graphical and console) applications with Free + Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs + on Windows, Linux, Mac OS X, FreeBSD and more. + . + Lazarus is the missing part of the puzzle that will allow you to develop + programs for all of the above platforms in a Delphi like environment. + The IDE is a RAD tool that includes a form designer. + . + Unlike Java's "write once, run anywhere" motto, Lazarus and Free Pascal + strive for "write once, compile anywhere". Since the exact same compiler + is available on all of the above platforms you don't need to do any recoding + to produce identical products for different platforms. + . + In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus + Component Library (LCL). + . + This package contains the LCL and components. + +Package: lcl-nogui +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, ${shlibs:Depends}, ${fpc-abi:Depends}, fp-units-rtl, fp-units-base, fp-units-fcl +Recommends: lazarus-ide, fpc +Suggests: gdb +Breaks: lazarus-ide (<= 0.9.28.2-2) +Replaces: lazarus-ide (<= 0.9.28.2-2) +Description: Lazarus Components Library - No GUI backend + Lazarus is an IDE to create (graphical and console) applications with Free + Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs + on Windows, Linux, Mac OS X, FreeBSD and more. + . + Lazarus is the missing part of the puzzle that will allow you to develop + programs for all of the above platforms in a Delphi like environment. + The IDE is a RAD tool that includes a form designer. + . + Unlike Java's "write once, run anywhere" motto, Lazarus and Free Pascal + strive for "write once, compile anywhere". Since the exact same compiler + is available on all of the above platforms you don't need to do any recoding + to produce identical products for different platforms. + . + In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus + Component Library (LCL). + . + This package contains the LCL and components no GUI based backend for command + line tools and non graphical applications. + +Package: lcl-gtk2 +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, ${shlibs:Depends}, ${fpc-abi:Depends}, fp-units-rtl, fp-units-base, fp-units-fcl, fp-units-gtk2 +Recommends: lazarus-ide, fpc +Suggests: gdb +Provides: lcl-gtk +Breaks: lazarus-ide (<= 0.9.28.2-2) +Replaces: lazarus-ide (<= 0.9.28.2-2) +Description: Lazarus Components Library - GTK+ backend + Lazarus is an IDE to create (graphical and console) applications with Free + Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs + on Windows, Linux, Mac OS X, FreeBSD and more. + . + Lazarus is the missing part of the puzzle that will allow you to develop + programs for all of the above platforms in a Delphi like environment. + The IDE is a RAD tool that includes a form designer. + . + Unlike Java's "write once, run anywhere" motto, Lazarus and Free Pascal + strive for "write once, compile anywhere". Since the exact same compiler + is available on all of the above platforms you don't need to do any recoding + to produce identical products for different platforms. + . + In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus + Component Library (LCL). + . + This package contains the LCL and components GTK+ based backend. + +Package: lcl-qt4 +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, ${shlibs:Depends}, ${fpc-abi:Depends}, fp-units-rtl, fp-units-base, fp-units-fcl, libqt4pas-dev +Recommends: lazarus-ide, fpc +Suggests: gdb +Provides: lcl-qt +Description: Lazarus Components Library - QT backend + Lazarus is an IDE to create (graphical and console) applications with Free + Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs + on Windows, Linux, Mac OS X, FreeBSD and more. + . + Lazarus is the missing part of the puzzle that will allow you to develop + programs for all of the above platforms in a Delphi like environment. + The IDE is a RAD tool that includes a form designer. + . + Unlike Java's "write once, run anywhere" motto, Lazarus and Free Pascal + strive for "write once, compile anywhere". Since the exact same compiler + is available on all of the above platforms you don't need to do any recoding + to produce identical products for different platforms. + . + In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus + Component Library (LCL). + . + This package contains the LCL and components Qt based backend. Actually this is + an empty package but will not be in the future. Package: lazarus-doc Section: doc Architecture: all +Depends: ${misc:Depends} Suggests: lazarus-ide -Description: IDE for Free Pascal to create (graphical and console) applications +Description: IDE for Free Pascal - Documentation Lazarus is an IDE to create (graphical and console) applications with Free Pascal. Free Pascal is a (L)GPL'ed Pascal and Object Pascal compiler that runs on Windows, Linux, Mac OS X, FreeBSD and more. @@ -116,7 +322,7 @@ Description: IDE for Free Pascal to create (graphical and console) applications In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus Component Library (LCL). . - This package contain documentation of the lazarus IDE and components. It can + This package contains documentation of the lazarus IDE and components. It can be viewed separately with any HTML browser or used by the IDE to as an integrated help (pressing on any LCL identifier will browse the help of that identifier). diff --git a/debian/lazarus-doc.doc-base.in b/debian/lazarus-doc.doc-base.in new file mode 100644 index 0000000000..a6bef7fa82 --- /dev/null +++ b/debian/lazarus-doc.doc-base.in @@ -0,0 +1,10 @@ +Document: lazarus-doc +Title: Lazarus Components Library (LCL) Documentation +Author: Michael van Canneyt +Abstract: Documentation for the Lazarus Components Library (LCL). + . +Section: Programming + +Format: html +Files: /usr/share/doc/lazarus/* +Index: /usr/share/doc/lazarus/%{lazarusversion}/index.html diff --git a/debian/lazarus-ide-gtk2.install.in b/debian/lazarus-ide-gtk2.install.in new file mode 100644 index 0000000000..c86be77e92 --- /dev/null +++ b/debian/lazarus-ide-gtk2.install.in @@ -0,0 +1 @@ +/usr/lib/lazarus/%{lazarusversion}/lazarus-gtk2 diff --git a/debian/lazarus-ide-gtk2.postinst.in b/debian/lazarus-ide-gtk2.postinst.in new file mode 100644 index 0000000000..9d7f8dec3d --- /dev/null +++ b/debian/lazarus-ide-gtk2.postinst.in @@ -0,0 +1,12 @@ +#! /bin/sh + +set -e + +LAZARUS_DIR=/usr/lib/lazarus/%{lazarusversion} + +# add alternative +update-alternatives \ + --install ${LAZARUS_DIR}/lazarus lazarus ${LAZARUS_DIR}/lazarus-gtk2 20 \ + +# Debhelper code +#DEBHELPER# diff --git a/debian/lazarus-ide-gtk2.prerm.in b/debian/lazarus-ide-gtk2.prerm.in new file mode 100644 index 0000000000..b9e8fb18d9 --- /dev/null +++ b/debian/lazarus-ide-gtk2.prerm.in @@ -0,0 +1,11 @@ +#! /bin/sh + +set -e + +LAZARUS_DIR=/usr/lib/lazarus/%{lazarusversion} + +# remove alternative +update-alternatives --remove lazarus ${LAZARUS_DIR}/lazarus-gtk2 + +# Debhelper code +#DEBHELPER# diff --git a/debian/lazarus-ide.install.in b/debian/lazarus-ide.install.in index 68314f869d..73e3484164 100644 --- a/debian/lazarus-ide.install.in +++ b/debian/lazarus-ide.install.in @@ -1,57 +1,10 @@ -/etc/lazarus -/usr/lib/lazarus/%{lazarusversion}/lazarus -/usr/lib/lazarus/%{lazarusversion}/lazbuild -/usr/lib/lazarus/%{lazarusversion}/startlazarus -/usr/lib/lazarus/%{lazarusversion}/components/codetools -#/usr/lib/lazarus/%{lazarusversion}/components/custom -/usr/lib/lazarus/%{lazarusversion}/components/jcf2 -#/usr/lib/lazarus/%{lazarusversion}/components/rx -#/usr/lib/lazarus/%{lazarusversion}/components/sqlite -/usr/lib/lazarus/%{lazarusversion}/components/cgi -/usr/lib/lazarus/%{lazarusversion}/components/fpcunit -/usr/lib/lazarus/%{lazarusversion}/components/memds -/usr/lib/lazarus/%{lazarusversion}/components/sqldb -/usr/lib/lazarus/%{lazarusversion}/components/printers -/usr/lib/lazarus/%{lazarusversion}/components/projecttemplates -/usr/lib/lazarus/%{lazarusversion}/components/rtticontrols -/usr/lib/lazarus/%{lazarusversion}/components/sdf -/usr/lib/lazarus/%{lazarusversion}/components/synedit -#/usr/lib/lazarus/%{lazarusversion}/components/synunihighlighter -/usr/lib/lazarus/%{lazarusversion}/components/tachart -/usr/lib/lazarus/%{lazarusversion}/components/tdbf -/usr/lib/lazarus/%{lazarusversion}/components/turbopower_ipro -#/usr/lib/lazarus/%{lazarusversion}/components/lazreport -#/usr/lib/lazarus/%{lazarusversion}/components/chmhelp -#/usr/lib/lazarus/%{lazarusversion}/components/macfiles -#/usr/lib/lazarus/%{lazarusversion}/components/mpaslex -#/usr/lib/lazarus/%{lazarusversion}/components/opengl -#/usr/lib/lazarus/%{lazarusversion}/components/dbexport -#/usr/lib/lazarus/%{lazarusversion}/components/popupnotifier -#/usr/lib/lazarus/%{lazarusversion}/components/simpleideintf -#/usr/lib/lazarus/%{lazarusversion}/components/daemon -#/usr/lib/lazarus/%{lazarusversion}/components/fpweb -#/usr/lib/lazarus/%{lazarusversion}/components/editortoolbar -#/usr/lib/lazarus/%{lazarusversion}/components/prettymessages -#/usr/lib/lazarus/%{lazarusversion}/components/lazthread -#/usr/lib/lazarus/%{lazarusversion}/components/datadict -#/usr/lib/lazarus/%{lazarusversion}/components/customform -#/usr/lib/lazarus/%{lazarusversion}/components/prettyformat -#/usr/lib/lazarus/%{lazarusversion}/components/h2pas -#/usr/lib/lazarus/%{lazarusversion}/components/images -#/usr/lib/lazarus/%{lazarusversion}/converter -#/usr/lib/lazarus/%{lazarusversion}/debugger /usr/lib/lazarus/%{lazarusversion}/docs/Contributors.txt /usr/lib/lazarus/%{lazarusversion}/docs/contributors.utf8 /usr/lib/lazarus/%{lazarusversion}/docs/acknowledgements.txt -#/usr/lib/lazarus/%{lazarusversion}/doceditor /usr/lib/lazarus/%{lazarusversion}/examples -#/usr/lib/lazarus/%{lazarusversion}/ide -/usr/lib/lazarus/%{lazarusversion}/ideintf /usr/lib/lazarus/%{lazarusversion}/languages -/usr/lib/lazarus/%{lazarusversion}/lcl -/usr/lib/lazarus/%{lazarusversion}/packager -/usr/lib/lazarus/%{lazarusversion}/tools -/usr/lib/lazarus/%{lazarusversion}/units +/usr/lib/lazarus/%{lazarusversion}/startlazarus /usr/share/applications +/usr/share/man/man1/lazarus-ide.1 +/usr/share/man/man1/startlazarus.1 /usr/share/pixmaps -/usr/share/man diff --git a/debian/lazarus-ide.links.in b/debian/lazarus-ide.links.in index 75d9b6bca1..d2a573ffd1 100644 --- a/debian/lazarus-ide.links.in +++ b/debian/lazarus-ide.links.in @@ -1,8 +1,2 @@ /usr/lib/lazarus/%{lazarusversion}/startlazarus /usr/bin/startlazarus /usr/lib/lazarus/%{lazarusversion}/startlazarus /usr/bin/lazarus-ide -/usr/lib/lazarus/%{lazarusversion}/lazarus /usr/lib/lazarus/lazarus-ide -/usr/lib/lazarus/%{lazarusversion}/lazbuild /usr/bin/lazbuild -/usr/lib/lazarus/%{lazarusversion}/tools/lazres /usr/bin/lazres -/usr/lib/lazarus/%{lazarusversion}/tools/lrstolfm /usr/bin/lrstolfm -/usr/lib/lazarus/%{lazarusversion}/tools/svn2revisioninc /usr/bin/svn2revisioninc -/usr/lib/lazarus/%{lazarusversion}/tools/updatepofiles /usr/bin/updatepofiles diff --git a/debian/lcl-gtk2.install.in b/debian/lcl-gtk2.install.in new file mode 100644 index 0000000000..e3c6f6596e --- /dev/null +++ b/debian/lcl-gtk2.install.in @@ -0,0 +1 @@ +/usr/lib/lazarus/%{lazarusversion}/lcl/units/*/gtk2 diff --git a/debian/lcl-nogui.install.in b/debian/lcl-nogui.install.in new file mode 100644 index 0000000000..53e0a44e9f --- /dev/null +++ b/debian/lcl-nogui.install.in @@ -0,0 +1 @@ +/usr/lib/lazarus/%{lazarusversion}/lcl/units/*/nogui diff --git a/debian/lcl-qt4.install.in b/debian/lcl-qt4.install.in new file mode 100644 index 0000000000..aaedb98a3c --- /dev/null +++ b/debian/lcl-qt4.install.in @@ -0,0 +1 @@ +#/usr/lib/lazarus/%{lazarusversion}/lcl/units/*/qt diff --git a/debian/lcl-units.install.in b/debian/lcl-units.install.in new file mode 100644 index 0000000000..02374486f2 --- /dev/null +++ b/debian/lcl-units.install.in @@ -0,0 +1,45 @@ +/usr/lib/lazarus/%{lazarusversion}/components/codetools +#/usr/lib/lazarus/%{lazarusversion}/components/custom +/usr/lib/lazarus/%{lazarusversion}/components/jcf2 +#/usr/lib/lazarus/%{lazarusversion}/components/rx +#/usr/lib/lazarus/%{lazarusversion}/components/sqlite +/usr/lib/lazarus/%{lazarusversion}/components/cgi +/usr/lib/lazarus/%{lazarusversion}/components/fpcunit +/usr/lib/lazarus/%{lazarusversion}/components/memds +/usr/lib/lazarus/%{lazarusversion}/components/sqldb +/usr/lib/lazarus/%{lazarusversion}/components/printers +/usr/lib/lazarus/%{lazarusversion}/components/projecttemplates +/usr/lib/lazarus/%{lazarusversion}/components/rtticontrols +/usr/lib/lazarus/%{lazarusversion}/components/sdf +/usr/lib/lazarus/%{lazarusversion}/components/synedit +#/usr/lib/lazarus/%{lazarusversion}/components/synunihighlighter +/usr/lib/lazarus/%{lazarusversion}/components/tachart +/usr/lib/lazarus/%{lazarusversion}/components/tdbf +/usr/lib/lazarus/%{lazarusversion}/components/turbopower_ipro +#/usr/lib/lazarus/%{lazarusversion}/components/lazreport +#/usr/lib/lazarus/%{lazarusversion}/components/chmhelp +#/usr/lib/lazarus/%{lazarusversion}/components/macfiles +#/usr/lib/lazarus/%{lazarusversion}/components/mpaslex +#/usr/lib/lazarus/%{lazarusversion}/components/opengl +#/usr/lib/lazarus/%{lazarusversion}/components/dbexport +#/usr/lib/lazarus/%{lazarusversion}/components/popupnotifier +#/usr/lib/lazarus/%{lazarusversion}/components/simpleideintf +#/usr/lib/lazarus/%{lazarusversion}/components/daemon +#/usr/lib/lazarus/%{lazarusversion}/components/fpweb +#/usr/lib/lazarus/%{lazarusversion}/components/editortoolbar +#/usr/lib/lazarus/%{lazarusversion}/components/prettymessages +#/usr/lib/lazarus/%{lazarusversion}/components/lazthread +#/usr/lib/lazarus/%{lazarusversion}/components/datadict +#/usr/lib/lazarus/%{lazarusversion}/components/customform +#/usr/lib/lazarus/%{lazarusversion}/components/prettyformat +#/usr/lib/lazarus/%{lazarusversion}/components/h2pas +#/usr/lib/lazarus/%{lazarusversion}/components/images +#/usr/lib/lazarus/%{lazarusversion}/converter +#/usr/lib/lazarus/%{lazarusversion}/debugger +#/usr/lib/lazarus/%{lazarusversion}/doceditor +#/usr/lib/lazarus/%{lazarusversion}/ide +/usr/lib/lazarus/%{lazarusversion}/ideintf +/usr/lib/lazarus/%{lazarusversion}/lcl/units/*/*.ppu +/usr/lib/lazarus/%{lazarusversion}/lcl/units/*/*.o +/usr/lib/lazarus/%{lazarusversion}/packager +/usr/lib/lazarus/%{lazarusversion}/units diff --git a/debian/lcl-utils.install.in b/debian/lcl-utils.install.in new file mode 100644 index 0000000000..169904e6a2 --- /dev/null +++ b/debian/lcl-utils.install.in @@ -0,0 +1,8 @@ +/etc/lazarus +/usr/lib/lazarus/%{lazarusversion}/lazbuild +/usr/lib/lazarus/%{lazarusversion}/tools +/usr/share/man/man1/lazbuild.1 +/usr/share/man/man1/lazres.1 +/usr/share/man/man1/lrstolfm.1 +/usr/share/man/man1/svn2revisioninc.1 +/usr/share/man/man1/updatepofiles.1 diff --git a/debian/lcl-utils.links.in b/debian/lcl-utils.links.in new file mode 100644 index 0000000000..2de52ca4f5 --- /dev/null +++ b/debian/lcl-utils.links.in @@ -0,0 +1,5 @@ +/usr/lib/lazarus/%{lazarusversion}/lazbuild /usr/bin/lazbuild +/usr/lib/lazarus/%{lazarusversion}/tools/lazres /usr/bin/lazres +/usr/lib/lazarus/%{lazarusversion}/tools/lrstolfm /usr/bin/lrstolfm +/usr/lib/lazarus/%{lazarusversion}/tools/svn2revisioninc /usr/bin/svn2revisioninc +/usr/lib/lazarus/%{lazarusversion}/tools/updatepofiles /usr/bin/updatepofiles diff --git a/debian/overrides/lazarus-ide b/debian/overrides/lazarus-ide index 96f6c8695c..e69de29bb2 100644 --- a/debian/overrides/lazarus-ide +++ b/debian/overrides/lazarus-ide @@ -1,4 +0,0 @@ -# The Free Pascal Compiler does not properly support linking. Please -# see BTS #472304. The zlib functionality is provided without a proper -# way to turn it off. -lazarus-ide: embedded-zlib diff --git a/debian/overrides/lazarus-ide-gtk2 b/debian/overrides/lazarus-ide-gtk2 new file mode 100644 index 0000000000..a3ce8a50e1 --- /dev/null +++ b/debian/overrides/lazarus-ide-gtk2 @@ -0,0 +1,4 @@ +# The Free Pascal Compiler does not properly support linking. Please +# see BTS #472304. The zlib functionality is provided without a proper +# way to turn it off. +lazarus-ide-gtk2: embedded-zlib diff --git a/debian/overrides/lazarus-ide-qt4 b/debian/overrides/lazarus-ide-qt4 new file mode 100644 index 0000000000..a4de8ab8a1 --- /dev/null +++ b/debian/overrides/lazarus-ide-qt4 @@ -0,0 +1,4 @@ +# The Free Pascal Compiler does not properly support linking. Please +# see BTS #472304. The zlib functionality is provided without a proper +# way to turn it off. +#lazarus-ide-qt4: embedded-zlib diff --git a/debian/overrides/lazarus-src b/debian/overrides/lazarus-src deleted file mode 100644 index da803fd7cc..0000000000 --- a/debian/overrides/lazarus-src +++ /dev/null @@ -1,2 +0,0 @@ -# Lazarus needs to have the architecture independent file in /usr/lib. -lazarus-src binary: image-file-in-usr-lib diff --git a/debian/overrides/lcl-utils b/debian/overrides/lcl-utils new file mode 100644 index 0000000000..8966f82ddd --- /dev/null +++ b/debian/overrides/lcl-utils @@ -0,0 +1,4 @@ +# The Free Pascal Compiler does not properly support linking. Please +# see BTS #472304. The zlib functionality is provided without a proper +# way to turn it off. +lcl-utils: embedded-zlib diff --git a/debian/patches/02_components.diff b/debian/patches/02_components.diff index c700d94f49..e92c71b1c3 100755 --- a/debian/patches/02_components.diff +++ b/debian/patches/02_components.diff @@ -9,8 +9,8 @@ Index: components/Makefile.fpc # [target] --dirs=synedit codetools -+dirs=synedit codetools cgi cgi/ide printers printers/design fpcunit fpcunit/ide memds projecttemplates rtticontrols sdf sqldb tachart tdbf turbopower_ipro jcf2/IdePlugin/lazarus chmhelp/packages/help chmhelp/packages/idehelp +-dirs=synedit codetools lazcontrols ++dirs=synedit codetools lazcontrols cgi cgi/ide printers printers/design fpcunit fpcunit/ide memds projecttemplates rtticontrols sdf sqldb tachart tdbf turbopower_ipro jcf2/IdePlugin/lazarus todolist chmhelp/packages/help chmhelp/packages/idehelp [clean] files=$(wildcard ./units/*$(OEXT)) \ diff --git a/debian/patches/default_config.diff b/debian/patches/default_config.diff index b9e167d257..7cd56fa63d 100644 --- a/debian/patches/default_config.diff +++ b/debian/patches/default_config.diff @@ -1,30 +1,32 @@ This patch fixes system wide default Lazarus configuration. It adds the needed configuration to adapt Lazarus to Debian and makes it running out of the box without need of any user's pre-configuration. -Index: lazarus-0.9.28.2/tools/install/linux/helpoptions.xml -=================================================================== + --- lazarus-0.9.28.2.orig/tools/install/linux/helpoptions.xml +++ lazarus-0.9.28.2/tools/install/linux/helpoptions.xml -@@ -0,0 +1,25 @@ +@@ -0,0 +1,28 @@ + + + + ++ ++ ++ + + + -+ ++ + + + + -+ ++ + + -+ ++ + + -+ ++ + + + diff --git a/debian/rules b/debian/rules index ea3a0f89c5..ab2e196e5e 100755 --- a/debian/rules +++ b/debian/rules @@ -55,7 +55,7 @@ ifndef FPCDIR export FPCDIR=/usr/share/fpcsrc/${FPCVER} endif # Configure patch system -export QUILT_PATCHES=debian/patches +include /usr/share/quilt/quilt.make #export DH_VERBOSE=1 @@ -82,17 +82,8 @@ clean-patched: ${RM} lazarus startlazarus lazbuild $(MAKE) distclean ${BUILDOPTS} $(MAKE) -C docs/html clean - find '(' -name '*.a' -or -name '*.o' -or -name '*.so' -or -name '*.ppu' ')' -exec ${RM} '{}' ';' + find -regex '.*\.\(a\|o\|so\.*\|ppu\)' -delete -patch: patch-stamp - -patch-stamp: - test ! -s ${QUILT_PATCHES}/series || quilt push -a - touch patch-stamp - -unpatch: - test ! -s ${QUILT_PATCHES}/series || quilt pop -a - rm -rf patch-stamp debian/patched ################### # Debian files @@ -127,6 +118,7 @@ build-arch-stamp: dh_testdir $(MAKE) lcl packager/registration ideintf bigidecomponents examples $(BUILDOPTS) $(MAKE) bigide USESVN2REVISIONINC=0 $(BUILDOPTS) + mv $(CURDIR)/lazarus $(CURDIR)/lazarus-gtk2 $(MAKE) lazbuilder $(BUILDOPTS) $(MAKE) tools $(BUILDOPTS) touch build-arch-stamp @@ -143,7 +135,7 @@ install-arch-stamp: install -d $(INSTALL_DIR)/usr/lib/lazarus/${DEB_UPSTREAM_MAIN_VERSION}/tools # Install the IDE & its accessories ${CP} -t $(INSTALL_DIR)/usr/lib/lazarus/${DEB_UPSTREAM_MAIN_VERSION} \ - $(CURDIR)/lazarus \ + $(CURDIR)/lazarus-gtk2 \ $(CURDIR)/lazbuild \ $(CURDIR)/startlazarus \ $(CURDIR)/languages @@ -153,7 +145,7 @@ install-arch-stamp: $(CURDIR)/tools/svn2revisioninc \ $(CURDIR)/tools/updatepofiles # Install the library files - find -name '*.ppu' -or -name '*.[oa]' -or -name '*.so*' | xargs ${CP} --parents -t $(INSTALL_DIR)/usr/lib/lazarus/${DEB_UPSTREAM_MAIN_VERSION} + find -regex '.*\.\(a\|o\|so\.*\|ppu\)' | xargs ${CP} --parents -t $(INSTALL_DIR)/usr/lib/lazarus/${DEB_UPSTREAM_MAIN_VERSION} # copy icons and menu entries for the GNOME menu install -d $(INSTALL_DIR)/usr/share/pixmaps install -d $(INSTALL_DIR)/usr/share/applications @@ -172,6 +164,7 @@ install-arch-stamp: $(CURDIR)/docs/Contributors.txt \ $(CURDIR)/docs/contributors.utf8 \ $(CURDIR)/docs/acknowledgements.txt + # Install lintian override files set -x; cd debian/overrides ; for PACKAGE in * ; do \ if [ -d ../$${PACKAGE} ] ; \ then \ @@ -179,6 +172,7 @@ install-arch-stamp: ../$${PACKAGE}/usr/share/lintian/overrides/$${PACKAGE} ; \ fi ; \ done + find ${INSTALL_DIR} -empty -delete touch install-arch-stamp arrange-arch: install-arch arrange-arch-stamp @@ -196,7 +190,7 @@ install-indep: # Documentation # -build-doc: build-arch build-doc-stamp +build-doc: patch debian-files build-doc-stamp build-doc-stamp: @echo "--- Building Documentation" dh_testdir @@ -213,6 +207,7 @@ install-doc-stamp: cd docs ; ${CP} --parents -t ${DOC_DIR} \ index.html \ images/laztitle.png + find ${DOC_DIR} -empty -delete touch install-doc-stamp ################### @@ -240,8 +235,9 @@ install-source-stamp: $(CURDIR)/packager \ $(CURDIR)/test \ $(CURDIR)/tools - find $(INSTALL_DIR) -name '*.bmp' -exec chmod 644 '{}' ';' + find ${SRC_DIR} -regex '.*\.\(bmp\|jpg\|png\|xpm\)' -delete $(RM) ${SRC_DIR}/components/lazreport/license*.txt + find ${SRC_DIR} -empty -delete touch install-source-stamp ################### @@ -257,13 +253,14 @@ binary: binary-arch binary-indep # Deb building # -binary-indep: build-doc install-doc clean-patched install-source debian-files +binary-indep: clean-patched build-doc install-doc install-source debian-files @echo "--- Building: arch-indep packages" dh_testdir dh_testroot - dh_installdocs -i + dh_installdocs -i -X.in dh_installchangelogs -i dh_install -i --sourcedir=debian/tmp --list-missing + # Install lintian override files set -x; cd debian/overrides ; for PACKAGE in * ; do \ if [ -d ../$${PACKAGE} ] ; \ then \ @@ -304,4 +301,4 @@ binary-arch: arrange-arch configure get-orig-source: - sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION) + -uscan --upstream-version=0 --rename diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000000..163aaf8d82 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)