[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-49-gc3bafca

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit c3bafcae3d24f6e02360f938a7ba498b1f42fc05
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Apr 29 23:55:01 2011 +0200

    Fixed #624267

diff --git a/debian/changelog b/debian/changelog
index d12793a..6dcb8c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+proftpd-dfsg (1.3.4~rc2-4) unstable; urgency=low
+
+  * Now debian/rules manages correctly debug. noopt and nostrip options
+    in DEB_BUILD_OPTIONS against proftpd building script.
+    (closes: #624267)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 29 Apr 2011 23:51:25 +0200
+
 proftpd-dfsg (1.3.4~rc2-3) unstable; urgency=low
 
   * Added new contributed modules building and loading: mod_copy, mod_deflate, 
diff --git a/debian/rules b/debian/rules
index abd813a..b94b46c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,17 +10,27 @@ VERSION=$(shell grep PROFTPD_VERSION_TEXT $(CURDIR)/include/version.h|cut -d\" -
 # See #233031 for details. 
 # 
 PROFTPD_FLAGS := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_OPENSSL -DUSE_LDAP_TLS
-CFLAGS := -O2 $(PROFTPD_FLAGS) 
+CFLAGS := $(PROFTPD_FLAGS) 
 CC := gcc
+OPTFLAG = -O2
 
 # Some special build options
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-  CFLAGS += -g -O0
+  DEVELOPT=--enable-devel=yes
+  OPTFLAG = -O0
 endif
 ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
 DH_VERBOSE=1
 export DH_VERBOSE
 endif
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  OPTFLAG = -O0 
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+  INSTALL_STRIP=-s
+endif
+
+CFLAGS += $(OPTFLAG)
 
 #
 # dpkg-arch rules
@@ -38,8 +48,7 @@ CONF_ARGS := --prefix=/usr \
 	     --with-includes=$(shell pg_config --includedir):$(shell mysql_config --include|sed -e 's/-I//') \
 	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/var/run --libexecdir=/usr/lib/$(NAME) \
 	     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls --with-modules=mod_readme \
-	     --enable-ipv6 --enable-nls --with-lastlog=/var/log/lastlog
-#	     --enable-devel=stacktrace 
+	     --enable-ipv6 --enable-nls --with-lastlog=/var/log/lastlog $(DEVELOPT)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   CONF_ARGS += --build $(DEB_HOST_GNU_TYPE)
@@ -65,7 +74,7 @@ install: build
 	dh_testdir
 	dh_prep
 	
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp INSTALL_STRIP="$(INSTALL_STRIP)" install
 	mv $(CURDIR)/debian/tmp/usr/share/locale/it_IT $(CURDIR)/debian/tmp/usr/share/locale/it
 	mv $(CURDIR)/debian/tmp/usr/share/locale/ru_RU $(CURDIR)/debian/tmp/usr/share/locale/ru
 

-- 
ProFTPD core package