Manage all files using .in mecanism. It will simplify the upgrade of

version
2025-06-11 13:13:17 +00:00 · 2014-07-27 20:43:46 +00:00 · 2014-07-27 20:43:46 +00:00 · a068b0d1d2
commit a068b0d1d2
parent 4543161de1
61 changed files with 16 additions and 9 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -7,6 +7,8 @@ llvm-toolchain-3.4 (1:3.4.2-6) unstable; urgency=medium
    polly
  * hurd-EIEIO-undef.diff: try to undef an errno.h to fix the ftbfs
  * clang-X suggests clang-X-doc (Closes: #755922)
+  * Manage all files using .in mecanism. It will simplify the upgrade of
+    version

 -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 23 Jul 2014 13:02:56 +0200

--- a/debian/clang-X.Y-doc.docs.in
+++ b/debian/clang-X.Y-doc.docs.in
--- a/debian/clang-X.Y-doc.install.in
+++ b/debian/clang-X.Y-doc.install.in
--- a/debian/clang-X.Y-examples.examples.in
+++ b/debian/clang-X.Y-examples.examples.in
--- a/debian/clang-X.Y.install.in
+++ b/debian/clang-X.Y.install.in
--- a/debian/clang-X.Y.links.in
+++ b/debian/clang-X.Y.links.in
--- a/debian/clang-X.Y.lintian-overrides.in
+++ b/debian/clang-X.Y.lintian-overrides.in
--- a/debian/clang-X.Y.manpages.in
+++ b/debian/clang-X.Y.manpages.in
--- a/debian/clang-X.Y.postinst.in
+++ b/debian/clang-X.Y.postinst.in
--- a/debian/clang-X.Y.prerm.in
+++ b/debian/clang-X.Y.prerm.in
--- a/debian/clang-format-X.Y.install.in
+++ b/debian/clang-format-X.Y.install.in
--- a/debian/clang-format-X.Y.lintian-overrides.in
+++ b/debian/clang-format-X.Y.lintian-overrides.in
--- a/debian/clang-format-X.Y.manpages.in
+++ b/debian/clang-format-X.Y.manpages.in
--- a/debian/clang-modernize-X.Y.install.in
+++ b/debian/clang-modernize-X.Y.install.in
--- a/debian/clang-modernize-X.Y.lintian-overrides.in
+++ b/debian/clang-modernize-X.Y.lintian-overrides.in
--- a/debian/clang-modernize-X.Y.manpages.in
+++ b/debian/clang-modernize-X.Y.manpages.in
--- a/debian/libclang-X.Y-dev.install.in
+++ b/debian/libclang-X.Y-dev.install.in
--- a/debian/libclang-X.Y-dev.links.in
+++ b/debian/libclang-X.Y-dev.links.in
--- a/debian/libclang-common-X.Y-dev.install.in
+++ b/debian/libclang-common-X.Y-dev.install.in
--- a/debian/libclang-common-X.Y-dev.links.in
+++ b/debian/libclang-common-X.Y-dev.links.in
--- a/debian/libclang1-X.Y.install.in
+++ b/debian/libclang1-X.Y.install.in
--- a/debian/libclang1-X.Y.links.in
+++ b/debian/libclang1-X.Y.links.in
--- a/debian/libclang1-X.Y.lintian-overrides.in
+++ b/debian/libclang1-X.Y.lintian-overrides.in
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Y.symbols.in
--- a/debian/libllvm-X.Y-ocaml-dev.META.in
+++ b/debian/libllvm-X.Y-ocaml-dev.META.in
--- a/debian/libllvm-X.Y-ocaml-dev.dirs.in
+++ b/debian/libllvm-X.Y-ocaml-dev.dirs.in
--- a/debian/libllvm-X.Y-ocaml-dev.doc-base.in
+++ b/debian/libllvm-X.Y-ocaml-dev.doc-base.in
--- a/debian/libllvm-X.Y-ocaml-dev.install.in
+++ b/debian/libllvm-X.Y-ocaml-dev.install.in
--- a/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in
+++ b/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in
--- a/debian/libllvm3.4.links.in
+++ b/debian/libllvm3.4.links.in
@ -1,2 +0,0 @@
-usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1
-
--- a/debian/libllvmX.Y.install.in
+++ b/debian/libllvmX.Y.install.in
--- a/debian/libllvmX.Y.lintian-overrides.in
+++ b/debian/libllvmX.Y.lintian-overrides.in
--- a/debian/lldb-X.Y-dev.install.in
+++ b/debian/lldb-X.Y-dev.install.in
--- a/debian/lldb-X.Y.install.in
+++ b/debian/lldb-X.Y.install.in
--- a/debian/lldb-X.Y.links.in
+++ b/debian/lldb-X.Y.links.in
--- a/debian/lldb-X.Y.lintian-overrides.in
+++ b/debian/lldb-X.Y.lintian-overrides.in
--- a/debian/lldb-X.Y.manpages.in
+++ b/debian/lldb-X.Y.manpages.in
--- a/debian/lldb-X.Y.postinst.in
+++ b/debian/lldb-X.Y.postinst.in
--- a/debian/llvm-X.Y-dev.dirs.in
+++ b/debian/llvm-X.Y-dev.dirs.in
--- a/debian/llvm-X.Y-dev.install.in
+++ b/debian/llvm-X.Y-dev.install.in
--- a/debian/llvm-X.Y-dev.links.in
+++ b/debian/llvm-X.Y-dev.links.in
--- a/debian/llvm-X.Y-doc.dirs.in
+++ b/debian/llvm-X.Y-doc.dirs.in
--- a/debian/llvm-X.Y-doc.install.in
+++ b/debian/llvm-X.Y-doc.install.in
--- a/debian/llvm-X.Y-examples.dirs.in
+++ b/debian/llvm-X.Y-examples.dirs.in
--- a/debian/llvm-X.Y-examples.examples.in
+++ b/debian/llvm-X.Y-examples.examples.in
--- a/debian/llvm-X.Y-examples.links.in
+++ b/debian/llvm-X.Y-examples.links.in
--- a/debian/llvm-X.Y-runtime.binfmt.in
+++ b/debian/llvm-X.Y-runtime.binfmt.in
--- a/debian/llvm-X.Y-runtime.install.in
+++ b/debian/llvm-X.Y-runtime.install.in
--- a/debian/llvm-X.Y-runtime.links.in
+++ b/debian/llvm-X.Y-runtime.links.in
--- a/debian/llvm-X.Y-runtime.manpages.in
+++ b/debian/llvm-X.Y-runtime.manpages.in
--- a/debian/llvm-X.Y-runtime.postinst.in
+++ b/debian/llvm-X.Y-runtime.postinst.in
--- a/debian/llvm-X.Y-runtime.prerm.in
+++ b/debian/llvm-X.Y-runtime.prerm.in
--- a/debian/llvm-X.Y-tools.dirs.in
+++ b/debian/llvm-X.Y-tools.dirs.in
--- a/debian/llvm-X.Y-tools.install.in
+++ b/debian/llvm-X.Y-tools.install.in
--- a/debian/llvm-X.Y.dirs.in
+++ b/debian/llvm-X.Y.dirs.in
--- a/debian/llvm-X.Y.install.in
+++ b/debian/llvm-X.Y.install.in
--- a/debian/llvm-X.Y.links.in
+++ b/debian/llvm-X.Y.links.in
--- a/debian/llvm-X.Y.lintian-overrides.in
+++ b/debian/llvm-X.Y.lintian-overrides.in
--- a/debian/llvm-X.Y.manpages.in
+++ b/debian/llvm-X.Y.manpages.in
--- a/debian/python-clang-X.Y.install.in
+++ b/debian/python-clang-X.Y.install.in
--- a/debian/rules
+++ b/debian/rules
@ -130,14 +130,22 @@ endif
 	dh $@ --with ocaml


-debian/%: debian/%.in
-	sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $< > $@
+
+preconfigure:
+	for f in debian/*.in; do \
+		f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \
+		echo "$$f => $$f2"; \
+		sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \
+			-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
+			-e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \
+	done

 # Override this two targets. They are trying to manage the .in conversion for me
 override_dh_ocamlinit:
 override_dh_ocamlclean:

-override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/libclang1-$(LLVM_VERSION).install.in debian/lldb-$(LLVM_VERSION).links debian/libllvm$(LLVM_VERSION).install debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.install debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm debian/libclang-$(LLVM_VERSION)-dev.links debian/libclang1-$(LLVM_VERSION).install debian/pollycc
+
+override_dh_auto_configure: preconfigure
 	echo "Using gcc: "
 	$(CC) -v
 	mkdir -p $(TARGET_BUILD)
@ -343,16 +351,12 @@ override_dh_installman:
 	rm -f $(CURDIR)/debian/llvm-$(LLVM_VERSION)/usr/share/man/man1/lli*


-.PHONY: override_dh_strip
 override_dh_strip:
 	dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbg-package=libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg
 	dh_strip -p libllvm$(LLVM_VERSION) --dbg-package=libllvm$(LLVM_VERSION)-dbg
 	dh_strip -a


-#override_dh_shlibdeps:
-#	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps
-
 override_dh_install:
 	dh_install --fail-missing

@ -444,3 +448,6 @@ override_dh_auto_clean:
 	rm -f $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim
 	rm -f $(CURDIR)/clang/tools/clang-format/clang-format-diff-$(LLVM_VERSION)
 	rm -f $(CURDIR)/clang/tools/clang-format/clang-format-$(LLVM_VERSION).py
+
+
+.PHONY: override_dh_strip preconfigure
				`@ -1,2 +0,0 @@`
				`usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1`