diff --git a/debian/changelog b/debian/changelog index 47da9765..396e078d 100644 --- 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 Wed, 23 Jul 2014 13:02:56 +0200 diff --git a/debian/clang-3.4-doc.docs b/debian/clang-X.Y-doc.docs.in similarity index 100% rename from debian/clang-3.4-doc.docs rename to debian/clang-X.Y-doc.docs.in diff --git a/debian/clang-3.4-doc.install b/debian/clang-X.Y-doc.install.in similarity index 100% rename from debian/clang-3.4-doc.install rename to debian/clang-X.Y-doc.install.in diff --git a/debian/clang-3.4-examples.examples b/debian/clang-X.Y-examples.examples.in similarity index 100% rename from debian/clang-3.4-examples.examples rename to debian/clang-X.Y-examples.examples.in diff --git a/debian/clang-3.4.install b/debian/clang-X.Y.install.in similarity index 100% rename from debian/clang-3.4.install rename to debian/clang-X.Y.install.in diff --git a/debian/clang-3.4.links b/debian/clang-X.Y.links.in similarity index 100% rename from debian/clang-3.4.links rename to debian/clang-X.Y.links.in diff --git a/debian/clang-3.4.lintian-overrides b/debian/clang-X.Y.lintian-overrides.in similarity index 100% rename from debian/clang-3.4.lintian-overrides rename to debian/clang-X.Y.lintian-overrides.in diff --git a/debian/clang-3.4.manpages b/debian/clang-X.Y.manpages.in similarity index 100% rename from debian/clang-3.4.manpages rename to debian/clang-X.Y.manpages.in diff --git a/debian/clang-3.4.postinst b/debian/clang-X.Y.postinst.in similarity index 100% rename from debian/clang-3.4.postinst rename to debian/clang-X.Y.postinst.in diff --git a/debian/clang-3.4.prerm b/debian/clang-X.Y.prerm.in similarity index 100% rename from debian/clang-3.4.prerm rename to debian/clang-X.Y.prerm.in diff --git a/debian/clang-format-3.4.install b/debian/clang-format-X.Y.install.in similarity index 100% rename from debian/clang-format-3.4.install rename to debian/clang-format-X.Y.install.in diff --git a/debian/clang-format-3.4.lintian-overrides b/debian/clang-format-X.Y.lintian-overrides.in similarity index 100% rename from debian/clang-format-3.4.lintian-overrides rename to debian/clang-format-X.Y.lintian-overrides.in diff --git a/debian/clang-format-3.4.manpages b/debian/clang-format-X.Y.manpages.in similarity index 100% rename from debian/clang-format-3.4.manpages rename to debian/clang-format-X.Y.manpages.in diff --git a/debian/clang-modernize-3.4.install b/debian/clang-modernize-X.Y.install.in similarity index 100% rename from debian/clang-modernize-3.4.install rename to debian/clang-modernize-X.Y.install.in diff --git a/debian/clang-modernize-3.4.lintian-overrides b/debian/clang-modernize-X.Y.lintian-overrides.in similarity index 100% rename from debian/clang-modernize-3.4.lintian-overrides rename to debian/clang-modernize-X.Y.lintian-overrides.in diff --git a/debian/clang-modernize-3.4.manpages b/debian/clang-modernize-X.Y.manpages.in similarity index 100% rename from debian/clang-modernize-3.4.manpages rename to debian/clang-modernize-X.Y.manpages.in diff --git a/debian/libclang-3.4-dev.install b/debian/libclang-X.Y-dev.install.in similarity index 100% rename from debian/libclang-3.4-dev.install rename to debian/libclang-X.Y-dev.install.in diff --git a/debian/libclang-3.4-dev.links.in b/debian/libclang-X.Y-dev.links.in similarity index 100% rename from debian/libclang-3.4-dev.links.in rename to debian/libclang-X.Y-dev.links.in diff --git a/debian/libclang-common-3.4-dev.install b/debian/libclang-common-X.Y-dev.install.in similarity index 100% rename from debian/libclang-common-3.4-dev.install rename to debian/libclang-common-X.Y-dev.install.in diff --git a/debian/libclang-common-3.4-dev.links b/debian/libclang-common-X.Y-dev.links.in similarity index 100% rename from debian/libclang-common-3.4-dev.links rename to debian/libclang-common-X.Y-dev.links.in diff --git a/debian/libclang1-3.4.install.in b/debian/libclang1-X.Y.install.in similarity index 100% rename from debian/libclang1-3.4.install.in rename to debian/libclang1-X.Y.install.in diff --git a/debian/libclang1-3.4.links.in b/debian/libclang1-X.Y.links.in similarity index 100% rename from debian/libclang1-3.4.links.in rename to debian/libclang1-X.Y.links.in diff --git a/debian/libclang1-3.4.lintian-overrides b/debian/libclang1-X.Y.lintian-overrides.in similarity index 100% rename from debian/libclang1-3.4.lintian-overrides rename to debian/libclang1-X.Y.lintian-overrides.in diff --git a/debian/libclang1-3.4.symbols b/debian/libclang1-X.Y.symbols.in similarity index 100% rename from debian/libclang1-3.4.symbols rename to debian/libclang1-X.Y.symbols.in diff --git a/debian/libllvm-3.4-ocaml-dev.META b/debian/libllvm-X.Y-ocaml-dev.META.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.META rename to debian/libllvm-X.Y-ocaml-dev.META.in diff --git a/debian/libllvm-3.4-ocaml-dev.dirs.in b/debian/libllvm-X.Y-ocaml-dev.dirs.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.dirs.in rename to debian/libllvm-X.Y-ocaml-dev.dirs.in diff --git a/debian/libllvm-3.4-ocaml-dev.doc-base b/debian/libllvm-X.Y-ocaml-dev.doc-base.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.doc-base rename to debian/libllvm-X.Y-ocaml-dev.doc-base.in diff --git a/debian/libllvm-3.4-ocaml-dev.install.in b/debian/libllvm-X.Y-ocaml-dev.install.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.install.in rename to debian/libllvm-X.Y-ocaml-dev.install.in diff --git a/debian/libllvm-3.4-ocaml-dev.lintian-overrides b/debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in similarity index 100% rename from debian/libllvm-3.4-ocaml-dev.lintian-overrides rename to debian/libllvm-X.Y-ocaml-dev.lintian-overrides.in diff --git a/debian/libllvm3.4.links.in b/debian/libllvm3.4.links.in deleted file mode 100644 index 9a00059a..00000000 --- a/debian/libllvm3.4.links.in +++ /dev/null @@ -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 - diff --git a/debian/libllvm3.4.install.in b/debian/libllvmX.Y.install.in similarity index 100% rename from debian/libllvm3.4.install.in rename to debian/libllvmX.Y.install.in diff --git a/debian/libllvm3.4.lintian-overrides b/debian/libllvmX.Y.lintian-overrides.in similarity index 100% rename from debian/libllvm3.4.lintian-overrides rename to debian/libllvmX.Y.lintian-overrides.in diff --git a/debian/lldb-3.4-dev.install b/debian/lldb-X.Y-dev.install.in similarity index 100% rename from debian/lldb-3.4-dev.install rename to debian/lldb-X.Y-dev.install.in diff --git a/debian/lldb-3.4.install.in b/debian/lldb-X.Y.install.in similarity index 100% rename from debian/lldb-3.4.install.in rename to debian/lldb-X.Y.install.in diff --git a/debian/lldb-3.4.links.in b/debian/lldb-X.Y.links.in similarity index 100% rename from debian/lldb-3.4.links.in rename to debian/lldb-X.Y.links.in diff --git a/debian/lldb-3.4.lintian-overrides b/debian/lldb-X.Y.lintian-overrides.in similarity index 100% rename from debian/lldb-3.4.lintian-overrides rename to debian/lldb-X.Y.lintian-overrides.in diff --git a/debian/lldb-3.4.manpages b/debian/lldb-X.Y.manpages.in similarity index 100% rename from debian/lldb-3.4.manpages rename to debian/lldb-X.Y.manpages.in diff --git a/debian/lldb-3.4.postinst b/debian/lldb-X.Y.postinst.in similarity index 100% rename from debian/lldb-3.4.postinst rename to debian/lldb-X.Y.postinst.in diff --git a/debian/llvm-3.4-dev.dirs b/debian/llvm-X.Y-dev.dirs.in similarity index 100% rename from debian/llvm-3.4-dev.dirs rename to debian/llvm-X.Y-dev.dirs.in diff --git a/debian/llvm-3.4-dev.install b/debian/llvm-X.Y-dev.install.in similarity index 100% rename from debian/llvm-3.4-dev.install rename to debian/llvm-X.Y-dev.install.in diff --git a/debian/llvm-3.4-dev.links.in b/debian/llvm-X.Y-dev.links.in similarity index 100% rename from debian/llvm-3.4-dev.links.in rename to debian/llvm-X.Y-dev.links.in diff --git a/debian/llvm-3.4-doc.dirs b/debian/llvm-X.Y-doc.dirs.in similarity index 100% rename from debian/llvm-3.4-doc.dirs rename to debian/llvm-X.Y-doc.dirs.in diff --git a/debian/llvm-3.4-doc.install b/debian/llvm-X.Y-doc.install.in similarity index 100% rename from debian/llvm-3.4-doc.install rename to debian/llvm-X.Y-doc.install.in diff --git a/debian/llvm-3.4-examples.dirs b/debian/llvm-X.Y-examples.dirs.in similarity index 100% rename from debian/llvm-3.4-examples.dirs rename to debian/llvm-X.Y-examples.dirs.in diff --git a/debian/llvm-3.4-examples.examples b/debian/llvm-X.Y-examples.examples.in similarity index 100% rename from debian/llvm-3.4-examples.examples rename to debian/llvm-X.Y-examples.examples.in diff --git a/debian/llvm-3.4-examples.links b/debian/llvm-X.Y-examples.links.in similarity index 100% rename from debian/llvm-3.4-examples.links rename to debian/llvm-X.Y-examples.links.in diff --git a/debian/llvm-3.4-runtime.binfmt.in b/debian/llvm-X.Y-runtime.binfmt.in similarity index 100% rename from debian/llvm-3.4-runtime.binfmt.in rename to debian/llvm-X.Y-runtime.binfmt.in diff --git a/debian/llvm-3.4-runtime.install b/debian/llvm-X.Y-runtime.install.in similarity index 100% rename from debian/llvm-3.4-runtime.install rename to debian/llvm-X.Y-runtime.install.in diff --git a/debian/llvm-3.4-runtime.links b/debian/llvm-X.Y-runtime.links.in similarity index 100% rename from debian/llvm-3.4-runtime.links rename to debian/llvm-X.Y-runtime.links.in diff --git a/debian/llvm-3.4-runtime.manpages b/debian/llvm-X.Y-runtime.manpages.in similarity index 100% rename from debian/llvm-3.4-runtime.manpages rename to debian/llvm-X.Y-runtime.manpages.in diff --git a/debian/llvm-3.4-runtime.postinst b/debian/llvm-X.Y-runtime.postinst.in similarity index 100% rename from debian/llvm-3.4-runtime.postinst rename to debian/llvm-X.Y-runtime.postinst.in diff --git a/debian/llvm-3.4-runtime.prerm.in b/debian/llvm-X.Y-runtime.prerm.in similarity index 100% rename from debian/llvm-3.4-runtime.prerm.in rename to debian/llvm-X.Y-runtime.prerm.in diff --git a/debian/llvm-3.4-tools.dirs b/debian/llvm-X.Y-tools.dirs.in similarity index 100% rename from debian/llvm-3.4-tools.dirs rename to debian/llvm-X.Y-tools.dirs.in diff --git a/debian/llvm-3.4-tools.install b/debian/llvm-X.Y-tools.install.in similarity index 100% rename from debian/llvm-3.4-tools.install rename to debian/llvm-X.Y-tools.install.in diff --git a/debian/llvm-3.4.dirs b/debian/llvm-X.Y.dirs.in similarity index 100% rename from debian/llvm-3.4.dirs rename to debian/llvm-X.Y.dirs.in diff --git a/debian/llvm-3.4.install b/debian/llvm-X.Y.install.in similarity index 100% rename from debian/llvm-3.4.install rename to debian/llvm-X.Y.install.in diff --git a/debian/llvm-3.4.links b/debian/llvm-X.Y.links.in similarity index 100% rename from debian/llvm-3.4.links rename to debian/llvm-X.Y.links.in diff --git a/debian/llvm-3.4.lintian-overrides b/debian/llvm-X.Y.lintian-overrides.in similarity index 100% rename from debian/llvm-3.4.lintian-overrides rename to debian/llvm-X.Y.lintian-overrides.in diff --git a/debian/llvm-3.4.manpages b/debian/llvm-X.Y.manpages.in similarity index 100% rename from debian/llvm-3.4.manpages rename to debian/llvm-X.Y.manpages.in diff --git a/debian/python-clang-3.4.install b/debian/python-clang-X.Y.install.in similarity index 100% rename from debian/python-clang-3.4.install rename to debian/python-clang-X.Y.install.in diff --git a/debian/rules b/debian/rules index 8b20b116..e4bfc538 100755 --- 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