Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock mhc/0.25.1+20120403-2 to enable hardening flags for wheezy. Changes: * debian/rules: Use dpkg-buildflags to support hardening flags * debian/control: Add emacs24 to Depends Note that the emacs24 dependency is optional, emacs is prior to emacs24, so it's safe even if there isn't emacs24 in wheezy. See also the attached debdiff. unblock mhc/0.25.1+20120403-2 Thanks, -- Tatsuya Kinoshita
diffstat for mhc-0.25.1+20120403 mhc-0.25.1+20120403
changelog | 7 +++++++
control | 2 +-
rules | 8 +++++++-
3 files changed, 15 insertions(+), 2 deletions(-)
diff -Nru mhc-0.25.1+20120403/debian/changelog mhc-0.25.1+20120403/debian/changelog
--- mhc-0.25.1+20120403/debian/changelog 2012-05-01 00:00:04.000000000 +0900
+++ mhc-0.25.1+20120403/debian/changelog 2012-07-08 11:50:38.000000000 +0900
@@ -1,3 +1,10 @@
+mhc (0.25.1+20120403-2) unstable; urgency=low
+
+ * debian/rules: Use dpkg-buildflags to support hardening flags
+ * debian/control: Add emacs24 to Depends
+
+ -- Tatsuya Kinoshita <tats@debian.org> Sun, 08 Jul 2012 11:50:33 +0900
+
mhc (0.25.1+20120403-1) unstable; urgency=low
* New upstream release. (development snapshot on 2012-04-03,
diff -Nru mhc-0.25.1+20120403/debian/control mhc-0.25.1+20120403/debian/control
--- mhc-0.25.1+20120403/debian/control 2012-04-29 23:40:58.000000000 +0900
+++ mhc-0.25.1+20120403/debian/control 2012-07-05 08:27:04.000000000 +0900
@@ -9,7 +9,7 @@
Package: mhc
Section: lisp
Architecture: all
-Depends: emacs | emacs23 | emacs22 | emacs21 | xemacs21-mule | xemacs21-mule-canna-wnn | xemacs21-gnome-mule | xemacs21-gnome-mule-canna-wnn | emacs-snapshot, mew | mew-beta | wl | wl-beta | gnus | emacs | emacsen | cmail, mew | mew-beta | gnus | emacs | emacsen | semi, make, ${misc:Depends}
+Depends: emacs | emacs24 | emacs23 | emacs22 | emacs21 | xemacs21-mule | xemacs21-mule-canna-wnn | xemacs21-gnome-mule | xemacs21-gnome-mule-canna-wnn | emacs-snapshot, mew | mew-beta | wl | wl-beta | gnus | emacs | emacsen | cmail, mew | mew-beta | gnus | emacs | emacsen | semi, make, ${misc:Depends}
Recommends: mhc-utils, bitmap-mule
Suggests: gv, cups-client | lprng
Replaces: mhc-utils
diff -Nru mhc-0.25.1+20120403/debian/rules mhc-0.25.1+20120403/debian/rules
--- mhc-0.25.1+20120403/debian/rules 2012-04-30 23:25:36.000000000 +0900
+++ mhc-0.25.1+20120403/debian/rules 2012-07-08 12:15:34.000000000 +0900
@@ -2,6 +2,12 @@
#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+dpkg_buildflags = DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) dpkg-buildflags
+CFLAGS=$(shell $(dpkg_buildflags) --get CFLAGS)
+CPPFLAGS=$(shell $(dpkg_buildflags) --get CPPFLAGS)
+LDFLAGS=$(shell $(dpkg_buildflags) --get LDFLAGS)
+
SCRIPTS=adb2mhc gemcal mhc-sync mhc2palm palm2mhc today
RUBY=/usr/bin/ruby1.8
@@ -17,7 +23,7 @@
build-arch: build-arch-stamp
build-arch-stamp:
dh_testdir
- $(RUBY) ./configure.rb --with-ruby=$(RUBY) --with-icondir=/usr/share/pixmaps/mhc
+ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(RUBY) ./configure.rb --with-ruby=$(RUBY) --with-icondir=/usr/share/pixmaps/mhc
(cd ruby-ext && $(MAKE))
touch $@
Attachment:
pgpxYe6aQzzBu.pgp
Description: PGP signature