From e6b28085c97ae7b9bd3f3262b105f6b84f42b047 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Sun, 31 Jul 2005 19:39:29 +0000 Subject: [PATCH] packaging cleanup: get rid of ancient debhelpers, use dh_install --- helm/DEVEL/lablgtkmathview/Makefile.in | 18 ++++----- helm/DEVEL/lablgtkmathview/debian/control | 2 +- .../debian/liblablgtkmathview-ocaml-dev.dirs | 1 - .../liblablgtkmathview-ocaml-dev.install | 7 ++++ .../debian/liblablgtkmathview-ocaml.dirs | 2 +- .../debian/liblablgtkmathview-ocaml.install | 3 +- helm/DEVEL/lablgtkmathview/debian/rules | 38 +++++++++---------- 7 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install diff --git a/helm/DEVEL/lablgtkmathview/Makefile.in b/helm/DEVEL/lablgtkmathview/Makefile.in index 82e3608e4..26532c4a8 100644 --- a/helm/DEVEL/lablgtkmathview/Makefile.in +++ b/helm/DEVEL/lablgtkmathview/Makefile.in @@ -106,15 +106,15 @@ $(TESTDIR)/test.opt: $(OBJECTS_C) $(ARCHIVE).a $(ARCHIVE).cmxa $(TESTDIR)/test.m rm -r $(TMPDIR) install: - test ! -f $(ARCHIVE).cmxa || extra="$(ARCHIVE).a $(ARCHIVE).cmxa" ; \ - if [ "$(PREFIX)" = "" ]; then \ - $(OCAMLFIND) install \ - $(PACKAGE) $(ARCHIVE).cma lib$(ARCHIVE).a \ - $(DLL) $(INST) $$extra; \ - else \ - $(OCAMLFIND) install -destdir $(PREFIX) \ - $(PACKAGE) $(ARCHIVE).cma lib$(ARCHIVE).a \ - $(DLL) $(INST) $$extra; \ + test ! -f $(ARCHIVE).cmxa || extra="$(ARCHIVE).a $(ARCHIVE).cmxa" ; \ + if [ "$(PREFIX)" = "" ]; then \ + $(OCAMLFIND) install \ + $(PACKAGE) $(ARCHIVE).cma lib$(ARCHIVE).a \ + $(DLL) $(INST) $$extra; \ + else \ + $(OCAMLFIND) install -ldconf /def/null -destdir $(PREFIX) \ + $(PACKAGE) $(ARCHIVE).cma lib$(ARCHIVE).a \ + $(DLL) $(INST) $$extra; \ fi uninstall: diff --git a/helm/DEVEL/lablgtkmathview/debian/control b/helm/DEVEL/lablgtkmathview/debian/control index 2aef2b3d2..9cd85f759 100644 --- a/helm/DEVEL/lablgtkmathview/debian/control +++ b/helm/DEVEL/lablgtkmathview/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.2 Package: liblablgtkmathview-ocaml Architecture: any Section: libs -Depends: ocaml-base-nox-3.08.3, liblablgtk2-ocaml (>= 2.4.0+2005.06.13), libgdome2-ocaml (>= 0.2.3), ${shlibs:Depends}, ${misc:Depends} +Depends: ocaml-base-nox-3.08.3, liblablgtk2-ocaml (>= 2.4.0+2005.06.13), libgdome2-ocaml (>= 0.2.3), libgtkmathview0c2 (>= 0.7.2), ${shlibs:Depends}, ${misc:Depends} Description: OCaml bindings for libgtkmathview, a GTK widget to render MathML This is the Ocaml binding for the GtkMathView widget, that is currently available in the libgtkmathview0 package. diff --git a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.dirs b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.dirs index 42f46918e..8646e27b2 100644 --- a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.dirs +++ b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.dirs @@ -1,2 +1 @@ usr/lib/ocaml/3.08.3 -usr/lib/ocaml/3.08.3/stublibs diff --git a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install new file mode 100644 index 000000000..2a66db0db --- /dev/null +++ b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml-dev.install @@ -0,0 +1,7 @@ +debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.a +debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.cma +debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.cmi +debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.cmxa +debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/META +debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.ml +debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.mli diff --git a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.dirs b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.dirs index 8646e27b2..8ecf93784 100644 --- a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.dirs +++ b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.dirs @@ -1 +1 @@ -usr/lib/ocaml/3.08.3 +usr/lib/ocaml/3.08.3/stublibs diff --git a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.install b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.install index 1c1d5d626..5c89694bb 100644 --- a/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.install +++ b/helm/DEVEL/lablgtkmathview/debian/liblablgtkmathview-ocaml.install @@ -1,2 +1 @@ -usr/lib/ocaml/3.08.3/lablgtkmathview/*.so -usr/lib/ocaml/3.08.3/stublibs/* +debian/tmp/usr/lib/ocaml/3.08.3/lablgtkmathview/*.so diff --git a/helm/DEVEL/lablgtkmathview/debian/rules b/helm/DEVEL/lablgtkmathview/debian/rules index 8b6ed0bb5..ed0e94113 100755 --- a/helm/DEVEL/lablgtkmathview/debian/rules +++ b/helm/DEVEL/lablgtkmathview/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -TARGETDIR = debian/liblablgtkmathview-ocaml-dev +TARGETDIR = debian/tmp OCAML_STDLIB_DIR = $(shell ocamlc -where) configure: configure-stamp @@ -32,36 +32,34 @@ clean: -$(MAKE) distclean dh_clean -distclean: clean install: build dh_testdir dh_testroot dh_clean -k - dh_installdirs -s + dh_installdirs + mkdir -p $(TARGETDIR)$(OCAML_STDLIB_DIR) $(MAKE) install PREFIX=$(TARGETDIR)$(OCAML_STDLIB_DIR) -movefiles: install - dh_install -p liblablgtkmathview-ocaml --sourcedir=$(TARGETDIR) - binary-arch: build install + dh_install dh_testdir dh_testroot - dh_installdocs -s - dh_installexamples -s - dh_installmanpages -s - dh_installinfo -s - dh_installchangelogs -s ChangeLog - dh_link -s - dh_strip -s - dh_compress -s - dh_fixperms -s - dh_installdeb -s - dh_shlibdeps -s - dh_gencontrol -s - dh_md5sums -s - dh_builddeb -s + dh_installdocs + dh_installexamples + dh_installman + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb binary: binary-arch .PHONY: build clean binary-arch binary install configure -- 2.39.2