* Fixed Debian packages building.

git-svn-id: trunk@19674 -
This commit is contained in:
mazen 2009-04-28 22:20:15 +00:00
parent d7a7b1d976
commit c454c572c6
6 changed files with 28 additions and 25 deletions

9
debian/changelog vendored
View File

@ -2,7 +2,14 @@ lazarus (0.9.27-0) unstable; urgency=low
* Snapshot building.
-- Mazen Neifer <mazen@freepascal.org> Mon, 22 Dec 2008 10:22:00 +0100
-- Mazen Neifer <mazen@freepascal.org> Mon, 28 Apr 2009 22:33:00 +0200
lazarus (0.9.26.2-1) unstable; urgency=low
* New upstream version.
* Used GTK2 and dropped GTK1 dependency. (Closes: Bug#521326)
-- Mazen Neifer <mazen@freepascal.org> Wed, 17 Feb 2009 16:17:00 +0100
lazarus (0.9.26-4) unstable; urgency=low

12
debian/control vendored
View File

@ -5,7 +5,7 @@ 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), quilt, fpc (>= 2.2.2-5), fpc-source (>= 2.2.2-5),
fp-utils, imagemagick, libgdk-pixbuf-dev
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
@ -13,7 +13,8 @@ Homepage: http://www.lazarus.freepascal.org
Package: lazarus
Architecture: all
Pre-Depends: dpkg (>= 1.10.24)
Depends: lazarus-ide, lazarus-src, lazarus-doc
Depends: lazarus-ide (= ${binary:Version}), lazarus-src (= ${binary:Version}),
lazarus-doc (>= ${source:Upstream-Version})
Recommends: fpc, fpc-source
Suggests: fp-utils, fp-docs
Description: IDE for Free Pascal to create (graphical and console) applications
@ -67,11 +68,10 @@ 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-5), fp-units-base, fp-units-rtl,
fp-units-fcl, fp-units-gtk, libgtk1.2-dev, libgdk-pixbuf-dev,
Depends: ${shlibs:Depends}, fp-compiler (>= 2.2.2-5), fp-units-base,
fp-units-rtl, fp-units-fcl, fp-units-gtk2,
${fpc-abi:Depends}, lazarus-src
Recommends: fp-units-db, fp-units-gfx, fp-units-gnome1, fp-units-misc,
fp-units-net, fpc-source, gdb
Recommends: fpc, gdb
Suggests: fp-utils
Description: 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

@ -39,7 +39,6 @@
#/usr/lib/lazarus/components/images
#/usr/lib/lazarus/converter
#/usr/lib/lazarus/debugger
/usr/lib/lazarus/designer
/usr/lib/lazarus/docs/Contributors.txt
/usr/lib/lazarus/docs/contributors.utf8
/usr/lib/lazarus/docs/acknowledgements.txt

View File

@ -1,16 +1,13 @@
This patch fixes dist_clean target used to remove generated files before
packaging sources.
Index: Makefile.fpc
Index: lazarus/Makefile.fpc
===================================================================
--- lazarus~/Makefile.fpc (révision 16588)
--- lazarus/Makefile.fpc (révision 19673)
+++ lazarus/Makefile.fpc (copie de travail)
@@ -11,7 +11,7 @@
[target]
programs=lazarus startlazarus
-dirs=lcl components packager/registration ideintf designer packager
+dirs=lcl components packager/registration ideintf designer packager ide tools
-dirs=lcl packager/registration ideintf packager components
+dirs=lcl packager/registration ideintf packager components ide tools
exampledirs=examples
[compiler]
@ -19,7 +16,7 @@ Index: Makefile.fpc
#-----------------------------------------------------------------------------
[rules]
-.PHONY: lcl components packager/registration ideintf packager bigidecomponents ide idepkg idebig bigide starter lazbuilder tools all clean cleanide purge examples install lazbuild
+.PHONY: lcl components packager/registration ideintf packager bigidecomponents idepkg idebig bigide starter lazbuilder all clean cleanide purge examples install lazbuild
+.PHONY: lcl components packager/registration ideintf packager bigidecomponents idepkg idebig bigide starter lazbuilder tools all clean cleanide purge examples install lazbuild
#-----------------------------------------------------------------------------
-ide:
@ -29,11 +26,13 @@ Index: Makefile.fpc
idepkg:
$(MAKE) -C ide idepkg
@@ -81,7 +77,6 @@
@@ -81,8 +77,7 @@
#-----------------------------------------------------------------------------
tools: lcl components
tools: lcl
- $(MAKE) -C tools
-
+
#-----------------------------------------------------------------------------
examples: lcl components

View File

@ -10,7 +10,7 @@ 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
+dirs=synedit codetools cgi cgi/ide printers printers/design fpcunit fpcunit/ide memds projecttemplates rtticontrols sdf sqldb tachart tdbf turbopower_ipro jcf2/IdePlugin/lazarus
[clean]
files=$(wildcard ./units/*$(OEXT)) \

8
debian/rules vendored
View File

@ -12,8 +12,8 @@ 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 -)
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
@ -68,8 +68,7 @@ clean-patched:
dh_testdir
dh_testroot
${RM} lazarus startlazarus lazbuild
$(MAKE) distclean
$(MAKE) distclean LCL_PLATFORM=gtk2
$(MAKE) distclean ${BUILDOPTS}
find '(' -name '*.a' -or -name '*.o' -or -name '*.so' -or -name '*.ppu' ')' -exec ${RM} '{}' ';'
dh_prep
@ -115,7 +114,6 @@ build-arch-stamp:
@echo "--- Building"
dh_testdir
$(MAKE) lcl packager/registration ideintf bigidecomponents examples $(BUILDOPTS)
$(MAKE) lcl packager/registration ideintf bigidecomponents examples LCL_PLATFORM=gtk2 $(BUILDOPTS)
$(MAKE) bigide USESVN2REVISIONINC=0 $(BUILDOPTS)
$(MAKE) lazbuilder $(BUILDOPTS)
$(MAKE) tools $(BUILDOPTS)