debian: updated control files from Mazen

git-svn-id: trunk@13519 -

.gitattributes

@@ -1114,9 +1114,11 @@ debian/dirs svneol=native#text/plain
 debian/docs svneol=native#text/plain
 debian/install.sh svneol=native#text/plain
 debian/lazarus.substvars svneol=native#text/plain
+debian/links svneol=native#text/plain
 debian/menu svneol=native#text/plain
 debian/move-usr-lib.sh svneol=native#text/plain
 debian/rules svneol=native#text/plain
+debian/watch svneol=native#text/plain
 debugger/breakpointsdlg.lfm svneol=native#text/plain
 debugger/breakpointsdlg.lrs svneol=native#text/pascal
 debugger/breakpointsdlg.pp svneol=native#text/pascal

Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=lazarus
-version=0.9b
+version=0.9.25
 
 [require]
 packages=regexpr
@@ -125,5 +125,98 @@ else
 endif
 
 
+##########################################################################
+# Debian
+##########################################################################
+
+ifdef inUnix
+
+# Build dir
+ifndef BUILDDIR
+BUILDDIR=$(BASEDIR)/build
+endif
+
+# Link Tree
+ifdef LINKISCOPY
+ifndef LINKTREE
+LINKTREE:=$(CPPROG) -Rfp
+endif
+else
+ifndef LINKTREE
+LINKTREE:=$(CPPROG) -Rfpl
+endif
+endif
+
+ifndef SVNREVISION
+SVNREVISION=$(svnversion) $(BASEDIR)
+endif
+
+ifneq ($(wildcard debian/changelog),)
+
+.PHONY: debcopy deb
+
+DEBPACKAGEVERSION:=$(shell head -n 1 debian/changelog | awk '{ print $$2 }' | tr -d '[()]')
+DEBFPCVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }')
+DEBSRCDIR:=$(BUILDDIR)/lazarus-$(DEBFPCVERSION)
+
+debcheck:
+ifneq ($(DEBFPCVERSION),$(PACKAGE_VERSION))
+    @$(ECHO) "Debian version ($(DEBFPCVERSION)) is not correct, expect $(PACKAGE_VERSION)"
+    @exit 1
+endif
+
+debcopy: distclean
+	rm -rf ${BUILDDIR}
+	install -d $(DEBSRCDIR)
+	$(LINKTREE) Makefile.fpc $(DEBSRCDIR)
+	$(LINKTREE) COPYING $(DEBSRCDIR)
+	$(LINKTREE) COPYING.GPL $(DEBSRCDIR)
+	$(LINKTREE) COPYING.LGPL $(DEBSRCDIR)
+	$(LINKTREE) README.txt $(DEBSRCDIR)
+	$(LINKTREE) components $(DEBSRCDIR)
+	$(LINKTREE) converter $(DEBSRCDIR)
+	$(LINKTREE) debian $(DEBSRCDIR)
+	$(LINKTREE) debugger $(DEBSRCDIR)
+	$(LINKTREE) designer $(DEBSRCDIR)
+	$(LINKTREE) doceditor $(DEBSRCDIR)
+ifndef NODOCS
+	$(LINKTREE) docs $(DEBSRCDIR)
+endif
+	$(LINKTREE) examples $(DEBSRCDIR)
+	$(LINKTREE) ide $(DEBSRCDIR)
+	$(LINKTREE) ideintf $(DEBSRCDIR)
+	$(LINKTREE) images $(DEBSRCDIR)
+	$(LINKTREE) install $(DEBSRCDIR)
+	$(LINKTREE) languages $(DEBSRCDIR)
+	$(LINKTREE) lazarus.app $(DEBSRCDIR)
+	$(LINKTREE) lcl $(DEBSRCDIR)
+	$(LINKTREE) packager $(DEBSRCDIR)
+	$(LINKTREE) test $(DEBSRCDIR)
+	$(LINKTREE) tools $(DEBSRCDIR)
+	# add ide/revision.inc
+	echo "const RevisionStr = '${SVNVERSION}';" > $(DEBSRCDIR)/ide/revision.inc
+	find $(DEBSRCDIR) -name 'CVS*' | xargs rm -rf
+	find $(DEBSRCDIR) -name '.svn' | xargs rm -rf
+	find $(DEBSRCDIR) -name 'Makefile' | xargs rm -rf
+	chmod 755 $(DEBSRCDIR)/debian/rules
+
+debbuild:
+ifdef NODOCS
+	cd $(DEBSRCDIR) ; fakeroot debian/rules binary-arch
+else
+	cd $(DEBSRCDIR) ; fakeroot debian/rules binary
+endif
+	mv $(DEBSRCDIR)/../*.deb .
+
+debclean:
+	rm -rf $(DEBSRCDIR)
+	-rmdir $(BUILDDIR)
+
+deb: debcheck debcopy debbuild debclean
+
+endif   # changelog found
+
+endif
+
 # end.
 

debian/changelog

@@ -1,3 +1,58 @@
+lazarus (0.9.25-0-0) unstable; urgency=low
+
+  * Merged debian rules with official debian svn.
+
+ -- Mazen Neifer <mazen@freepascal.org>  Fri, 28 Dec 2007 23:52:02 +0100
+
+lazarus (0.9.24-0-3) unstable; urgency=low
+
+  * Use fpc-depends to calculate dependencies more accurately.
+  * Add Recommends: fpc-source. (Closes: #413806)
+  * Use bzip2 for compressing the binary package and add
+    Pre-Depends: dpkg (>= 1.10.24).
+  * Change Standards-Version: 3.7.3.
+
+ -- Torsten Werner <twerner@debian.org>  Tue, 18 Dec 2007 20:22:02 +0100
+
+lazarus (0.9.24-0-2) unstable; urgency=low
+
+  * Set FPC=fpc for building lazarus.
+
+ -- Torsten Werner <twerner@debian.org>  Tue, 04 Dec 2007 20:56:52 +0100
+
+lazarus (0.9.24-0-1) unstable; urgency=low
+
+  * new upstream release
+  * Implement get-orig-source in debian/rules.
+  * Update Vcs and Homepage headers in debian/control.
+  * Add Architecture: arm.
+  * Remove debian/*.ex and debian/files in clean target. (Closes: #451056)
+  * Add and fix debian/menu.
+  * Do not ignore errors of 'make distclean'.
+
+ -- Torsten Werner <twerner@debian.org>  Mon, 03 Dec 2007 22:54:10 +0100
+
+lazarus (0.9.22-1) unstable; urgency=low
+
+  * Add homepage to debian/control.
+  * New upstream release. (Closes: #421850, #408512)
+  * Remove old patch and add new symlink /usr/bin/startlazarus.
+  * Add myself to Uploaders.
+  * Add XS-X-Vcs-Svn header to debian/control.
+
+ -- Torsten Werner <twerner@debian.org>  Sun,  6 May 2007 13:46:10 +0200
+
+lazarus (0.9.20-1) unstable; urgency=low
+
+  * New upstream release (Closes: #298726)
+  * Fix Build-Dependencies (Closes: #303864)
+  * Fix desktop file (Closes: #329071, #275802)
+  * debian/rules:
+    + Remove unnecessary comments
+    + Use dpatch to apply patches
+
+ -- Varun Hiremath <varunhiremath@gmail.com>  Sun, 14 Jan 2007 12:20:05 +0530
+
 lazarus (0.9.17-1) experimental; urgency=low
 
   * Snapshot.

debian/compat

@@ -1 +1 @@
-4
+5

debian/control

@@ -2,14 +2,24 @@ Source: lazarus
 Section: devel
 Priority: optional
 Maintainer: Carlos Laviola <claviola@debian.org>
-Build-Depends: debhelper (>= 4.0.0),  fp-compiler (= 2.0.2-1), fp-units-base (= 2.0.2-1), fp-units-db (= 2.0.2-1), fp-units-fcl (= 2.0.2-1), fp-units-gfx (= 2.0.2-1), fp-units-gtk (= 2.0.2-1), fp-units-misc (= 2.0.2-1), fp-units-net (= 2.0.2-1), fp-units-rtl (= 2.0.2-1), fp-utils (= 2.0.2-1), imagemagick, libgdk-pixbuf-dev
+Uploaders: Torsten Werner <twerner@debian.org>
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>= 5), fp-compiler (>= 2.2.0-3), fp-units-base,
+ fp-units-db, fp-units-fcl, fp-units-gfx, fp-units-gtk, fp-units-misc,
+ fp-units-net, fp-units-rtl, fp-utils, imagemagick, libgdk-pixbuf-dev
+Standards-Version: 3.7.3
+Homepage: http://www.lazarus.freepascal.org
+Vcs-Svn: https://bollin.googlecode.com/svn/lazarus/trunk
+Vcs-Browser: http://bollin.googlecode.com/svn/lazarus/trunk
 
 Package: lazarus
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64 arm
-Depends: ${shlibs:Depends}, fp-compiler (= 2.0.2-1), fp-units-base (= 2.0.2-1), fp-units-rtl (= 2.0.2-1), fp-units-fcl (= 2.0.2-1), fp-units-gtk (= 2.0.2-1), libgtk1.2-dev, libgdk-pixbuf-dev
+Pre-Depends: dpkg (>= 1.10.24)
-Recommends: fp-units-db (= 2.0.2-1), fp-units-gfx (= 2.0.2-1), fp-units-gnome1 (= 2.0.2-1), fp-units-misc (= 2.0.2-1), fp-units-net (= 2.0.2-1)
+Depends: ${shlibs:Depends}, fp-compiler, fp-units-base, fp-units-rtl,
-Suggests: fp-utils (= 2.0.2-1)
+ fp-units-fcl, fp-units-gtk, libgtk1.2-dev, libgdk-pixbuf-dev,
+ ${fpc-abi:Depends}
+Recommends: fp-units-db, fp-units-gfx, fp-units-gnome1, fp-units-misc,
+ fp-units-net, fpc-source
+Suggests: fp-utils
 Description: Rapid Application Development (RAD) tool for Free Pascal
  Lazarus are the class libraries for Free Pascal that emulate Delphi.
  Free Pascal is a GPL'd compiler that runs on Linux, Win32, OS/2, 68K

debian/docs

@@ -1 +1,2 @@
-README
+README.txt
+debian/README.Debian

debian/links

@@ -0,0 +1,2 @@
+/usr/lib/lazarus/startlazarus /usr/bin/startlazarus
+/usr/lib/lazarus/startlazarus /usr/bin/lazarus-ide

debian/menu

@@ -1,6 +1,6 @@
 ?package(lazarus):needs="X11"\
   	title="Lazarus IDE"\
-	section="Apps/Programming"\
+	section="Applications/Programming"\
 	hints="Programming,Delphi"\
 	icon="/usr/share/pixmaps/lazarus.xpm"\
 	command="/usr/bin/lazarus-ide"

debian/rules

@@ -16,68 +16,66 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-
+	find -name 'Makefile.fpc' | xargs fpcmake
 	touch configure-stamp
 
-
+build: patch build-stamp
-build: build-stamp
 
 build-stamp: configure-stamp 
 	dh_testdir
-
+	$(MAKE) USESVN2REVISIONINC=0 FPC=fpc
-	# Add here commands to compile the package.
-	$(MAKE) USESVN2REVISIONINC=0
-	#/usr/bin/docbook-to-man debian/lazarus.sgml > lazarus.1
-
 	touch build-stamp
 
-clean:
+clean: clean-patched unpatch
+
+clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp configure-stamp lazbuild debian/*.ex debian/files
-
+	$(MAKE) distclean
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
 	dh_clean 
 
+patch: patch-stamp
+
+patch-stamp:
+	#dpatch apply-all
+	touch patch-stamp
+
+unpatch:
+	#dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	
-	# Add here commands to install the package into debian/lazarus.
-	
 	# copy lazarus to /usr/share
 	install -d $(LAZDEBDIR)/usr/lib/lazarus
 	install -d $(LAZDEBDIR)/usr/bin
-	
 	sh $(CURDIR)/debian/move-usr-lib.sh $(LAZDEBDIR)
-	
 	# copy icons and menu entries for the GNOME menu
 	install -d $(LAZDEBDIR)/usr/share/pixmaps
 	install -d $(LAZDEBDIR)/usr/share/applications
 	install -d $(LAZDEBDIR)/usr/bin
-	
 	convert -geometry 32x32 $(CURDIR)/images/ide_icon48x48.png $(LAZDEBDIR)/usr/share/pixmaps/lazarus.xpm
 	chmod 644 $(LAZDEBDIR)/usr/share/pixmaps/lazarus.xpm
 	install -m 644 $(CURDIR)/install/lazarus.desktop $(LAZDEBDIR)/usr/share/applications/lazarus.desktop
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_link usr/lib/lazarus/lazarus usr/bin/lazarus-ide
+	dh_link
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
 	dh_installman
+	fpc-depends
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -85,7 +83,10 @@ binary-arch: build install
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb
+	dh_builddeb -- -Z bzip2
+
+get-orig-source:
+	-uscan --upstream-version=0 --rename
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

debian/watch

@@ -0,0 +1,3 @@
+version=3
+http://sf.net/lazarus/lazarus-(.*).tar.gz
+