[23222] in Source-Commits
/svn/athena r22883 - trunk/debathena/config/linerva/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 22:39:30 2008
Date: Sun, 6 Apr 2008 22:39:18 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070239.WAA05525@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-06 22:39:17 -0400 (Sun, 06 Apr 2008)
New Revision: 22883
Modified:
trunk/debathena/config/linerva/debian/control
trunk/debathena/config/linerva/debian/control.in
trunk/debathena/config/linerva/debian/rules
Log:
Modified: trunk/debathena/config/linerva/debian/control
===================================================================
--- trunk/debathena/config/linerva/debian/control 2008-04-07 02:32:46 UTC (rev 22882)
+++ trunk/debathena/config/linerva/debian/control 2008-04-07 02:39:17 UTC (rev 22883)
@@ -2,13 +2,15 @@
Section: linerva/net
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debathena-config-build-common, debathena-config-build-common
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev
Standards-Version: 3.7.2
Package: debathena-linerva
Architecture: i386
Pre-Depends: logcheck, screen, elinks
Recommends:
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: Special Configuration for Linerva
This package does all the special stuff needed for Linerva's security
setup. It should be idempotent, though we do not guarantee that it
Modified: trunk/debathena/config/linerva/debian/control.in
===================================================================
--- trunk/debathena/config/linerva/debian/control.in 2008-04-07 02:32:46 UTC (rev 22882)
+++ trunk/debathena/config/linerva/debian/control.in 2008-04-07 02:39:17 UTC (rev 22883)
@@ -2,13 +2,15 @@
Section: linerva/net
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: @cdbs@, debathena-config-build-common
+Build-Depends: @cdbs@
Standards-Version: 3.7.2
Package: debathena-linerva
Architecture: i386
Pre-Depends: logcheck, screen, elinks
Recommends:
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: Special Configuration for Linerva
This package does all the special stuff needed for Linerva's security
setup. It should be idempotent, though we do not guarantee that it
Modified: trunk/debathena/config/linerva/debian/rules
===================================================================
--- trunk/debathena/config/linerva/debian/rules 2008-04-07 02:32:46 UTC (rev 22882)
+++ trunk/debathena/config/linerva/debian/rules 2008-04-07 02:39:17 UTC (rev 22883)
@@ -1,7 +1,8 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-linerva += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_DIVERT_FILES_debathena-linerva += \
/etc/logcheck/logcheck.conf.debathena \
/etc/logcheck/ignore.d.server/kernel.debathena \
/etc/logcheck/ignore.d.server/perl.debathena \
@@ -28,4 +29,4 @@
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-divert.mk
+include /usr/share/cdbs/1/rules/replace-files.mk
