[SCM] BOINC packaging branch, backports/squeeze, updated. debian/7.0.33+dfsg-1-30-g16aa28f

Guo Yixuan culu.gyx at gmail.com
Fri Aug 31 12:18:53 UTC 2012


The following commit has been merged in the backports/squeeze branch:
commit 16aa28f731686b4b24360461a3e30f21e1d1719d
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Fri Aug 31 20:12:05 2012 +0800

    Removed dependency on dpkg-dev >= 1.16.1.1

diff --git a/debian/changelog b/debian/changelog
index 55ed244..442b282 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 boinc (7.0.34+dfsg-3~bpo60+1) squeeze-backports; urgency=low
 
+  [ Steffen Moeller ]
   * Initial update to backports
     - libnotify remains at version 0.5
     - removed dependency on libXss to avoid build problem, also means
       issue as with regular version in Squeeze to detect user activity.
 
+  [ Guo Yixuan ]
+  * Removed dependency on dpkg-dev >= 1.16.1.1, disabled hardening flags.
+
  -- Steffen Moeller <moeller at debian.org>  Wed, 29 Aug 2012 17:26:36 +0200
 
 boinc (7.0.34+dfsg-3) UNRELEASED; urgency=low
diff --git a/debian/control.in b/debian/control.in
index 3468520..2b5b5f7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,6 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 7.0.50~), po-debconf, dh-buildinfo, pkg-config (>= 0.15),
- dpkg-dev (>= 1.16.1.1),
  libtool, autoconf (>= 2.59), autotools-dev, automake1.9 (>= 1.9.3), gettext,
  docbook2x, docbook-xml, libxml2-utils,
  zlib1g-dev, libssl-dev, libcurl4-openssl-dev (>= 7.17.1),
diff --git a/debian/rules b/debian/rules
index c5de7bb..72377fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,14 @@
 # Set default flags with dpkg-buildflags
 # -Wformat -Werror=format-security will need many fixes to avoid ftbfs,
 # so it's disabled for now
-export DEB_BUILD_MAINT_OPTIONS = hardening=-format,+bindnow
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+# squeeze doen't have buildflags.mk
+# export DEB_BUILD_MAINT_OPTIONS = hardening=-format,+bindnow
+# DPKG_EXPORT_BUILDFLAGS = 1
+# include /usr/share/dpkg/buildflags.mk
+export CFLAGS += -g -O2
+export CXXFLAGS += -g -O2
+export CPPFLAGS
+export LDFLAGS
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list