Move templates in preparation for using a single template system

svn path=/dists/trunk/linux/; revision=20505

debian/changelog

@@ -10,6 +10,8 @@ linux (3.11~rc5-1~exp1) UNRELEASED; urgency=low
   * irq: Always define devm_{request_threaded,free}_irq() (fixes FTBFS on
     s390,s390x)
   * [armel] Disable iop32x and ixp4xx flavours (fixes FTBFS)
+  * 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
 

debian/rules.real

@@ -289,7 +289,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(
 
 	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)_$(FLAVOUR)_plain_templates \
 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; \