[Pkg-ocaml-maint-commits] r3024 - in /trunk/packages/mldonkey/trunk/debian: changelog patches/00list patches/cxxflags.dpatch rules

[smimram at users.alioth.debian.org]

Author: smimram
Date: Tue Aug 22 16:47:13 2006
New Revision: 3024

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3024
Log:
Set CFLAGS according to the Debian policy.

Added:
    trunk/packages/mldonkey/trunk/debian/patches/cxxflags.dpatch   (with props)
Modified:
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/patches/00list
    trunk/packages/mldonkey/trunk/debian/rules

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=3024&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Tue Aug 22 16:47:13 2006
@@ -1,3 +1,11 @@
+mldonkey (2.7.7-10) UNRELEASED; urgency=low
+
+  * Added cxxflags.dpatch to store CXXFLAGS given at configure time.
+  * Set CFLAGS according to the Debian policy, closes: #384205.
+  * Added make clean to the clean target of the rules.
+
+ -- Samuel Mimram <smimram at debian.org>  Fri, 18 Aug 2006 08:34:14 +0000
+
 mldonkey (2.7.7-9) unstable; urgency=low
 
   * Added cryptoflags.dpatch to use the -mno-omit-leaf-frame-pointer option

Modified: trunk/packages/mldonkey/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/00list?rev=3024&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/00list (original)
+++ trunk/packages/mldonkey/trunk/debian/patches/00list Tue Aug 22 16:47:13 2006
@@ -1,4 +1,5 @@
 cvs_20060815
+cxxflags
 cryptoflags
 01_see
 02_usr_bin

Added: trunk/packages/mldonkey/trunk/debian/patches/cxxflags.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/cxxflags.dpatch?rev=3024&op=file
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/cxxflags.dpatch (added)
+++ trunk/packages/mldonkey/trunk/debian/patches/cxxflags.dpatch Tue Aug 22 16:47:13 2006
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cxxflags.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Store CXXFLAGS given at configure time.
+
+ at DPATCH@
+diff -urNad mldonkey-2.7.7~/config/Makefile.config.in mldonkey-2.7.7/config/Makefile.config.in
+--- mldonkey-2.7.7~/config/Makefile.config.in	2006-05-15 17:43:09.000000000 +0000
++++ mldonkey-2.7.7/config/Makefile.config.in	2006-08-22 16:35:06.000000000 +0000
+@@ -1,6 +1,7 @@
+ LIBS=@LIBS@
+ CFLAGS=@CFLAGS@ 
+ CPPFLAGS=@CPPFLAGS@
++CXXFLAGS=@CXXFLAGS@
+ LDFLAGS=@LDFLAGS@
+ CC=@CC@
+ CPP=@CPP@
+diff -urNad mldonkey-2.7.7~/config/configure.in mldonkey-2.7.7/config/configure.in
+--- mldonkey-2.7.7~/config/configure.in	2006-06-19 21:24:54.000000000 +0000
++++ mldonkey-2.7.7/config/configure.in	2006-08-22 16:34:54.000000000 +0000
+@@ -1240,6 +1240,7 @@
+ AC_SUBST(LIBS)
+ AC_SUBST(CFLAGS)
+ AC_SUBST(CPPFLAGS)
++AC_SUBST(CXXFLAGS)
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(CC)
+ AC_SUBST(CPP)

Propchange: trunk/packages/mldonkey/trunk/debian/patches/cxxflags.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/mldonkey/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/rules?rev=3024&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/rules (original)
+++ trunk/packages/mldonkey/trunk/debian/rules Tue Aug 22 16:47:13 2006
@@ -14,6 +14,13 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O0
+else
+        CFLAGS += -O2
+endif
 
 # Include patch-speficic rules
 PACKAGE=mldonkey
@@ -27,7 +34,7 @@
 doc-check-stamp: build
 	for i in $(MANCHECK); do \
 		./$$i --help > debian/xml-man/$$i.new 2>&1;\
-		diff -q debian/xml-man/$$i.new debian/xml-man/$$i.help;\
+		diff -q debian/xml-man/$$i.new debian/xml-man/$$i.help; \
 		diff -Nurd debian/xml-man/$$i.help debian/xml-man/$$i.new > debian/xml-man/$$i.diff ; \
 	done
 
@@ -35,7 +42,7 @@
 
 doc-replace: doc-check $(foreach fl, $(MANCHECK), debian/xml-man/$(fl).new)
 	for i in $(MANCHECK); do \
-		mv -f debian/xml-man/$$i.new debian/xml-man/$$i.help;\
+		mv -f debian/xml-man/$$i.new debian/xml-man/$$i.help; \
 	done
 
 clean-doc-check:
@@ -46,8 +53,7 @@
 configure-stamp:
 	dh_testdir
 	cd config; autoconf
-	./configure \
-	  $(confflags) \
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure $(confflags) \
 	  --enable-gui \
           --disable-magic \
 	  --disable-fasttrack
@@ -99,6 +105,7 @@
 	# Update the PO, as suggested in "man 7 po-debconf"
 	debconf-updatepo
 	# Add here commands to clean up after the build process.
+	$(MAKE) clean
 	cd debian/xml-man && $(MAKE) clean
 	cd debian/utils && $(MAKE) clean
 	-$(RM) config/trying