[23058] in Source-Commits
/svn/athena r22721 - in trunk/debathena/config/config-build-common: . debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Wed Jan 30 21:09:32 2008
Date: Wed, 30 Jan 2008 21:09:18 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200801310209.VAA14637@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:09:17 -0500 (Wed, 30 Jan 2008)
New Revision: 22721
Added:
trunk/debathena/config/config-build-common/debathena-replace-conffiles.mk
trunk/debathena/config/config-build-common/encode
Modified:
trunk/debathena/config/config-build-common/debathena-check-conffiles.mk
trunk/debathena/config/config-build-common/debathena-divert.mk
trunk/debathena/config/config-build-common/debian/changelog
trunk/debathena/config/config-build-common/debian/debathena-config-build-common.install
Log:
Modified: trunk/debathena/config/config-build-common/debathena-check-conffiles.mk
===================================================================
--- trunk/debathena/config/config-build-common/debathena-check-conffiles.mk 2008-01-30 19:17:05 UTC (rev 22720)
+++ trunk/debathena/config/config-build-common/debathena-check-conffiles.mk 2008-01-31 02:09:17 UTC (rev 22721)
@@ -36,9 +36,11 @@
$(call debathena_check_conffiles_tmp,%): $(truename)
mkdir -p $(@D)
cp "$(truename)" $@
- dpkg-query --showformat='$${Conffiles}\n' --show $(package) | \
+ (dpkg-query --showformat='$${Conffiles}\n' --show $(package); \
+ cat /var/lib/dpkg/info/$(package).md5sums | \
+ awk '{ print " /" $$2 " " $$1 }' | grep $(name)) | \
sed -n 's,^ $(name) \(.*\)$$,\1 $@, p' | \
- md5sum -c # Check that the file has not been modified.
+ md5sum -c # Check that the file has not been modified.
clean::
rm -rf $(DEBATHENA_CHECK_CONFFILES_DIR)
Modified: trunk/debathena/config/config-build-common/debathena-divert.mk
===================================================================
--- trunk/debathena/config/config-build-common/debathena-divert.mk 2008-01-30 19:17:05 UTC (rev 22720)
+++ trunk/debathena/config/config-build-common/debathena-divert.mk 2008-01-31 02:09:17 UTC (rev 22721)
@@ -7,8 +7,15 @@
DEBATHENA_DIVERT_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
$(if $(DEBATHENA_DIVERT_FILES_$(package)),$(package)))
+DEBATHENA_DIVERT_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
+ $(if $(DEBATHENA_REPLACE_CONFFILES_$(package)),$(package)))
+
+ifeq ($(DEBATHENA_DIVERT_SUFFIX),)
DEBATHENA_DIVERT_SUFFIX = .debathena
+endif
+DEBATHENA_DIVERT_ENCODER = /usr/share/debathena-config-build-common/encode
+
$(patsubst %,debathena-divert/%,$(DEBATHENA_DIVERT_PACKAGES)) :: debathena-divert/%:
( \
sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEBATHENA_DIVERT_SUFFIX#/$(DEBATHENA_DIVERT_SUFFIX)/g' $(DEBATHENA_DIVERT_SCRIPT); \
@@ -28,5 +35,12 @@
echo 'fi'; \
) \
) >> $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper
+ ( \
+ echo -n "divert:Diverted="; \
+ $(foreach file,$(DEBATHENA_DIVERT_FILES_$(cdbs_curpkg)),\
+ ${DEBATHENA_DIVERT_ENCODER} "$(subst $(DEBATHENA_DIVERT_SUFFIX),,$(file))"; \
+ echo -n ", ";) \
+ echo \
+ ) >> $(CURDIR)/debian/$(cdbs_curpkg).substvars
$(patsubst %,binary-fixup/%,$(DEBATHENA_DIVERT_PACKAGES)) :: binary-fixup/%: debathena-divert/%
Added: trunk/debathena/config/config-build-common/debathena-replace-conffiles.mk
Modified: trunk/debathena/config/config-build-common/debian/changelog
===================================================================
--- trunk/debathena/config/config-build-common/debian/changelog 2008-01-30 19:17:05 UTC (rev 22720)
+++ trunk/debathena/config/config-build-common/debian/changelog 2008-01-31 02:09:17 UTC (rev 22721)
@@ -1,3 +1,19 @@
+debathena-config-build-common (3.6) unstable; urgency=low
+
+ * Add new debathena-replace-conffiles.mk, a more user-friendly wrapper
+ for debathena-check-conffiles.mk and debathena-divert.mk.
+ * Change debathena-check-conffiles.mk to allow checking md5sums of
+ packaged files which are not marked as configuration files
+ (e.g. /etc/adduser/adduser.conf).
+ * Change debathena-divert.mk to not set DEBATHENA_DIVERT_SUFFIX unless
+ it is not already set.
+ * Change debathena-divert.mk to support adding Provides: and Conflicts:
+ lines for each diverted configuration file.
+ * Change debathena-divert.mk to divert everything in
+ DEBATHENA_REPLACE_CONFFILES.
+
+ -- Tim Abbott <tabbott@mit.edu> Wed, 30 Jan 2008 20:03:36 -0500
+
debathena-config-build-common (3.5) unstable; urgency=low
* Change check-conffiles interface to make it work properly with
Modified: trunk/debathena/config/config-build-common/debian/debathena-config-build-common.install
===================================================================
--- trunk/debathena/config/config-build-common/debian/debathena-config-build-common.install 2008-01-30 19:17:05 UTC (rev 22720)
+++ trunk/debathena/config/config-build-common/debian/debathena-config-build-common.install 2008-01-31 02:09:17 UTC (rev 22721)
@@ -1,5 +1,7 @@
debathena-divert.mk usr/share/cdbs/1/rules/
debathena-debconf-hack.mk usr/share/cdbs/1/rules/
debathena-check-conffiles.mk usr/share/cdbs/1/rules/
+debathena-replace-conffiles.mk usr/share/cdbs/1/rules/
+encode usr/share/debathena-config-build-common/
divert.sh.in usr/share/debathena-config-build-common/
debconf-hack.sh usr/share/debathena-config-build-common/
Added: trunk/debathena/config/config-build-common/encode
Property changes on: trunk/debathena/config/config-build-common/encode
___________________________________________________________________
Name: svn:executable
+ *
