[23061] in Source-Commits
/svn/athena r22724 - trunk/debathena/config/ldap-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Wed Jan 30 21:13:38 2008
Date: Wed, 30 Jan 2008 21:13:26 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200801310213.VAA14711@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-01-30 21:13:26 -0500 (Wed, 30 Jan 2008)
New Revision: 22724
Added:
trunk/debathena/config/ldap-config/debian/transform_ldap.conf.debathena
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-01-31 02:12:58 UTC (rev 22723)
+++ trunk/debathena/config/ldap-config/debian/changelog 2008-01-31 02:13:26 UTC (rev 22724)
@@ -1,3 +1,9 @@
+debathena-ldap-config (1.1) unstable; urgency=low
+
+ * Use new debathena-replace-conffiles interface.
+
+ -- Tim Abbott <tabbott@mit.edu> Wed, 30 Jan 2008 19:03:02 -0500
+
debathena-ldap-config (1.0) unstable; urgency=low
* Initial release.
Modified: trunk/debathena/config/ldap-config/debian/control
===================================================================
--- trunk/debathena/config/ldap-config/debian/control 2008-01-31 02:12:58 UTC (rev 22723)
+++ trunk/debathena/config/ldap-config/debian/control 2008-01-31 02:13:26 UTC (rev 22724)
@@ -2,12 +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~), libldap2
+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
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}
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-01-31 02:12:58 UTC (rev 22723)
+++ trunk/debathena/config/ldap-config/debian/control.in 2008-01-31 02:13:26 UTC (rev 22724)
@@ -8,6 +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}
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-01-31 02:12:58 UTC (rev 22723)
+++ trunk/debathena/config/ldap-config/debian/rules 2008-01-31 02:13:26 UTC (rev 22724)
@@ -1,18 +1,8 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-ldap-config += \
+DEBATHENA_REPLACE_CONFFILES_debathena-ldap-config += \
/etc/ldap/ldap.conf.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-divert.mk
-include /usr/share/cdbs/1/rules/debathena-check-conffiles.mk
+include /usr/share/cdbs/1/rules/debathena-replace-conffiles.mk
-common-build-indep:: debian/ldap.conf.debathena
-
-debian/ldap.conf.debathena: $(call debathena_check_conffiles,/etc/ldap/ldap.conf)
- perl -0pe ' \
- s/^#BASE.*$$/BASE\tdc=mit, dc=edu/m and \
- s/^#URI.*$$/URI\tldap:\/\/ldap.mit.edu\nTLS_CACERT\t\/usr\/share\/debathena-ssl-certificates\/mitCA.pem/m or die' $< > $@
-
-clean::
- rm -f debian/ldap.conf.debathena
Added: trunk/debathena/config/ldap-config/debian/transform_ldap.conf.debathena
Property changes on: trunk/debathena/config/ldap-config/debian/transform_ldap.conf.debathena
___________________________________________________________________
Name: svn:executable
+ *
