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

[Christian Perrier]

Author: bubulle
Date: 2007-05-07 14:11:37 +0000 (Mon, 07 May 2007)
New Revision: 1185

Added:
   trunk/debian/compat
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
Switch debhelper compatibility to 5 and do it in debian/compat


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-05-07 12:54:30 UTC (rev 1184)
+++ trunk/debian/changelog	2007-05-07 14:11:37 UTC (rev 1185)
@@ -19,7 +19,8 @@
     - Remove unneeded Build-Depends: bzip2, file, texinfo, libpam-runtime
     - /etc/default/useradd: Mentions the creation of primary user groups is
       neither -n nor -g are specified. See also 407_adduser_disable_PUG_with-n
-    - lo longer include /usr/bin/X11 in defaults PATH variable. Closes: #395890
+    - no longer include /usr/bin/X11 in defaults PATH variable. Closes: #395890
+    - set debhelper compatibility to 5 through debian/compat
   * Upstream bugs not yet fixed in upstream releases or CVS:
     - 493_pwck_no_SHADOWPWD: SHADOWPWD no more exist.
       pwck do not detect missing users in /etc/shadow.

Added: trunk/debian/compat
===================================================================
--- trunk/debian/compat	2007-05-07 12:54:30 UTC (rev 1184)
+++ trunk/debian/compat	2007-05-07 14:11:37 UTC (rev 1185)
@@ -0,0 +1 @@
+5

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-05-07 12:54:30 UTC (rev 1184)
+++ trunk/debian/control	2007-05-07 14:11:37 UTC (rev 1185)
@@ -4,7 +4,7 @@
 Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
 Standards-Version: 3.7.2.0
 Uploaders: Christian Perrier <bubulle at debian.org>, Martin Quinson <mquinson at debian.org>, Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>
-Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper, quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], gnome-doc-utils (>= 0.4.3-1)
+Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 5.0.0), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], gnome-doc-utils (>= 0.4.3-1)
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-shadow/trunk
 
 Package: passwd

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-05-07 12:54:30 UTC (rev 1184)
+++ trunk/debian/rules	2007-05-07 14:11:37 UTC (rev 1185)
@@ -8,8 +8,6 @@
 override DEB_ARCH_PACKAGES=passwd
 endif
 
-export DH_COMPAT = 4
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 # Specify where dh_install will find the files that it needs to move:
 DEB_DH_INSTALL_SOURCEDIR=debian/tmp