[23210] in Source-Commits
/svn/athena r22871 - trunk/debathena/config/ldap-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 21:03:40 2008
Date: Sun, 6 Apr 2008 21:03:07 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070103.VAA04051@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 21:03:07 -0400 (Sun, 06 Apr 2008)
New Revision: 22871
Modified:
trunk/debathena/config/ldap-config/debian/changelog
trunk/debathena/config/ldap-config/debian/control
trunk/debathena/config/ldap-config/debian/control.in
trunk/debathena/config/ldap-config/debian/rules
Log:
Modified: trunk/debathena/config/ldap-config/debian/changelog
===================================================================
--- trunk/debathena/config/ldap-config/debian/changelog 2008-04-07 00:59:24 UTC (rev 22870)
+++ trunk/debathena/config/ldap-config/debian/changelog 2008-04-07 01:03:07 UTC (rev 22871)
@@ -1,3 +1,9 @@
+debathena-ldap-config (1.2) unstable; urgency=low
+
+ * Use new config-package-dev interface.
+
+ -- Tim Abbott <tabbott@mit.edu> Sun, 6 Apr 2008 21:02:41 -0400
+
debathena-ldap-config (1.1) unstable; urgency=low
* Use new debathena-replace-conffiles interface.
Modified: trunk/debathena/config/ldap-config/debian/control
===================================================================
--- trunk/debathena/config/ldap-config/debian/control 2008-04-07 00:59:24 UTC (rev 22870)
+++ trunk/debathena/config/ldap-config/debian/control 2008-04-07 01:03:07 UTC (rev 22871)
@@ -2,14 +2,14 @@
Section: debathena-config/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 (>= 3.5~), debathena-config-build-common, libldap2
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev, libldap2
Standards-Version: 3.7.2
Package: debathena-ldap-config
Architecture: all
Depends: debathena-ssl-certificates, libsasl2-modules-gssapi-mit | libsasl2-gssapi-mit, libldap2, ${misc:Depends}
-Provides: ${divert:Diverted}
-Conflicts: ${divert:Diverted}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: LDAP configuration for Debian-Athena
This package configures your system to use ldap.mit.edu as its
default LDAP server.
Modified: trunk/debathena/config/ldap-config/debian/control.in
===================================================================
--- trunk/debathena/config/ldap-config/debian/control.in 2008-04-07 00:59:24 UTC (rev 22870)
+++ trunk/debathena/config/ldap-config/debian/control.in 2008-04-07 01:03:07 UTC (rev 22871)
@@ -8,8 +8,8 @@
Package: debathena-ldap-config
Architecture: all
Depends: debathena-ssl-certificates, libsasl2-modules-gssapi-mit | libsasl2-gssapi-mit, libldap2, ${misc:Depends}
-Provides: ${divert:Diverted}
-Conflicts: ${divert:Diverted}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: LDAP configuration for Debian-Athena
This package configures your system to use ldap.mit.edu as its
default LDAP server.
Modified: trunk/debathena/config/ldap-config/debian/rules
===================================================================
--- trunk/debathena/config/ldap-config/debian/rules 2008-04-07 00:59:24 UTC (rev 22870)
+++ trunk/debathena/config/ldap-config/debian/rules 2008-04-07 01:03:07 UTC (rev 22871)
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_REPLACE_CONFFILES_debathena-ldap-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_REPLACE_FILES_debathena-ldap-config += \
/etc/ldap/ldap.conf.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-replace-conffiles.mk
-
+include /usr/share/cdbs/1/rules/replace-files.mk
