[28793] in Source-Commits
afs-config commit: debian/rules: Remove special handling for Numenor
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Sun Aug 20 16:27:17 2017
Date: Sun, 20 Aug 2017 16:27:11 -0400
From: Geoffrey Thomas <geofft@mit.edu>
Message-Id: <201708202027.v7KKRBlB012035@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/afs-config/commit/06bd5e26bad038197e516d1f174abe1c2360de58
commit 06bd5e26bad038197e516d1f174abe1c2360de58
Author: Geoffrey Thomas <geofft@ldpreload.com>
Date: Sat Aug 19 23:26:20 2017 -0400
debian/rules: Remove special handling for Numenor
debian/CellAlias.athena | 13 -
debian/CellAlias.debathena | 13 +
debian/CellServDB.athena | 670 -------------------------------------
debian/CellServDB.debathena | 670 +++++++++++++++++++++++++++++++++++++
debian/changelog | 1 +
debian/rules | 19 +-
6 files changed, 688 insertions(+), 698 deletions(-)
diff --git a/debian/CellAlias.athena b/debian/CellAlias.debathena
similarity index 100%
rename from debian/CellAlias.athena
rename to debian/CellAlias.debathena
diff --git a/debian/CellAlias.debathena-extra b/debian/CellAlias.debathena-extra
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/CellServDB.athena b/debian/CellServDB.debathena
similarity index 100%
rename from debian/CellServDB.athena
rename to debian/CellServDB.debathena
diff --git a/debian/CellServDB.debathena-extra b/debian/CellServDB.debathena-extra
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/changelog b/debian/changelog
index 7b0586b..c767c7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
debathena-afs-config (1.26) UNRELEASED; urgency=medium
* Update CellServDB from /afs/athena/service/CellServDB.new.
+ * debian/rules: Remove special handling for Numenor.
-- Geoffrey Thomas <geofft@mit.edu> Sat, 19 Aug 2017 23:12:48 -0400
diff --git a/debian/rules b/debian/rules
index b17775f..40ebf02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,26 +13,15 @@ DEB_TRANSFORM_FILES_debathena-afs-config += \
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
-FROM_ATHENA = debian/CellAlias.debathena debian/CellServDB.debathena
-ATHENA = $(patsubst %.debathena,%.athena,$(FROM_ATHENA))
+ATHENA = debian/CellAlias.debathena debian/CellServDB.debathena
-clean:: $(ATHENA) clean-from-athena
+common-build-indep:: $(ATHENA)
-clean-from-athena:
- rm -f $(FROM_ATHENA)
-
-common-build-indep:: $(FROM_ATHENA)
-
-$(ATHENA) : %.athena: FORCE
- wget https://stuff.mit.edu/afs/athena.mit.edu/service/$(patsubst debian/%.athena,%,$@) -O $@.new
+$(ATHENA): FORCE
+ wget https://stuff.mit.edu/afs/athena.mit.edu/service/$(patsubst debian/%.debathena,%,$@) -O $@.new
diff -q $@ $@.new # Check that they are the same.
rm -f $@.new
-$(FROM_ATHENA) : %.debathena: %.athena %.debathena-extra
- cat $^ >| $@.tmp
- diff -q $@.tmp $@ || mv $@.tmp $@
- rm -f $@.tmp
-
FORCE:
.PRECIOUS: $(ATHENA)
