[PATCH 2/4] Move templates in preparation for using a single template system

[Ben Hutchings <ben@decadent.org.uk>]

[Omitted the file diffs for renaming, which is done like this:

mkdir debian/templates/po/
mv debian/po/* debian/templates/po/
for type in headers image; do
    for file in debian/templates/temp.$type.plain/*; do
        mv $file debian/templates/$type.$(basename $file).in
    done
done
]

--- a/debian/rules.real
+++ b/debian/rules.real
@@ -289,7 +289,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(
 
 	install -d $(PACKAGE_DIR)/DEBIAN
 	sed -e 's/=V/$(REAL_VERSION)/g' \
-	  debian/templates/temp.headers.plain/postinst \
+	  debian/templates/headers.plain.postinst.in \
 	  > $(PACKAGE_DIR)/DEBIAN/postinst
 	chmod 755 $(PACKAGE_DIR)/DEBIAN/postinst
 
@@ -430,16 +430,18 @@ install-image_powerpcspe_$(FEATURESET)_$
 install-image_ppc64_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
 
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
-	for i in $(wildcard debian/templates/temp.image.plain/*); do \
+	for i in $(wildcard debian/templates/image.plain.*.in); do \
+	  target=$$(basename $$i .in); \
+	  target=$${target#image.plain.}; \
 	  sed \
 	    -e 's@=B@$(KERNEL_ARCH)@g' \
 	    -e 's/=I/$(ARG_INITRD)/g' \
 	    -e 's/=K/$(ARG_KIMAGE)/g' \
 	    -e 's/=V/$(REAL_VERSION)/g' \
-	    $$i > debian/$(PACKAGE_NAME).$$(basename $$i) || exit; \
+	    $$i > debian/$(PACKAGE_NAME).$$target || exit; \
 	done
 	mkdir -p debian/$(PACKAGE_NAME).po
-	for i in $(wildcard debian/po/*.po); do \
+	for i in $(wildcard debian/templates/po/*.po); do \
 	  sed \
 	    -e 's/=V/$(REAL_VERSION)/g' \
 	    $$i > debian/$(PACKAGE_NAME).po/$$(basename $$i) || exit; \
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ linux (3.11~rc4-1~exp2) UNRELEASED; urge
   * [arm,mips,s390,sh4] Enable KPROBES
   * trace: Enable KPROBE_EVENT (Closes: #640953)
   * trace: Enable UPROBES, UPROBE_EVENT (Closes: #691167)
+  * Clean up maintainer scripts and templating system
+    - Move all templates under debian/templates
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 11 Aug 2013 19:34:47 +0200
 

-- 
Ben Hutchings
Man invented language to satisfy his deep need to complain. - Lily Tomlin

Attachment: signature.asc
Description: This is a digitally signed message part