← Back to team overview

yade-dev team mailing list archive

[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, cmake_migration, updated. debian/0.80.1-1-4-gde60ab3

 

The following commit has been merged in the cmake_migration branch:
commit 7c7d6ce39ea99921db9511a70fd74b7974dae9b4
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Thu Sep 20 21:20:15 2012 +0200

    Use compat-level 9.

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index be71347..a9dbe16 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Anton Gladky <gladky.anton@xxxxxxxxx>
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/git/debian-science/packages/yade.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/yade.git
-Build-Depends: debhelper (>= 8), scons, binutils-gold [amd64 i386], cmake,
+Build-Depends: debhelper (>= 9), scons, binutils-gold [amd64 i386], cmake,
  freeglut3-dev, libboost-dev (>=1.35), libboost-date-time-dev (>=1.35), 
  libboost-filesystem-dev (>=1.35), libboost-thread-dev (>=1.35), 
  libboost-regex-dev (>=1.35), libboost-python-dev (>=1.35),
diff --git a/debian/rules b/debian/rules
index fe715f1..b85902c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,8 @@ tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
 
-export CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
-export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 export MPLCONFIGDIR := $(tmpDirMatplotLib) 
 export HOME := $(tmpDirMatplotLib) 

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.