[openjdk-8] 09/10: Moved the templates in debian/templates

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit 64ad0a99c587de528f3de4753ea06b15724722eb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Mar 29 00:54:31 2014 +0100

    Moved the templates in debian/templates
---
 debian/rules                                        | 14 +++++++-------
 debian/{ => templates}/JB-archive.applications.in   |  0
 debian/{ => templates}/JB-archive.keys.in           |  0
 debian/{ => templates}/JB-archive.mime.in           |  0
 debian/{ => templates}/JB-demo.menu.in              |  0
 debian/{ => templates}/JB-demo.overrides.in         |  0
 debian/{ => templates}/JB-doc.doc-base.in           |  0
 debian/{ => templates}/JB-fonts.defoma-hints.in     |  0
 debian/{ => templates}/JB-java.desktop.in           |  0
 debian/{ => templates}/JB-jconsole.desktop.in       |  0
 debian/{ => templates}/JB-jdk.menu.in               |  0
 debian/{ => templates}/JB-jdk.postinst.in           |  0
 debian/{ => templates}/JB-jdk.preinst.in            |  0
 debian/{ => templates}/JB-jdk.prerm.in              |  0
 debian/{ => templates}/JB-jre-headless.overrides.in |  0
 debian/{ => templates}/JB-jre-headless.postinst.in  |  0
 debian/{ => templates}/JB-jre-headless.postrm.in    |  0
 debian/{ => templates}/JB-jre-headless.preinst.in   |  0
 debian/{ => templates}/JB-jre-headless.prerm.in     |  0
 debian/{ => templates}/JB-jre-zero.overrides.in     |  0
 debian/{ => templates}/JB-jre.menu.in               |  0
 debian/{ => templates}/JB-jre.postinst.in           |  0
 debian/{ => templates}/JB-jre.preinst.in            |  0
 debian/{ => templates}/JB-jre.prerm.in              |  0
 debian/{ => templates}/JB-policytool.desktop.in     |  0
 debian/{ => templates}/README.alternatives.in       |  0
 debian/{ => templates}/control.in                   |  0
 27 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index cbef0c2..e5c18b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -942,7 +942,7 @@ control_vars += '-Vtzdata:Depends=$(pkg_tzdata)'
 pkg_jcommon = java-common (>= 0.28)
 control_vars += '-Vjcommon:Depends=$(pkg_jcommon)'
 
-debian/control: debian/control.in debian/rules
+debian/control: debian/templates/control.in debian/rules
 	@cp -p debian/control debian/control.old
 	sed \
 	      -e 's/@basename@/$(basename)/g' \
@@ -970,7 +970,7 @@ debian/control: debian/control.in debian/rules
 	      -e 's/@hotspot_archs@/$(hotspot_archs)/g' \
 	      -e 's/@altzero_archs@/$(altzero_archs)/g' \
 	      -e 's/@lib_arch@/$(p_lib_arch)/g' \
-	    debian/control.in \
+	    debian/templates/control.in \
 	    $(if $(cacao_archs), debian/control.cacao-jre) \
 	    $(if $(transitional_cacao_pkg), debian/control.cacao-trans) \
 	    $(if $(jamvm_archs), debian/control.jamvm-jre) \
@@ -987,9 +987,9 @@ debian/control: debian/control.in debian/rules
 	fi
 
 packaging-files:
