فهرست منبع

Use build flags from dpkg-buildflags.

Jelmer Vernooij 12 سال پیش
والد
کامیت
77a2d6c480
4فایلهای تغییر یافته به همراه9 افزوده شده و 3 حذف شده
  1. 1 0
      debian/changelog
  2. 1 1
      debian/compat
  3. 1 1
      debian/control
  4. 6 1
      debian/rules

+ 1 - 0
debian/changelog

@@ -4,6 +4,7 @@ dulwich (0.8.6-1) UNRELEASED; urgency=low
    + Drop 01_less_strict_index_tests: applied upstream.
   * Migrate to Git; replace Vcs-Bzr header with Vcs-Git header.
   * Remove duplicate field copyright in copyright file.
+  * Use build flags from dpkg-buildflags.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Fri, 09 Nov 2012 23:44:30 +0100
 

+ 1 - 1
debian/compat

@@ -1 +1 @@
-5
+9

+ 1 - 1
debian/control

@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer@debian.org>
 Homepage: http://samba.org/~jelmer/dulwich
-Build-Depends: python-all-dev (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3), debhelper (>= 7.0.50~), python-unittest2, git (>= 1:1.7.0.4-2) | git-core, python-fastimport (>= 0.9.0~bzr293)
+Build-Depends: python-all-dev (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3), debhelper (>= 9), python-unittest2, git (>= 1:1.7.0.4-2) | git-core, python-fastimport (>= 0.9.0~bzr293)
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.4
 Vcs-Git: git://git.debian.org/users/jelmer/dulwich.git

+ 6 - 1
debian/rules

@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
 # Get the supported Python versions
 PYVERS = $(shell pyversions -r -v)
 # Get the default Python version
@@ -10,7 +15,7 @@ pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
 pythonpath_dbg = $$(ls -d $(CURDIR)/build/lib_d.*-$(1) 2>/dev/null || ls -d $(CURDIR)/build/lib.*$(1)-pydebug)
 
 %:
-	dh --buildsystem=python_distutils --with python2 $*
+	dh $* --with python2 --buildsystem=python_distutils
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp