* Synchronized Debian package building rules with official Debian.

git-svn-id: trunk@22658 -
This commit is contained in:
mazen 2009-11-17 22:07:12 +00:00
parent 096257d424
commit bd57bbe661
10 changed files with 144 additions and 35 deletions

2
.gitattributes vendored
View File

@ -2207,6 +2207,7 @@ converter/delphiunit2laz.lrs svneol=native#text/pascal
converter/delphiunit2laz.pas svneol=native#text/pascal
converter/lazxmlforms.pas svneol=native#text/plain
debian/README.Debian svneol=native#text/plain
debian/README.source svneol=native#text/plain
debian/changelog svneol=native#text/plain
debian/compat svneol=native#text/plain
debian/control svneol=native#text/plain
@ -2225,6 +2226,7 @@ debian/overrides/lazarus-ide svneol=native#text/plain
debian/overrides/lazarus-src 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/watch svneol=native#text/plain

11
debian/README.source vendored Normal file
View File

@ -0,0 +1,11 @@
Debian specific changes to Lazarus sources.
-------------------------------------------
This version of Lazarus was modified by Debian maintainer. All modifications
are avaialble in debian/patches directory.
For more information about Debian change policy, please refer to
/usr/share/doc/quilt/README.source.
-- Abou Al Montacir <abo.almontacir@sfr.fr> Fri, 23 Oct 2009 08:50:53 +0200

91
debian/changelog vendored
View File

