[Pkg-jed-commit] r335 - trunk/packages/jed/debian

[Jörg Sommer]

Author: jo-guest
Date: 2006-06-20 22:05:59 +0000 (Tue, 20 Jun 2006)
New Revision: 335

Modified:
   trunk/packages/jed/debian/control
   trunk/packages/jed/debian/rules
Log:
* jed/debian/control:
  + The packages in Build-Depends are installed in all cases. If an
    arch-indep package is build the packages in Build-Depends-Indep
    install additional. This means, having debhelper and dpatch in
    Depends and Depends-Indep is duplicated.

* jed/debian/rules:
  + Added handling of DEB_BUILD_OPTIONS. This means you can set the
    environment variable DEB_BUILD_OPTIONS to debug or noopt or both and
    the packages are build with debugging symbols/not optimized.


Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control	2006-06-19 15:46:39 UTC (rev 334)
+++ trunk/packages/jed/debian/control	2006-06-20 22:05:59 UTC (rev 335)
@@ -4,8 +4,8 @@
 Maintainer: Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.7.2
-Build-Depends-Indep: debhelper (>= 4.1.16), dpatch, hevea
-Build-Depends: debhelper (>= 4.1.16), dpatch, libgpmg1-dev [!hurd-i386 !kfreebsd-i386], libslang2-dev, libxft-dev, libxt-dev
+Build-Depends-Indep: hevea
+Build-Depends: debhelper (>= 4.1.16), dpatch, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libslang2-dev, libxft-dev, libxt-dev
 
 Package: jed
 Architecture: any

Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules	2006-06-19 15:46:39 UTC (rev 334)
+++ trunk/packages/jed/debian/rules	2006-06-20 22:05:59 UTC (rev 335)
@@ -2,6 +2,15 @@
 
 #export DH_VERBOSE=1
 
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAFS += -02
+endif
+
 include /usr/share/dpatch/dpatch.make
 
 jed=$(CURDIR)/debian/jed
@@ -25,7 +34,7 @@
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-	./configure --prefix=/usr/share --exec-prefix=/usr --with-x
+	./configure "CFLAGS=$(CFLAGS)" --prefix=/usr/share --exec-prefix=/usr --with-x
 
 	#
 	# --- MAKE ---
@@ -132,7 +141,9 @@
 	#
 	dh_installmenu -a
 	dh_fixperms -a
+ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	dh_strip -a
+endif
 	dh_compress -a
 	dh_installdeb -a
 	dh_shlibdeps -a