[openjdk-8] 02/02: Moved the control templates for cacao, jamvm and zero in the debian/templates directory

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri May 16 22:33:06 UTC 2014


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 d05f8ff801145637072d73061566d521ae961a99
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 16 14:17:31 2014 +0200

    Moved the control templates for cacao, jamvm and zero in the debian/templates directory
---
 debian/rules                                                 | 6 +++---
 debian/{control.cacao-jre => templates/control.cacao-jre.in} | 0
 debian/{control.jamvm-jre => templates/control.jamvm-jre.in} | 0
 debian/{control.zero-jre => templates/control.zero-jre.in}   | 0
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6b933b6..03f3fc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -752,9 +752,9 @@ debian/control: debian/templates/control.in debian/rules
 	      -e 's/@altzero_archs@/$(altzero_archs)/g' \
 	      -e 's/@lib_arch@/$(p_lib_arch)/g' \
 	    debian/templates/control.in \
-	    $(if $(cacao_archs), debian/control.cacao-jre) \
-	    $(if $(jamvm_archs), debian/control.jamvm-jre) \
-	    $(if $(altzero_archs), debian/control.zero-jre) \
+	    $(if $(cacao_archs),   debian/templates/control.cacao-jre.in) \
+	    $(if $(jamvm_archs),   debian/templates/control.jamvm-jre.in) \
+	    $(if $(altzero_archs), debian/templates/control.zero-jre.in) \
 	    $(if $(DEB_HOST_MULTIARCH),,| grep -v '^Multi-Arch') \
 		> debian/control
 	@if cmp -s debian/control debian/control.old; then \
diff --git a/debian/control.cacao-jre b/debian/templates/control.cacao-jre.in
similarity index 100%
rename from debian/control.cacao-jre
rename to debian/templates/control.cacao-jre.in
diff --git a/debian/control.jamvm-jre b/debian/templates/control.jamvm-jre.in
similarity index 100%
rename from debian/control.jamvm-jre
rename to debian/templates/control.jamvm-jre.in
diff --git a/debian/control.zero-jre b/debian/templates/control.zero-jre.in
similarity index 100%
rename from debian/control.zero-jre
rename to debian/templates/control.zero-jre.in

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



More information about the pkg-java-commits mailing list