mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-04 01:00:15 +02:00
* Synchronized with official Debian scripts.
* Fixed package building caused by modification of turbopower_ipro. git-svn-id: trunk@17881 -
This commit is contained in:
mazen
parent
a4326b440c
commit
c39f263237
7
.gitattributes
vendored
7
.gitattributes
vendored
@ -1571,7 +1571,6 @@ debian/dirs svneol=native#text/plain
|
||||
debian/docs svneol=native#text/plain
|
||||
debian/install.sh svneol=native#text/plain
|
||||
debian/lazarus-doc.install svneol=native#text/plain
|
||||
debian/lazarus-ide.conffiles svneol=native#text/plain
|
||||
debian/lazarus-ide.install svneol=native#text/plain
|
||||
debian/lazarus-ide.links svneol=native#text/plain
|
||||
debian/lazarus-ide.menu svneol=native#text/plain
|
||||
@ -1582,9 +1581,9 @@ debian/menu svneol=native#text/plain
|
||||
debian/move-usr-lib.sh svneol=native#text/plain
|
||||
debian/orig-tar.sh svneol=native#text/plain
|
||||
debian/overrides/lazarus-src svneol=native#text/plain
|
||||
debian/patches/00list svneol=native#text/plain
|
||||
debian/patches/01_topmakefile.dpatch svneol=native#text/plain
|
||||
debian/patches/02_components.dpatch svneol=native#text/plain
|
||||
debian/patches/01_topmakefile.diff svneol=native#text/plain
|
||||
debian/patches/02_components.diff svneol=native#text/plain
|
||||
debian/patches/series svneol=native#text/plain
|
||||
debian/rules svneol=native#text/plain
|
||||
debian/watch svneol=native#text/plain
|
||||
debugger/assemblerdlg.lfm svneol=native#text/pascal
|
||||
|
||||
27
debian/changelog
vendored
27
debian/changelog
vendored
@ -2,13 +2,34 @@ lazarus (0.9.27-0) unstable; urgency=low
|
||||
|
||||
* Snapshot building.
|
||||
|
||||
-- Mazen Neifer <mazen@freepascal.org> Thu, 06 Nov 2008 13:45:00 +0100
|
||||
-- Mazen Neifer <mazen@freepascal.org> Mon, 22 Dec 2008 10:22: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
|
||||
|
||||
lazarus (0.9.26-3) unstable; urgency=low
|
||||
|
||||
* Added man files for all provided binaries. (Closes: #500858)
|
||||
* Remove auto-generated make files in clean target to avoid lintian warning.
|
||||
(Closes: Bug#508025)
|
||||
* 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
|
||||
|
||||
lazarus (0.9.26-2) unstable; urgency=low
|
||||
|
||||
* Removed taborder binary from lazarus-src which removes a lintian warning.
|
||||
* Fixed build of arch independent packages as debian/files was removed before
|
||||
they were created.
|
||||
* replaced depreciated dh_clean -k by dh_prep.
|
||||
* Fixed syntax error in script file.
|
||||
* Fixed minor issues in man pages from upstream.
|
||||
* Removed leading "Lazarus is a" from Description field. (Closes: #502786)
|
||||
* Put system wide configuration file in conffiles to avoid loosing user's
|
||||
customizations.
|
||||
* Added svn2revision to packaged binaries needed by Lazarus when rebuilding
|
||||
itself after installation of new components. (Closes: #501049)
|
||||
* Added contributers list to lazarus-ide packages as they are needed by the
|
||||
|
||||
6
debian/control
vendored
6
debian/control
vendored
@ -4,8 +4,8 @@ Priority: optional
|
||||
Maintainer: Carlos Laviola <claviola@debian.org>
|
||||
Uploaders: Torsten Werner <twerner@debian.org>, Mazen Neifer <mazen@freepascal.org>
|
||||
Standards-Version: 3.8.0
|
||||
Build-Depends: debhelper (>= 5), dpatch, fpc (>= 2.2.2-3), fpc-source (>= 2.2.2-3),
|
||||
fp-units-i386 [i386], fp-utils, imagemagick, libgdk-pixbuf-dev
|
||||
Build-Depends: debhelper (>= 5), quilt, fpc (>= 2.2.2-5), fpc-source (>= 2.2.2-5),
|
||||
fp-utils, imagemagick, libgdk-pixbuf-dev
|
||||
Vcs-Svn: https://bollin.googlecode.com/svn/lazarus/trunk
|
||||
Vcs-Browser: http://bollin.googlecode.com/svn/lazarus/trunk
|
||||
Homepage: http://www.lazarus.freepascal.org
|
||||
@ -67,7 +67,7 @@ Description: IDE to create (graphical and console) applications with Free
|
||||
Package: lazarus-ide
|
||||
Architecture: i386 powerpc sparc amd64 arm
|
||||
Pre-Depends: dpkg (>= 1.10.24)
|
||||
Depends: ${shlibs:Depends}, fp-compiler (>= 2.2.2-3), fp-units-base, fp-units-rtl,
|
||||
Depends: ${shlibs:Depends}, fp-compiler (>= 2.2.2-5), fp-units-base, fp-units-rtl,
|
||||
fp-units-fcl, fp-units-gtk, libgtk1.2-dev, libgdk-pixbuf-dev,
|
||||
${fpc-abi:Depends}, lazarus-src
|
||||
Recommends: fp-units-db, fp-units-gfx, fp-units-gnome1, fp-units-misc,
|
||||
|
||||
1
debian/lazarus-ide.conffiles
vendored
1
debian/lazarus-ide.conffiles
vendored
@ -1 +0,0 @@
|
||||
/etc/lazarus/environmentoptions.xml
|
||||
2
debian/patches/00list
vendored
2
debian/patches/00list
vendored
@ -1,2 +0,0 @@
|
||||
01_topmakefile
|
||||
02_components
|
||||
@ -1,11 +1,6 @@
|
||||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 06_unit_dbase.dpatch by <Mazen Neifer <mazen.neifer@supaero.org>>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: This patch fixes dist_clean target used to remove generated
|
||||
## DP: files before packaging sources.
|
||||
This patch fixes dist_clean target used to remove generated files before
|
||||
packaging sources.
|
||||
|
||||
@DPATCH@
|
||||
Index: Makefile.fpc
|
||||
===================================================================
|
||||
--- lazarus~/Makefile.fpc (révision 16588)
|
||||
@ -19,7 +14,7 @@ Index: Makefile.fpc
|
||||
exampledirs=examples
|
||||
|
||||
[compiler]
|
||||
@@ -40,13 +40,9 @@
|
||||
@@ -45,13 +45,9 @@
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
[rules]
|
||||
@ -34,7 +29,7 @@ Index: Makefile.fpc
|
||||
idepkg:
|
||||
$(MAKE) -C ide idepkg
|
||||
|
||||
@@ -76,7 +72,6 @@
|
||||
@@ -81,7 +77,6 @@
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
tools: lcl components
|
||||
@ -42,12 +37,3 @@ Index: Makefile.fpc
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
examples: lcl components
|
||||
@@ -128,7 +123,7 @@
|
||||
ln -sf $(LAZARUS_INSTALL_DIR)/lazarus $(INSTALL_PREFIX)/bin/lazarus-ide
|
||||
ln -sf $(LAZARUS_INSTALL_DIR)/startlazarus $(INSTALL_PREFIX)/bin/startlazarus
|
||||
ln -sf $(LAZARUS_INSTALL_DIR)/lazbuild $(INSTALL_PREFIX)/bin/lazbuild
|
||||
- cat $(LAZARUS_INSTALL_DIR)/docs/lazbuild.1 | gzip > $(INSTALL_MAN_DIR)/man1/lazbuild.1.gz
|
||||
+ cat $(LAZARUS_INSTALL_DIR)/install/man/man1/lazbuild.1 | gzip > $(INSTALL_MAN_DIR)/man1/lazbuild.1.gz
|
||||
endif
|
||||
|
||||
|
||||
28
debian/patches/02_components.diff
vendored
Executable file
28
debian/patches/02_components.diff
vendored
Executable file
@ -0,0 +1,28 @@
|
||||
This patch fixes compilation of printer support units on architectures which do
|
||||
not have libc unit (ie all except i386).
|
||||
|
||||
Index: components/Makefile.fpc
|
||||
===================================================================
|
||||
--- lazarus~/components/Makefile.fpc (révision 15506)
|
||||
+++ lazarus/components/Makefile.fpc (copie de travail)
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
|
||||
[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
|
||||
|
||||
[clean]
|
||||
files=$(wildcard ./units/*$(OEXT)) \
|
||||
Index: components/turbopower_ipro/Makefile.fpc
|
||||
===================================================================
|
||||
--- lazarus~/components/turbopower_ipro/Makefile.fpc (révision 17880)
|
||||
+++ lazarus/components/turbopower_ipro/Makefile.fpc (copie de travail)
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
[target]
|
||||
units=turbopoweripro.pas
|
||||
+dirs=design
|
||||
|
||||
[clean]
|
||||
files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
|
||||
21
debian/patches/02_components.dpatch
vendored
21
debian/patches/02_components.dpatch
vendored
@ -1,21 +0,0 @@
|
||||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 06_unit_dbase.dpatch by <Mazen Neifer <mazen.neifer@supaero.org>>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: This patch fixes compilation of printer support units on architectures
|
||||
## DP: which do not have libc unit (ie all except i386).
|
||||
|
||||
@DPATCH@
|
||||
Index: components/Makefile.fpc
|
||||
===================================================================
|
||||
--- lazarus/components/Makefile.fpc (révision 15506)
|
||||
+++ lazarus/components/Makefile.fpc (copie de travail)
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
|
||||
[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
|
||||
|
||||
[clean]
|
||||
files=$(wildcard ./units/*$(OEXT)) \
|
||||
2
debian/patches/series
vendored
Normal file
2
debian/patches/series
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
01_topmakefile.diff
|
||||
02_components.diff
|
||||
63
debian/rules
vendored
63
debian/rules
vendored
@ -2,28 +2,32 @@
|
||||
# debian/rules for Lazarus
|
||||
|
||||
DEB_DH_BUILDDEB_ARGS := -- -Z bzip2
|
||||
export DH_ALWAYS_EXCLUDE := COPYING:LICENSE
|
||||
export LANG:=C
|
||||
|
||||
# copied from cdbs:
|
||||
DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
|
||||
DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
|
||||
DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
|
||||
|
||||
# Define FPC
|
||||
ifndef FPC
|
||||
FPC=/usr/bin/fpc
|
||||
endif
|
||||
# Set FPCVER
|
||||
FPCVER=$(shell ${FPC} -iV)
|
||||
# Get version information from changelog file
|
||||
DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
|
||||
DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -f 1 -d -)
|
||||
# Get directories
|
||||
CURDIR:=$(shell pwd)
|
||||
BUILD_DIR=$(CURDIR)/debian/build
|
||||
INSTALL_DIR=$(CURDIR)/debian/tmp
|
||||
DOC_DIR=${INSTALL_DIR}/usr/share/doc/lazarus
|
||||
SRC_DIR=$(INSTALL_DIR)/usr/lib/lazarus
|
||||
# Get utils
|
||||
ifndef MKDIR
|
||||
MKDIR=mkdir -p
|
||||
endif
|
||||
ifndef CP
|
||||
CP=cp -Rfpl
|
||||
endif
|
||||
RM:=rm -rf
|
||||
ifndef LAZBUILD
|
||||
LAZBUILD=lazbuild
|
||||
endif
|
||||
@ -38,6 +42,8 @@ endif
|
||||
ifndef FPCDIR
|
||||
export FPCDIR=/usr/share/fpcsrc/${FPCVER}
|
||||
endif
|
||||
# Configure patch system
|
||||
export QUILT_PATCHES=debian/patches
|
||||
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
@ -46,29 +52,35 @@ endif
|
||||
#
|
||||
|
||||
clean: patch configure clean-patched unpatch
|
||||
${RM} build-arch-stamp install-arch-stamp arrange-arch-stamp configure-stamp
|
||||
${RM} build-doc-stamp install-doc-stamp
|
||||
${RM} build-indep-stamp install-indep-stamp
|
||||
${RM} debian-files-stamp
|
||||
${RM} debian/files debian/docs debian/dirs debian/*.files debian/*.docs debian/*.examples debian/*.postinst debian/*.postrm
|
||||
${RM} .pc
|
||||
# Remove auto-generated version file.
|
||||
${RM} ide/version.inc
|
||||
# Remove auto-generated make files.
|
||||
find -name Makefile.fpc -execdir 'sh' '-c' '${RM} $$(basename {} .fpc)' ';'
|
||||
dh_clean
|
||||
clean-patched:
|
||||
@echo "--- Cleaning"
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
rm -f build-arch-stamp install-arch-stamp arrange-arch-stamp configure-stamp
|
||||
rm -f build-doc-stamp install-doc-stamp
|
||||
rm -f build-indep-stamp install-indep-stamp
|
||||
rm -f debian-files-stamp
|
||||
rm -f debian/files debian/docs debian/dirs debian/*.files debian/*.docs debian/*.examples debian/*.postinst debian/*.postrm
|
||||
rm -f lazarus startlazarus lazbuild
|
||||
${RM} lazarus startlazarus lazbuild
|
||||
$(MAKE) distclean
|
||||
$(MAKE) distclean LCL_PLATFORM=gtk2
|
||||
find '(' -name '*.a' -or -name '*.o' -or -name '*.so' -or -name '*.ppu' ')' -exec rm -f '{}' ';'
|
||||
dh_clean
|
||||
find '(' -name '*.a' -or -name '*.o' -or -name '*.so' -or -name '*.ppu' ')' -exec ${RM} '{}' ';'
|
||||
dh_prep
|
||||
|
||||
patch: patch-stamp
|
||||
|
||||
patch-stamp:
|
||||
dpatch apply-all -v
|
||||
quilt push -a || test $$? = 2
|
||||
touch patch-stamp
|
||||
|
||||
unpatch:
|
||||
dpatch deapply-all -v
|
||||
quilt pop -a || test $$? = 2
|
||||
rm -rf patch-stamp debian/patched
|
||||
|
||||
###################
|
||||
@ -92,8 +104,9 @@ configure-stamp:
|
||||
find -name Makefile.fpc -execdir 'sh' '-c' '${RM} $$(basename {} .fpc)' ';'
|
||||
# Regenrate make files using fpcmake.
|
||||
${FPCMAKE} -r -Tall
|
||||
# Add version.inc:
|
||||
# Remove auto-generated version file.
|
||||
${RM} ide/version.inc
|
||||
# Add version.inc:
|
||||
echo \'$(DEB_VERSION)\' > ide/version.inc
|
||||
touch configure-stamp
|
||||
|
||||
@ -113,24 +126,23 @@ install-arch-stamp:
|
||||
@echo "--- Installing"
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
# create all necessary directories
|
||||
install -d $(INSTALL_DIR)/usr/bin
|
||||
install -d $(INSTALL_DIR)/usr/lib/lazarus/tools
|
||||
# Install the IDE & its accessories
|
||||
cp -Rfpl -t $(INSTALL_DIR)/usr/lib/lazarus \
|
||||
${CP} -t $(INSTALL_DIR)/usr/lib/lazarus \
|
||||
$(CURDIR)/lazarus \
|
||||
$(CURDIR)/lazbuild \
|
||||
$(CURDIR)/startlazarus \
|
||||
$(CURDIR)/languages
|
||||
cp -Rfpl -t $(INSTALL_DIR)/usr/lib/lazarus/tools \
|
||||
${CP} -t $(INSTALL_DIR)/usr/lib/lazarus/tools \
|
||||
$(CURDIR)/tools/lazres \
|
||||
$(CURDIR)/tools/lrstolfm \
|
||||
$(CURDIR)/tools/svn2revisioninc \
|
||||
$(CURDIR)/tools/updatepofiles
|
||||
# Install the library files
|
||||
find -name '*.ppu' -or -name '*.[oa]' -or -name '*.so*' | xargs cp -Rfpl --parents -t $(INSTALL_DIR)/usr/lib/lazarus
|
||||
find -name '*.ppu' -or -name '*.[oa]' -or -name '*.so*' | xargs ${CP} --parents -t $(INSTALL_DIR)/usr/lib/lazarus
|
||||
# copy icons and menu entries for the GNOME menu
|
||||
install -d $(INSTALL_DIR)/usr/share/pixmaps
|
||||
install -d $(INSTALL_DIR)/usr/share/applications
|
||||
@ -144,7 +156,7 @@ install-arch-stamp:
|
||||
fpcsubst -d FPCVER=${FPCVER} -i ${CURDIR}/tools/install/linux/environmentoptions.xml -o $(INSTALL_DIR)/etc/lazarus/environmentoptions.xml
|
||||
# Install contributer list
|
||||
install -d $(INSTALL_DIR)/usr/lib/lazarus/docs
|
||||
cp -Rfpl -t $(INSTALL_DIR)/usr/lib/lazarus/docs \
|
||||
${CP} -t $(INSTALL_DIR)/usr/lib/lazarus/docs \
|
||||
$(CURDIR)/docs/Contributors.txt \
|
||||
$(CURDIR)/docs/contributors.utf8 \
|
||||
$(CURDIR)/docs/acknowledgements.txt
|
||||
@ -170,16 +182,15 @@ build-doc-stamp:
|
||||
@echo "--- Building Documentation"
|
||||
dh_testdir
|
||||
#$(MAKE) -C docs $(CONVERTER) $(BUILDOPTS) FPDOC=$(NEWFPDOC)
|
||||
touch build-indep-stamp
|
||||
touch build-doc-stamp
|
||||
|
||||
install-doc: build-doc install-doc-stamp
|
||||
install-doc-stamp:
|
||||
@echo "--- Installing Documentation"
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
install -d ${DOC_DIR}
|
||||
cp -Rfpl -t ${DOC_DIR} docs/*
|
||||
${CP} -t ${DOC_DIR} docs/*
|
||||
touch install-doc-stamp
|
||||
|
||||
###################
|
||||
@ -191,8 +202,8 @@ install-source-stamp:
|
||||
@echo "--- Cleaning the tree and copying the source code"
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
install -d $(INSTALL_DIR)/usr/lib/lazarus/
|
||||
cp -Rfpl -t $(INSTALL_DIR)/usr/lib/lazarus \
|
||||
${MKDIR} ${SRC_DIR}
|
||||
${CP} -t ${SRC_DIR} \
|
||||
$(CURDIR)/Makefile* \
|
||||
$(CURDIR)/components \
|
||||
$(CURDIR)/converter \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user