-	for f in debian/*.in debian/patches/*.in; do \
-	  case "$$f" in debian/control.in) continue; esac; \
-	  f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \
+	for f in debian/templates/*.in debian/patches/*.in; do \
+	  case "$$f" in debian/templates/control.in) continue; esac; \
+	  f2=$$(echo $$f | sed 's/\/templates//;s/JB/$(basename)/;s/\.in$$//'); \
 	  sed -e 's/@JRE@/$(p_jre)/g' \
 	      -e 's/@JDK@/$(p_jdk)/g' \
 	      -e 's/@vendor@/$(Vendor)/g' \
@@ -1431,8 +1431,8 @@ debian-clean:
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	for f in debian/*.in debian/patches/*.in; do \
-	  f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \
+	for f in debian/templates/*.in debian/patches/*.in; do \
+	  f2=$$(echo $$f | sed 's/\/templates//;s/JB/$(basename)/;s/\.in$$//'); \
 	  case "$$f2" in debian/control) continue; esac; \
 	  rm -f $$f2; \
 	done
diff --git a/debian/JB-archive.applications.in b/debian/templates/JB-archive.applications.in
similarity index 100%
rename from debian/JB-archive.applications.in
rename to debian/templates/JB-archive.applications.in
diff --git a/debian/JB-archive.keys.in b/debian/templates/JB-archive.keys.in
similarity index 100%
rename from debian/JB-archive.keys.in
rename to debian/templates/JB-archive.keys.in
diff --git a/debian/JB-archive.mime.in b/debian/templates/JB-archive.mime.in
similarity index 100%
rename from debian/JB-archive.mime.in
rename to debian/templates/JB-archive.mime.in
diff --git a/debian/JB-demo.menu.in b/debian/templates/JB-demo.menu.in
similarity index 100%
rename from debian/JB-demo.menu.in
rename to debian/templates/JB-demo.menu.in
diff --git a/debian/JB-demo.overrides.in b/debian/templates/JB-demo.overrides.in
similarity index 100%
rename from debian/JB-demo.overrides.in
rename to debian/templates/JB-demo.overrides.in
diff --git a/debian/JB-doc.doc-base.in b/debian/templates/JB-doc.doc-base.in
similarity index 100%
rename from debian/JB-doc.doc-base.in
rename to debian/templates/JB-doc.doc-base.in
diff --git a/debian/JB-fonts.defoma-hints.in b/debian/templates/JB-fonts.defoma-hints.in
similarity index 100%
rename from debian/JB-fonts.defoma-hints.in
rename to debian/templates/JB-fonts.defoma-hints.in
diff --git a/debian/JB-java.desktop.in b/debian/templates/JB-java.desktop.in
similarity index 100%
rename from debian/JB-java.desktop.in
rename to debian/templates/JB-java.desktop.in
diff --git a/debian/JB-jconsole.desktop.in b/debian/templates/JB-jconsole.desktop.in
similarity index 100%
rename from debian/JB-jconsole.desktop.in
rename to debian/templates/JB-jconsole.desktop.in
diff --git a/debian/JB-jdk.menu.in b/debian/templates/JB-jdk.menu.in
similarity index 100%
rename from debian/JB-jdk.menu.in
rename to debian/templates/JB-jdk.menu.in
diff --git a/debian/JB-jdk.postinst.in b/debian/templates/JB-jdk.postinst.in
similarity index 100%
rename from debian/JB-jdk.postinst.in
rename to debian/templates/JB-jdk.postinst.in
diff --git a/debian/JB-jdk.preinst.in b/debian/templates/JB-jdk.preinst.in
similarity index 100%
rename from debian/JB-jdk.preinst.in
rename to debian/templates/JB-jdk.preinst.in
diff --git a/debian/JB-jdk.prerm.in b/debian/templates/JB-jdk.prerm.in
similarity index 100%
rename from debian/JB-jdk.prerm.in
rename to debian/templates/JB-jdk.prerm.in
diff --git a/debian/JB-jre-headless.overrides.in b/debian/templates/JB-jre-headless.overrides.in
similarity index 100%
rename from debian/JB-jre-headless.overrides.in
rename to debian/templates/JB-jre-headless.overrides.in
diff --git a/debian/JB-jre-headless.postinst.in b/debian/templates/JB-jre-headless.postinst.in
similarity index 100%
rename from debian/JB-jre-headless.postinst.in
rename to debian/templates/JB-jre-headless.postinst.in
diff --git a/debian/JB-jre-headless.postrm.in b/debian/templates/JB-jre-headless.postrm.in
similarity index 100%
rename from debian/JB-jre-headless.postrm.in
rename to debian/templates/JB-jre-headless.postrm.in
diff --git a/debian/JB-jre-headless.preinst.in b/debian/templates/JB-jre-headless.preinst.in
similarity index 100%
rename from debian/JB-jre-headless.preinst.in
rename to debian/templates/JB-jre-headless.preinst.in
diff --git a/debian/JB-jre-headless.prerm.in b/debian/templates/JB-jre-headless.prerm.in
similarity index 100%
rename from debian/JB-jre-headless.prerm.in
rename to debian/templates/JB-jre-headless.prerm.in
diff --git a/debian/JB-jre-zero.overrides.in b/debian/templates/JB-jre-zero.overrides.in
similarity index 100%
rename from debian/JB-jre-zero.overrides.in
rename to debian/templates/JB-jre-zero.overrides.in
diff --git a/debian/JB-jre.menu.in b/debian/templates/JB-jre.menu.in
similarity index 100%
rename from debian/JB-jre.menu.in
rename to debian/templates/JB-jre.menu.in
diff --git a/debian/JB-jre.postinst.in b/debian/templates/JB-jre.postinst.in
similarity index 100%
rename from debian/JB-jre.postinst.in
rename to debian/templates/JB-jre.postinst.in
diff --git a/debian/JB-jre.preinst.in b/debian/templates/JB-jre.preinst.in
similarity index 100%
rename from debian/JB-jre.preinst.in
rename to debian/templates/JB-jre.preinst.in
diff --git a/debian/JB-jre.prerm.in b/debian/templates/JB-jre.prerm.in
similarity index 100%
rename from debian/JB-jre.prerm.in
rename to debian/templates/JB-jre.prerm.in
diff --git a/debian/JB-policytool.desktop.in b/debian/templates/JB-policytool.desktop.in
similarity index 100%
rename from debian/JB-policytool.desktop.in
rename to debian/templates/JB-policytool.desktop.in
diff --git a/debian/README.alternatives.in b/debian/templates/README.alternatives.in
similarity index 100%
rename from debian/README.alternatives.in
rename to debian/templates/README.alternatives.in
diff --git a/debian/control.in b/debian/templates/control.in
similarity index 100%
rename from debian/control.in
rename to debian/templates/control.in

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git