[Pkg-shadow-commits] r3736 - debian/trunk/debian

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2012-05-20 15:30:55 +0000 (Sun, 20 May 2012)
New Revision: 3736

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/control
   debian/trunk/debian/rules
Log:
  * debian/control: Bump Standards-Version to 3.9.3 (no changes needed).
  * debian/rules: Simplify setting of hardening flags. cdbs 0.4.103 needed to
    get hardened version of shadow-utils. Restore previous requirement on
    dpkg-dev to 1.13.5.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2012-05-20 12:28:09 UTC (rev 3735)
+++ debian/trunk/debian/changelog	2012-05-20 15:30:55 UTC (rev 3736)
@@ -16,6 +16,10 @@
     bug now fixed more than 10 years ago.
   * debian/shadowconfig.sh: Display issues, but dot not prompt interactively
     to fix passwd/group/shadow/gshadow issues. Closes: #638263
+  * debian/control: Bump Standards-Version to 3.9.3 (no changes needed).
+  * debian/rules: Simplify setting of hardening flags. cdbs 0.4.103 needed to
+    get hardened version of shadow-utils. Restore previous requirement on
+    dpkg-dev to 1.13.5.
 
   [ Christian Perrier ]
   * Complete Polish translation of logoutd(8). Closes: #668880

Modified: debian/trunk/debian/control
===================================================================
--- debian/trunk/debian/control	2012-05-20 12:28:09 UTC (rev 3735)
+++ debian/trunk/debian/control	2012-05-20 15:30:55 UTC (rev 3736)
@@ -2,9 +2,9 @@
 Section: admin
 Priority: required
 Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Uploaders: Christian Perrier <bubulle at debian.org>, Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>
-Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.16.1~), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [linux-any], libsemanage1-dev [linux-any], gnome-doc-utils (>= 0.4.3)
+Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [linux-any], libsemanage1-dev [linux-any], gnome-doc-utils (>= 0.4.3)
 Vcs-Svn: svn://svn.debian.org/svn/pkg-shadow/debian/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-shadow/debian/trunk
 Homepage: http://pkg-shadow.alioth.debian.org/

Modified: debian/trunk/debian/rules
===================================================================
--- debian/trunk/debian/rules	2012-05-20 12:28:09 UTC (rev 3735)
+++ debian/trunk/debian/rules	2012-05-20 15:30:55 UTC (rev 3736)
@@ -8,15 +8,8 @@
 override DEB_ARCH_PACKAGES=passwd
 endif
 
-# To be set before loading any CDBS files (#651964)
-#CDBS_FIX_COMPILE_FLAGS = 1
 # Enable PIE, BINDNOW, and possible future flags.
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-# Unfortunately, this is not working (#651966), set flags manually
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 # Specify where dh_install will find the files that it needs to move: