[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.1.0-1-12-gf0765b5
Stephane Glondu
steph at glondu.net
Fri Mar 13 17:26:16 UTC 2009
The following commit has been merged in the master branch:
commit 9b21f50aa469a37563cb9a657972e1e63a0fca3f
Author: Stephane Glondu <steph at glondu.net>
Date: Fri Mar 13 15:16:05 2009 +0100
Use more recent features of debhelper 7
diff --git a/debian/control b/debian/control
index bd01b40..49e0881 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Stephane Glondu <steph at glondu.net>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>
DM-Upload-Allowed: yes
-Build-Depends:
- debhelper (>= 7),
+Build-Depends: debhelper (>= 7.0.52),
ocaml-nox,
camlp4,
camlp4-extra,
@@ -31,7 +30,8 @@ Depends: adduser, psmisc,
ocaml-findlib,
libsqlite3-ocaml-dev,
libcryptokit-ocaml-dev,
- libzip-ocaml-dev
+ libzip-ocaml-dev,
+ ${misc:Depends}
Provides: httpd, httpd-cgi
Suggests: ocsigen-doc
Description: Web server and programming framework in OCaml
@@ -48,6 +48,7 @@ Description: Web server and programming framework in OCaml
Package: ocsigen-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Suggests: ocsigen-dev
Description: Developer's documentation for Ocsigen
Ocsigen is a Web server and a programming framework providing a new
@@ -77,7 +78,8 @@ Depends: ocaml-nox-${F:OCamlABI},
libgdbm-dev,
libsqlite3-ocaml-dev,
libzip-ocaml-dev,
- libcryptokit-ocaml-dev
+ libcryptokit-ocaml-dev,
+ ${misc:Depends}
Recommends: ocsigen-doc
Description: Development files for Ocsigen
Ocsigen is a Web server and a programming framework providing a new
diff --git a/debian/copyright b/debian/copyright
index 5e35f6c..84c2c11 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,7 +24,7 @@ License: LGPL-2.2+ | other
Lesser General Public License for more details.
The complete text of the GNU Lesser General Public License can be
- found in `/usr/share/common-licenses/LGPL'.
+ found in `/usr/share/common-licenses/LGPL-2.1'.
This program is released under the LGPL version 2.1 (see the text
below) with the additional exemption that compiling, linking, and/or
diff --git a/debian/ocsigen-doc.dirs b/debian/ocsigen-doc.dirs
index 60578b4..8721c25 100644
--- a/debian/ocsigen-doc.dirs
+++ b/debian/ocsigen-doc.dirs
@@ -1,2 +1,2 @@
-usr/share/doc/ocsigen-doc
+usr/share/doc/ocsigen-doc/html
usr/share/doc/ocsigen
diff --git a/debian/ocsigen-doc.install b/debian/ocsigen-doc.install
new file mode 100644
index 0000000..8c774d9
--- /dev/null
+++ b/debian/ocsigen-doc.install
@@ -0,0 +1 @@
+usr/share/doc/ocsigen/* usr/share/doc/ocsigen-doc/html
diff --git a/debian/rules b/debian/rules
index d3de05d..039fbdb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,5 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -13,11 +8,10 @@ include /usr/share/ocaml/ocamlvars.mk
include /usr/share/ocaml/ocamlinit.mk
DESTDIR := $(CURDIR)/debian/tmp
+PACKAGES := $(shell sed -nr 's/^Package: (.*)$$/\1/p' debian/control)
-configure: configure-stamp
-configure-stamp:
- dh_testdir
+override_dh_auto_configure:
chmod +x configure
./configure \
--temproot $(DESTDIR) \
@@ -31,73 +25,48 @@ configure-stamp:
--ocsigen-group ocsigen \
--disable-ocamlduce
- touch $@
-build: ocamlinit build-stamp
-build-stamp: configure-stamp
- dh_testdir
+override_dh_auto_install:
+ $(MAKE) install MODULEINSTALLDIR=$(shell ocamlc -where) CHOWN=true
+
+# For each installed .cmi file, install the corresponding .mli file next to it
+ find $(DESTDIR) -name '*.cmi' -printf '%h %f\n' | \
+ while read d f; do \
+ find . -name $${f%.cmi}.mli -exec cp '{}' $$d ';' -quit; \
+ done
+
+ $(MAKE) logrotate
+ rm -f $(DESTDIR)/var/run/ocsigen_command
+ rm -f $(DESTDIR)/usr/share/ocsigen/ocsigenstuff/LICENSE
- # This directory, present in .orig.tar.gz, is created here because
- # git doesn't handle empty directories
- mkdir doc
+override_dh_auto_build:
+# This directory, present in .orig.tar.gz, is created here because
+# git doesn't handle empty directories
+ mkdir -p doc
$(MAKE) depend
$(MAKE) all
- touch $@
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -rm -f $(OCAML_IN_FILES)
+override_dh_install:
+ dh_install --list-missing
+ for u in $(PACKAGES); do \
+ echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \
+ done
+
+override_dh_auto_clean:
[ ! -f Makefile.config ] || $(MAKE) distclean
- dh_clean
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_strip:
+ @echo Skip dh_strip because of -custom
- $(MAKE) install MODULEINSTALLDIR=$(shell ocamlc -where) CHOWN=true
+clean: ocamlinit-clean
+ dh $@
- # For each installed .cmi file, install the corresponding .mli file next to it
- find $(DESTDIR) -name '*.cmi' -printf '%h %f\n' | \
- while read d f; do \
- find . -name $${f%.cmi}.mli -exec cp '{}' $$d ';' -quit; \
- done
+build: ocamlinit-stamp
+ dh $@
- $(MAKE) logrotate
- mv $(DESTDIR)/usr/share/doc/ocsigen debian/ocsigen-doc/usr/share/doc/ocsigen-doc/html
- rm -f $(DESTDIR)/var/run/ocsigen_command
- rm -f $(DESTDIR)/usr/share/ocsigen/ocsigenstuff/LICENSE
+%:
+ dh $@
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install --sourcedir=debian/tmp
- dh_installlogrotate
- dh_installinit
- dh_installman
- dh_link
- dh_strip -Xocsigen
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
- dh_md5sums
- dh_builddeb
-
-binary-indep: build install
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-binary-arch: build install
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-common binary-indep binary-arch binary install configure
+.PHONY: build clean
--
ocsigen packaging
More information about the Pkg-ocaml-maint-commits
mailing list