[23877] in Source-Commits
/svn/athena r23487 - in trunk/debathena/config: chrony-config/debian ntp-config/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Sat Feb 28 17:47:07 2009
Date: Sat, 28 Feb 2009 17:46:18 -0500
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200902282246.n1SMkI2K025287@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-02-28 17:46:18 -0500 (Sat, 28 Feb 2009)
New Revision: 23487
Added:
trunk/debathena/config/chrony-config/debian/transform_chrony.conf.debathena
trunk/debathena/config/ntp-config/debian/transform_ntp.conf.debathena
Removed:
trunk/debathena/config/chrony-config/debian/chrony.conf.debathena
trunk/debathena/config/chrony-config/debian/debathena-chrony-config.install
trunk/debathena/config/ntp-config/debian/debathena-ntp-config.install
trunk/debathena/config/ntp-config/debian/ntp.conf.debathena
Modified:
trunk/debathena/config/chrony-config/debian/changelog
trunk/debathena/config/chrony-config/debian/control.in
trunk/debathena/config/chrony-config/debian/rules
trunk/debathena/config/ntp-config/debian/changelog
trunk/debathena/config/ntp-config/debian/control.in
trunk/debathena/config/ntp-config/debian/rules
Log:
Change debathena-ntp-config and debathena-chrony-config to use
DEB_TRANSFORM_FILES instead of DEB_DIVERT_FILES.
Modified: trunk/debathena/config/chrony-config/debian/changelog
===================================================================
--- trunk/debathena/config/chrony-config/debian/changelog 2009-02-28 22:38:52 UTC (rev 23486)
+++ trunk/debathena/config/chrony-config/debian/changelog 2009-02-28 22:46:18 UTC (rev 23487)
@@ -1,3 +1,9 @@
+debathena-chrony-config (1.2) unstable; urgency=low
+
+ * Switch to using DEB_TRANSFORM_FILES instead of DEB_DIVERT_FILES
+
+ -- Evan Broder <broder@mit.edu> Sun, 25 Jan 2009 22:43:02 -0500
+
debathena-chrony-config (1.1) unstable; urgency=low
* Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL.
Deleted: trunk/debathena/config/chrony-config/debian/chrony.conf.debathena
Modified: trunk/debathena/config/chrony-config/debian/control.in
===================================================================
--- trunk/debathena/config/chrony-config/debian/control.in 2009-02-28 22:38:52 UTC (rev 23486)
+++ trunk/debathena/config/chrony-config/debian/control.in 2009-02-28 22:46:18 UTC (rev 23487)
@@ -2,7 +2,7 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: @cdbs@
+Build-Depends: @cdbs@, chrony
Standards-Version: 3.8.0
Package: debathena-chrony-config
Deleted: trunk/debathena/config/chrony-config/debian/debathena-chrony-config.install
Modified: trunk/debathena/config/chrony-config/debian/rules
===================================================================
--- trunk/debathena/config/chrony-config/debian/rules 2009-02-28 22:38:52 UTC (rev 23486)
+++ trunk/debathena/config/chrony-config/debian/rules 2009-02-28 22:46:18 UTC (rev 23487)
@@ -1,7 +1,12 @@
#!/usr/bin/make -f
DEB_DIVERT_EXTENSION = .debathena
-DEB_DIVERT_FILES_debathena-chrony-config += \
+DEB_TRANSFORM_FILES_debathena-chrony-config += \
/etc/chrony/chrony.conf.debathena
+ifneq ($(wildcard /usr/share/chrony/chrony.conf),)
+ DEB_CHECK_FILES_SOURCE_/etc/chrony/chrony.conf.debathena = \
+ /usr/share/chrony/chrony.conf
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
Added: trunk/debathena/config/chrony-config/debian/transform_chrony.conf.debathena
===================================================================
--- trunk/debathena/config/chrony-config/debian/transform_chrony.conf.debathena 2009-02-28 22:38:52 UTC (rev 23486)
+++ trunk/debathena/config/chrony-config/debian/transform_chrony.conf.debathena 2009-02-28 22:46:18 UTC (rev 23487)
@@ -0,0 +1,4 @@
+#!/usr/bin/perl -0p
+s/^server .*$/###SERVER/m or die;
+s/^server .*$//mg;
+s/###SERVER/server TIME.MIT.EDU/ or die;
Property changes on: trunk/debathena/config/chrony-config/debian/transform_chrony.conf.debathena
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/debathena/config/ntp-config/debian/changelog
===================================================================
--- trunk/debathena/config/ntp-config/debian/changelog 2009-02-28 22:38:52 UTC (rev 23486)
+++ trunk/debathena/config/ntp-config/debian/changelog 2009-02-28 22:46:18 UTC (rev 23487)
@@ -1,3 +1,9 @@
+debathena-ntp-config (1.2) unstable; urgency=low
+
+ * Switch to using DEB_TRANSFORM_FILES instead of DEB_DIVERT_FILES
+
+ -- Evan Broder <broder@mit.edu> Sun, 25 Jan 2009 22:26:39 -0500
+
debathena-ntp-config (1.1) unstable; urgency=low
* Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL.
Modified: trunk/debathena/config/ntp-config/debian/control.in
===================================================================
--- trunk/debathena/config/ntp-config/debian/control.in 2009-02-28 22:38:52 UTC (rev 23486)
+++ trunk/debathena/config/ntp-config/debian/control.in 2009-02-28 22:46:18 UTC (rev 23487)
@@ -2,7 +2,7 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: @cdbs@
+Build-Depends: @cdbs@, ntp
Standards-Version: 3.8.0
Package: debathena-ntp-config
Deleted: trunk/debathena/config/ntp-config/debian/debathena-ntp-config.install
Deleted: trunk/debathena/config/ntp-config/debian/ntp.conf.debathena
Modified: trunk/debathena/config/ntp-config/debian/rules
===================================================================
--- trunk/debathena/config/ntp-config/debian/rules 2009-02-28 22:38:52 UTC (rev 23486)
+++ trunk/debathena/config/ntp-config/debian/rules 2009-02-28 22:46:18 UTC (rev 23487)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
DEB_DIVERT_EXTENSION = .debathena
-DEB_DIVERT_FILES_debathena-ntp-config += \
+DEB_TRANSFORM_FILES_debathena-ntp-config += \
/etc/ntp.conf.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
Added: trunk/debathena/config/ntp-config/debian/transform_ntp.conf.debathena
===================================================================
--- trunk/debathena/config/ntp-config/debian/transform_ntp.conf.debathena 2009-02-28 22:38:52 UTC (rev 23486)
+++ trunk/debathena/config/ntp-config/debian/transform_ntp.conf.debathena 2009-02-28 22:46:18 UTC (rev 23487)
@@ -0,0 +1,4 @@
+#!/usr/bin/perl -0p
+s/^server .*$/###SERVER/m or die;
+s/^server .*$//mg;
+s/###SERVER/server TIME.MIT.EDU/ or die;
Property changes on: trunk/debathena/config/ntp-config/debian/transform_ntp.conf.debathena
___________________________________________________________________
Name: svn:executable
+ *
