* Added patches required to build Debian packages until others could applied by upstream developers.

git-svn-id: trunk@15527 -
This commit is contained in:
mazen 2008-06-23 07:03:01 +00:00
parent e5be2fd9bf
commit fbfc8dc0bb
5 changed files with 81 additions and 3 deletions

3
.gitattributes vendored
View File

@ -1161,6 +1161,9 @@ debian/links svneol=native#text/plain
debian/menu svneol=native#text/plain
debian/move-usr-lib.sh svneol=native#text/plain
debian/orig-tar.sh 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/rules svneol=native#text/plain
debian/watch svneol=native#text/plain
debugger/breakpointsdlg.lfm svneol=native#text/plain

2
debian/patches/00list vendored Normal file
View File

@ -0,0 +1,2 @@
01_topmakefile
02_components

52
debian/patches/01_topmakefile.dpatch vendored Executable file
View File

@ -0,0 +1,52 @@
#! /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.
@DPATCH@
Index: Makefile.fpc
===================================================================
--- lazarus/Makefile.fpc (révision 15506)
+++ 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
exampledirs=examples
[compiler]
@@ -40,13 +40,9 @@
#-----------------------------------------------------------------------------
[rules]
-.PHONY: lcl components packager/registration ideintf packager bigidecomponents ide idepkg idebig bigide starter lazbuilder tools all clean cleanide purge examples install
+.PHONY: lcl components packager/registration ideintf packager bigidecomponents idepkg idebig bigide starter lazbuilder all clean cleanide purge examples install
#-----------------------------------------------------------------------------
-ide:
- $(MAKE) -C ide ide
-
-#-----------------------------------------------------------------------------
idepkg:
$(MAKE) -C ide idepkg
@@ -75,7 +71,6 @@
#-----------------------------------------------------------------------------
tools: lcl components
- $(MAKE) -C tools
#-----------------------------------------------------------------------------
examples: lcl components
@@ -127,7 +122,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

21
debian/patches/02_components.dpatch vendored Executable file
View File

@ -0,0 +1,21 @@
#! /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)) \

6
debian/rules vendored
View File

@ -32,7 +32,7 @@ endif
# Clean
#
clean: configure clean-patched unpatch
clean: patch configure clean-patched unpatch
clean-patched:
@echo "--- Cleaning"
dh_testdir
@ -51,11 +51,11 @@ clean-patched:
patch: patch-stamp
patch-stamp:
dpatch apply-all
dpatch apply-all -v
touch patch-stamp
unpatch:
dpatch deapply-all
dpatch deapply-all -v
rm -rf patch-stamp debian/patched
###################