packaging cleanup: get rid of ancient debhelpers, use dh_install

diff --git a/helm/DEVEL/lablgtkmathview/Makefile.in b/helm/DEVEL/lablgtkmathview/Makefile.in
index 82e3608e4d84a8916fb4bcd856643a46573ed265..26532c4a8f30ad04cbff1bf73d34b7cd91bfd79d 100644 (file)
--- 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 2aef2b3d2b882604f30150c51e18ad6d11bc394b..9cd85f759a5f82eb32261db2070cf4d0344f8e8b 100644 (file)
--- 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 42f46918ee407b9386b524e5e7631a2dacf9dd39..8646e27b278afe5068f37570928d7d94a058144f 100644 (file)
--- 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 (file)
index 0000000..2a66db0
--- /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 8646e27b278afe5068f37570928d7d94a058144f..8ecf93784fdfda6f3023b0276a6af7f79d569cc6 100644 (file)
--- 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 1c1d5d626126b248c84e0e9f9f0cfce4ec77631f..5c89694bb9cab239381721ce45b5b595638a7c9f 100644 (file)
--- 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 8b6ed0bb5febbb844e6584e1398737d5d8852283..ed0e94113cffed374a5a59264c61e2744c0b3e15 100755 (executable)
--- 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