@ -2,19 +2,60 @@ lazarus (0.9.29-0) unstable; urgency=low
* Snapshot building.
-- Mazen Neifer <mazen@freepascal.org> Thu, 20 Aug 2009 11:50:00 +0200
-- Abou Al Montacir <abou.almontacir@sfr.fr> Sat, 17 Nov 2009 20:08:00 +0100
lazarus (0.9.27-0) unstable; urgency=low
lazarus (0.9.28.2-3) unstable; urgency=low
* Snapshot building.
* Added missing online help default page. (Closes: Bug#537576)
-- Mazen Neifer <mazen@freepascal.org> Mon, 28 Apr 2009 22:33:00 +0200
-- Abou Al Montacir <abou.almontacir@sfr.fr> Sat, 14 Nov 2009 10:08:00 +0100
lazarus (0.9.26.2-3) unstable; urgency=low
lazarus (0.9.28.2-2) unstable; urgency=low
* Fixed linitan error.
* Fixed default help configuration.
* Fixed short description. (Closes: Bug#533420)
* Put sources back to Lazarus directory.
* Fixed strict dependency issue of lazarus package on lazarus-ide package
making package lazarus not installable. (Closes: Bug#555649)
-- Mazen Neifer <mazen@freepascal.org> Wed, 17 Jun 2009 00:49:00 +0200
-- Abou Al Montacir <abou.almontacir@sfr.fr> Mon, 09 Nov 2009 09:12:00 +0100
lazarus (0.9.28.2-1) unstable; urgency=low
* Fixed compiling a test application without saving (missing project1.lrs)
* Fixed Lazarus directory set by deb package
* Fixed conflicting key definitions related to persistent block
* Fixed quick paste selection
* Fixed endless auto sizing loop when opening project (issue 14862)
-- Abou Al Montacir <abou.almontacir@sfr.fr> Mon, 02 Nov 2009 18:54:00 +0100
lazarus (0.9.28-1) unstable; urgency=low
* Allow Debian maintainers (DM) to upload.
* Applied patch from BTS fixing short description. (Closes: Bug#533420)
* Bumped standard version, removed legacy dh_desktop, added README.source and
fixed dependencies.
* New upstream version 0.9.28. (Closes: Bug#551724)
* LCL now uses gtk2 as default widgetset on Linux and BSD
* Windows CE: Implemented TCalendar, TFloatSpinEdit, TOpenDialog and
TSaveDialog
* TFrame support. Visually nesting in the IDE.
* TMonitor class: multi-monitor support
* New components: TShellTreeView, TShellListView and TFilterComboBox
* Refactoring of LCL reduced minimum size of executables by about 15%
* New IDE options dialog combines environments, editor, codetools, code
explorer, debugger and help options.
* Application icon has been added to the Project Options
* Many source editor improvements like display of "double width" fonts
(Eastern, Japanese, Chinese, Arabic, ...), better code folding,
highlighting, syncro editing, persistent blocks ...
* Codetools: removing empty methods, block completion, update references when
renaming a unit
* Debugger: assembler windows, easier exception handling, breakpoint
properties
-- Abou Al Montacir <abou.almontacir@sfr.fr> Wed, 25 Oct 2009 11:59:00 +0100
lazarus (0.9.26.2-2) unstable; urgency=low
@ -24,7 +65,7 @@ lazarus (0.9.26.2-2) unstable; urgency=low
* Updated FPC version required for building and using Lazarus to fix crash
on power PC architecture.
-- Mazen Neifer <mazen@freepascal.org> Fri, 05 Jun 2009 23:49:00 +0200
-- Abou Al Montacir <abou.almontacir@sfr.fr> Fri, 05 Jun 2009 23:49:00 +0200
lazarus (0.9.26.2-1) unstable; urgency=low
@ -34,14 +75,14 @@ lazarus (0.9.26.2-1) unstable; urgency=low
* Fixed bug in code tool making LFM tree search for properties not working.
* Made mouse events propagated from controls to their parents until handled.
-- Mazen Neifer <mazen@freepascal.org> Wed, 17 Feb 2009 16:17:00 +0100
-- Abou Al Montacir <abou.almontacir@sfr.fr> Wed, 17 Feb 2009 16:17:00 +0100
lazarus (0.9.26-4) unstable; urgency=low
* Removed .pc directory in clean target to avoid a lintian warning.
* Fixed bugs in tray icon.
-- Mazen Neifer <mazen@freepascal.org> Sun, 14 Dec 2008 14:40:00 +0100
-- Abou Al Montacir <abou.almontacir@sfr.fr> Sun, 14 Dec 2008 14:40:00 +0100
lazarus (0.9.26-3) unstable; urgency=low
@ -51,7 +92,7 @@ lazarus (0.9.26-3) unstable; urgency=low
* Removed non standard entry from desktop file.
* Used quilt as patch system instead of dpatch.
-- Mazen Neifer <mazen@freepascal.org> Tue, 09 Dec 2008 13:09:00 +0100
-- Abou Al Montacir <abou.almontacir@sfr.fr> Tue, 09 Dec 2008 13:09:00 +0100
lazarus (0.9.26-2) unstable; urgency=low
@ -69,11 +110,11 @@ lazarus (0.9.26-2) unstable; urgency=low
* Fixed dependencies in rules file speeding package generation by avoiding
rebuilding binaries up to four times.
-- Mazen Neifer <mazen@freepascal.org> Sun, 04 Nov 2008 00:22:00 +0100
-- Abou Al Montacir <abou.almontacir@sfr.fr> Sun, 04 Nov 2008 00:22:00 +0100
lazarus (0.9.26-1) unstable; urgency=low
[ Mazen Neifer ]
[ Abou Al Montacir ]
* New upstream version.
* Fixed lintian error due to initial sources containing debian/files.
* Fixed find expression precedence in clean target.
@ -95,7 +136,7 @@ lazarus (0.9.24-0-12) unstable; urgency=low
* Removed false warning on read only sources when recompiling end used local
copy.
-- Mazen Neifer <mazen@freepascal.org> Mon, 25 Aug 2008 17:42:00 +0200
-- Abou Al Montacir <abou.almontacir@sfr.fr> Mon, 25 Aug 2008 17:42:00 +0200
lazarus (0.9.24-0-11) unstable; urgency=low
@ -106,7 +147,7 @@ lazarus (0.9.24-0-11) unstable; urgency=low
lazarus (0.9.24-0-10) unstable; urgency=low
[ Mazen Neifer ]
[ Abou Al Montacir ]
* Fixed clean target.
* Added system wide default configuration file.
* Fixed comments in dpatch files.
@ -120,19 +161,19 @@ lazarus (0.9.24-0-10) unstable; urgency=low
lazarus (0.9.24-0-9) unstable; urgency=low
[ Torsten Werner ]
* Fix email address of Mazen in debian/control.
* Fix email address of Abou Al Montacir in debian/control.
[ Mazen Neifer ]
[ Abou Al Montacir ]
* Adapted FPCDIR default value to new fpc-source directory.
(Closes: #484195)
* Added support of multiple FPC installed releases.
* Added verbose option to dpatch.
-- Mazen Neifer <mazen@freepascal.org> Thu, 29 May 2008 01:05:28 +0200
-- Abou Al Montacir <abou.almontacir@sfr.fr> Thu, 29 May 2008 01:05:28 +0200
lazarus (0.9.24-0-8) unstable; urgency=low
[ Mazen Neifer ]
[ Abou Al Montacir ]
* Added patch from upstream fixing compilation using lazbuild by making it
generating LRS files from LFM files.
* Added gdb as recommended package. (closes: #477293)
@ -143,23 +184,23 @@ lazarus (0.9.24-0-8) unstable; urgency=low
and fpc-source (>= 2.2.0-dfsg1-8)
* Added fp-docs to list of package lazarus suggest packages.
-- Mazen Neifer <mazen@freepascal.org> Wed, 30 Apr 2008 14:17:06 +0200
-- Abou Al Montacir <abou.almontacir@sfr.fr> Wed, 30 Apr 2008 14:17:06 +0200
lazarus (0.9.24-0-7) unstable; urgency=low
[ Mazen Neifer ]
[ Abou Al Montacir ]
* Added a link of lazbuild tool into /usr/bin
* Added man pages for binaries.
* Fixed compilation of printer support component.
[ Torsten Werner ]
* Add Mazen to Uploaders.
* Add Abou Al Montacir to Uploaders.
-- Torsten Werner <twerner@debian.org> Sun, 20 Apr 2008 17:06:38 +0200
lazarus (0.9.24-0-6) unstable; urgency=low
[ Mazen Neifer ]
[ Abou Al Montacir ]
* Split lazarus package into sevaral packages
+ lazarus-ide : for IDE and binary files
+ lazarus-src : for source files
@ -178,7 +219,7 @@ lazarus (0.9.24-0-5) unstable; urgency=low
* Fixed 'make distclean' to ensure all generated files are deleted.
-- Mazen Neifer <mazen@freepascal.org> Sat, 16 Feb 2008 10:47:12 +0100
-- Abou Al Montacir <abou.almontacir@sfr.fr> Sat, 16 Feb 2008 10:47:12 +0100
lazarus (0.9.24-0-4) unstable; urgency=low
@ -198,7 +239,7 @@ lazarus (0.9.24-0-3) unstable; urgency=low
* Change Standards-Version: 3.7.3.
* Refer to GPL-2 and LGPL-2 in debian/copyright.
[ Mazen Neifer ]
[ Abou Al Montacir ]
* Include README.Debian file for docs
* Run fpcmake before building to ensure correct target dependencies
* Include Copyright file

13
debian/control vendored
View File

@ -2,8 +2,9 @@ Source: lazarus
Section: devel
Priority: optional
Maintainer: Carlos Laviola <claviola@debian.org>
Uploaders: Torsten Werner <twerner@debian.org>, Mazen Neifer <mazen@freepascal.org>
Standards-Version: 3.8.0
Uploaders: Torsten Werner <twerner@debian.org>, Abou Al Montacir <abou.almontacir@sfr.fr>
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
Vcs-Svn: https://bollin.googlecode.com/svn/lazarus/trunk
@ -13,8 +14,8 @@ 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:Upstream-Version})
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
@ -46,6 +47,7 @@ Package: lazarus-src
Section: devel
Architecture: all
Pre-Depends: dpkg (>= 1.10.24)
Suggests: lazarus-ide
Description: IDE for Free Pascal to create (graphical and console) applications
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
@ -70,7 +72,7 @@ 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, fp-units-misc,
fp-units-rtl, fp-units-fcl, fp-units-gtk2,
${fpc-abi:Depends}, lazarus-src
Recommends: fpc, gdb
Suggests: fp-utils
@ -96,6 +98,7 @@ Description: IDE for Free Pascal to create (graphical and console) applications
Package: lazarus-doc
Section: doc
Architecture: all
Suggests: lazarus-ide
Description: IDE for Free Pascal to create (graphical and console) applications
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

View File

@ -1 +1,3 @@
/usr/share/doc/lazarus/%{lazarusversion}/index.html
/usr/share/doc/lazarus/%{lazarusversion}/images
/usr/share/doc/lazarus/%{lazarusversion}/lcl

View File

@ -4,6 +4,7 @@
/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

View File

@ -28,7 +28,7 @@ diff -urNad lazarus-0.9.26.1-0~/Makefile.fpc lazarus-0.9.26.1-0/Makefile.fpc
idepkg:
$(MAKE) -C ide idepkg
@@ -81,8 +77,7 @@
@@ -82,8 +78,7 @@
#-----------------------------------------------------------------------------
tools: lcl

33
debian/patches/default_config.diff vendored Normal file
View File

@ -0,0 +1,33 @@
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 @@
+<?xml version="1.0"?>
+<CONFIG>
+ <HelpOptions>
+ <Version Value="1"/>
+ </HelpOptions>
+ <Viewers>
+ <THTMLBrowserHelpViewer>
+ <Browser Path="/usr/bin/epiphany"/>
+ </THTMLBrowserHelpViewer>
+ </Viewers>
+ <Databases>
+ <StartPage>
+ <BaseURL Value="file:///usr/share/doc/lazarus/%LazarusVersion%/lcl"/>
+ </StartPage>
+ <RTLUnits>
+ <BaseURL Value="file:///usr/share/doc/fp-docs/rtl"/>
+ </RTLUnits>
+ <FCLUnits>
+ <BaseURL Value="file:///usr/share/doc/fp-docs/fcl"/>
+ </FCLUnits>
+ <LCLUnits>
+ <BaseURL Value="file:///usr/share/doc/lazarus/%LazarusVersion%/lcl"/>
+ </LCLUnits>
+ </Databases>
+</CONFIG>

View File

@ -1,2 +1,3 @@
01_topmakefile.diff
02_components.diff
default_config.diff

23
debian/rules vendored
View File

@ -165,12 +165,20 @@ install-arch-stamp:
# Install configuration files
${MKDIR} $(INSTALL_DIR)/etc/lazarus
fpcsubst -d LazarusVersion=${DEB_UPSTREAM_MAIN_VERSION} -i ${CURDIR}/tools/install/linux/environmentoptions.xml -o $(INSTALL_DIR)/etc/lazarus/environmentoptions.xml
fpcsubst -d LazarusVersion=${DEB_UPSTREAM_MAIN_VERSION} -i ${CURDIR}/tools/install/linux/helpoptions.xml -o $(INSTALL_DIR)/etc/lazarus/helpoptions.xml
# Install contributer list
install -d $(INSTALL_DIR)/usr/lib/lazarus/${DEB_UPSTREAM_MAIN_VERSION}/docs
${CP} -t $(INSTALL_DIR)/usr/lib/lazarus/${DEB_UPSTREAM_MAIN_VERSION}/docs \
$(CURDIR)/docs/Contributors.txt \
$(CURDIR)/docs/contributors.utf8 \
$(CURDIR)/docs/acknowledgements.txt
set -x; cd debian/overrides ; for PACKAGE in * ; do \
if [ -d ../$${PACKAGE} ] ; \
then \
install -m644 -D $${PACKAGE} \
../$${PACKAGE}/usr/share/lintian/overrides/$${PACKAGE} ; \
fi ; \
done
touch install-arch-stamp
arrange-arch: install-arch arrange-arch-stamp
@ -202,6 +210,9 @@ install-doc-stamp:
dh_testroot
dh_prep
${MAKE} -C docs/html ${DOCTYPE}install INSTALL_PREFIX=${INSTALL_DIR}/usr INSTALL_DOCDIR=${DOC_DIR}
cd docs ; ${CP} --parents -t ${DOC_DIR} \
index.html \
images/laztitle.png
touch install-doc-stamp
###################
@ -230,7 +241,7 @@ install-source-stamp:
$(CURDIR)/test \
$(CURDIR)/tools
find $(INSTALL_DIR) -name '*.bmp' -exec chmod 644 '{}' ';'
$(RM) $(INSTALL_DIR)/usr/lib/lazarus/${DEB_UPSTREAM_MAIN_VERSION}/components/lazreport/license*.txt
$(RM) ${SRC_DIR}/components/lazreport/license*.txt
touch install-source-stamp
###################
@ -253,8 +264,13 @@ binary-indep: build-doc install-doc clean-patched install-source debian-files
dh_installdocs -i
dh_installchangelogs -i
dh_install -i --sourcedir=debian/tmp --list-missing
install -m644 -D debian/overrides/lazarus-src \
debian/lazarus-src/usr/share/lintian/overrides/lazarus-src
set -x; cd debian/overrides ; for PACKAGE in * ; do \
if [ -d ../$${PACKAGE} ] ; \
then \
install -m644 -D $${PACKAGE} \
../$${PACKAGE}/usr/share/lintian/overrides/$${PACKAGE} ; \
fi ; \
done
dh_compress -i -X.pdf
dh_fixperms -i
dh_installdeb -i
@ -273,7 +289,6 @@ binary-arch: arrange-arch
dh_installmenu
fpc-depends
dh_installman -s
dh_desktop
dh_strip -s
dh_compress -a
dh_fixperms -a