The following commit has been merged in the master branch:
commit 78a5971ec264b39fdbd4d74a77612368c6be63d0
Author: Stephane Glondu <[email protected]>
Date: Mon May 24 19:44:32 2010 +0200
Switch debian/rules to dh with overrides
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..d88c6e7
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/tuareg-mode.emacsen-startup
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index c6454da..5d354b4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Samuel Mimram <[email protected]>,
Stéphane Glondu <[email protected]>,
Sylvain Le Gall <[email protected]>
-Build-Depends: debhelper (>= 4.0)
+Build-Depends: debhelper (>= 7.0.50~)
Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/tuareg-mode.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/tuareg-mode.git
@@ -15,7 +15,7 @@ Homepage: http://groups.google.com/group/tuareg-mode
Package: tuareg-mode
Architecture: all
-Depends: xemacs21-nomule | emacsen
+Depends: xemacs21-nomule | emacsen, ${misc:Depends}
Recommends: ocaml-interp, ocaml-mode
Enhances: ocaml-interp
Conflicts: ocaml-tools (<= 1.1-2)
diff --git a/debian/rules b/debian/rules
index b9e0473..9d613e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,22 +3,14 @@
#export DH_VERBOSE=1
-# elisp dirs
export TUAREGELDIR=debian/tuareg-mode/usr/share/emacs/site-lisp/tuareg-mode
export TUAREGXELDIR=debian/tuareg-mode/usr/share/xemacs/site-lisp/tuareg-mode
-build:
+%:
+ dh $@
-clean:
- dh_testdir
- dh_testroot
- dh_clean
- -rm debian/tuareg-mode.emacsen-startup
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
mkdir -p $(TUAREGXELDIR) $(TUAREGELDIR)
cp tuareg.el custom-tuareg.el $(TUAREGELDIR)
cat append-tuareg.el debian/emacsen-setloadpath > \
@@ -27,21 +19,16 @@ install: build
cp sym-lock.el $(TUAREGXELDIR)
cp camldebug.el $(TUAREGELDIR)/camldebug-tuareg.el
-binary-arch: build install
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs HISTORY README
+.PHONY: override_dh_installemacsen
+override_dh_installemacsen:
dh_installemacsen --priority=51
- dh_installchangelogs
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
+ dh_installchangelogs HISTORY
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
diff --git a/debian/tuareg-mode.docs b/debian/tuareg-mode.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/tuareg-mode.docs
@@ -0,0 +1 @@
+README
--
tuareg-mode packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
