[Pkg-voip-commits] r10025 - in /kamailio/branches/wheezy/debian: backports/squeeze changelog control patches/series rules

[maniac-guest at alioth.debian.org]

Author: maniac-guest
Date: Fri Nov  9 09:54:01 2012
New Revision: 10025

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10025
Log:
trying to solve #690396. Fix last commit

Modified:
    kamailio/branches/wheezy/debian/backports/squeeze
    kamailio/branches/wheezy/debian/changelog
    kamailio/branches/wheezy/debian/control
    kamailio/branches/wheezy/debian/patches/series
    kamailio/branches/wheezy/debian/rules

Modified: kamailio/branches/wheezy/debian/backports/squeeze
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/backports/squeeze?rev=10025&op=diff
==============================================================================
--- kamailio/branches/wheezy/debian/backports/squeeze (original)
+++ kamailio/branches/wheezy/debian/backports/squeeze Fri Nov  9 09:54:01 2012
@@ -13,10 +13,6 @@
 sed -i -e  's#debhelper[^,$]*[\ ,$]\+\(.*\)$#debhelper (>= 8), \1#' debian/control
 echo 8 > debian/compat
 
-# Hardening flags
-sed -i -e '/^ dpkg-dev/d' debian/control
-sed -i -e '/^include.*buildflags.mk/d' debian/rules
-
 # No libhiredis:
 sed -i -e '/libhiredis-dev/d' -e '/^Package: kamailio-redis-modules/,/^$/d' \
 	debian/control

Modified: kamailio/branches/wheezy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/changelog?rev=10025&op=diff
==============================================================================
--- kamailio/branches/wheezy/debian/changelog (original)
+++ kamailio/branches/wheezy/debian/changelog Fri Nov  9 09:54:01 2012
@@ -7,8 +7,17 @@
     + 0013-modules-matrix-Fixed-MI-command-not-exported.patch
     + 0020-tls-set-function-to-return-the-id.patch
     + Makefile.defs-arm-compiler-flags-update.patch (Closes: #690388)
-
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Fri, 09 Nov 2012 09:07:45 +0100
+  * debian/patches:
+    + Remove hardening_flags.patch
+  * debian/rules:
+    + remove buildflags.mk
+    + use upstream way to pass extra flags (Closes: #690396)
+  * debian/control:
+    + remove dpkg-dev from Depends
+  * debian/backports/squeeze:
+    + remove the hardening rules
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Fri, 09 Nov 2012 10:38:46 +0100
 
 kamailio (3.3.0-1) unstable; urgency=low
 

Modified: kamailio/branches/wheezy/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/control?rev=10025&op=diff
==============================================================================
--- kamailio/branches/wheezy/debian/control (original)
+++ kamailio/branches/wheezy/debian/control Fri Nov  9 09:54:01 2012
@@ -6,7 +6,6 @@
 Build-Depends: bison,
  debhelper (>= 9),
  docbook-xml,
- dpkg-dev (>= 1.16.1.1),
  flex,
  libconfuse-dev,
  libcurl4-gnutls-dev,

Modified: kamailio/branches/wheezy/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/series?rev=10025&op=diff
==============================================================================
--- kamailio/branches/wheezy/debian/patches/series (original)
+++ kamailio/branches/wheezy/debian/patches/series Fri Nov  9 09:54:01 2012
@@ -4,10 +4,10 @@
 upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
 upstream/0013-modules-matrix-Fixed-MI-command-not-exported.patch
 upstream/0020-tls-set-function-to-return-the-id.patch
-Makefile.defs-arm-compiler-flags-update.patch
+upstream/Makefile.defs-arm-compiler-flags-update.patch
 multiarch_support.patch
 no_INSTALL_file.patch
-hardening_flags.patch
+#hardening_flags.patch
 plumb_md5.patch
 plumb_md5_fixes.patch
 fix_export.patch

Modified: kamailio/branches/wheezy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/rules?rev=10025&op=diff
==============================================================================
--- kamailio/branches/wheezy/debian/rules (original)
+++ kamailio/branches/wheezy/debian/rules Fri Nov  9 09:54:01 2012
@@ -10,10 +10,6 @@
 URL := http://www.kamailio.org/pub/kamailio/$(UPVERSION)/src/kamailio-$(UPVERSION)_src.tar.gz
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -51,7 +47,7 @@
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
 	$(foreach grp,$(PACKAGE_GROUPS),\
-		$(MAKE) every-module group_include="k$(grp)"
+		$(MAKE) every-module group_include="k$(grp)" quiet=verbose
 	)
 endef
 
@@ -90,9 +86,10 @@
 			cfg_target=/etc/kamailio/ \
 			basedir=$(CURDIR)/debian/kamailio \
 			skip_modules="$(EXCLUDED_MODULES) $(EXTRA_EXCLUDED_MODULES)" \
-			$(shell dpkg-buildflags --export=configure) \
-			group_include="kstandard"
-
+			EXTRA_DEFS="$(shell dpkg-buildflags --get CPPFLAGS)" \
+			CC_EXTRA_OPTS="$(shell dpkg-buildflags --get CFLAGS)" \
+			LD_EXTRA_OPTS="$(shell dpkg-buildflags --get LDFLAGS)" \
+			group_include="kstandard" quiet=verbose
 	touch configure-stamp
 
 
@@ -104,7 +101,7 @@
 	if [ ! -r debian/kambdb_recover ]; then \
 		mv utils/db_berkeley/kambdb_recover debian/;\
 	fi
-	$(MAKE) all
+	$(MAKE) all quiet=verbose
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
 	# make single-module packages