[Pkg-ocaml-maint-commits] [camlpdf] 07/09: Update packaging

Stéphane Glondu glondu at moszumanska.debian.org
Sat Nov 30 13:42:05 UTC 2013 

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository camlpdf.

commit a734971ad7a7c5b03a4f9e92b858f3ad9d660d60
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Nov 30 12:47:55 2013 +0100

    Update packaging
    
     * Use upstream META file
     * Bump debhelper compat level to 9 and use dh
     * Move to main
     * Update Vcs-* and Homepage
     * Add runtime package for C stubs
---
 debian/META.in                         |  7 ----
 debian/compat                          |  2 +-
 debian/control                         | 27 +++++++++++----
 debian/control.in                      | 33 ------------------
 debian/gbp.conf                        |  1 -
 debian/libcamlpdf-ocaml-dev.docs       |  2 +-
 debian/libcamlpdf-ocaml-dev.examples   |  1 +
 debian/libcamlpdf-ocaml-dev.install.in | 19 ++++------
 debian/libcamlpdf-ocaml.install.in     |  1 +
 debian/rules                           | 63 ++++++++++++++++++----------------
 10 files changed, 64 insertions(+), 92 deletions(-)

diff --git a/debian/META.in b/debian/META.in
deleted file mode 100644
index 3ea046c..0000000
--- a/debian/META.in
+++ /dev/null
@@ -1,7 +0,0 @@
-name="camlpdf"
-version="@VERSION@"
-description="OCaml library for reading, writing and manipulating Adobe portable document files."
-requires="unix bigarray str zip"
-archive(byte)="camlpdf.cma"
-archive(native)="camlpdf.cmxa"
-	    
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index e254004..20cd74d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: camlpdf
-Section: non-free/ocaml
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
@@ -7,15 +7,14 @@ Uploaders:
  Mehdi Dogguy <mehdi at debian.org>,
  Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, patchutils (>= 0.2.25),
+ debhelper (>= 9),
+ ocaml-nox,
  ocaml-findlib (>= 1.2.5),
- libzip-ocaml-dev (>= 1.04-6~),
  dh-ocaml (>= 0.9)
 Standards-Version: 3.8.4
-XS-Autobuild: yes
-Homepage: http://www.coherentpdf.com/ocaml-libraries.html
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlpdf.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlpdf.git
+Homepage: https://github.com/johnwhitington/camlpdf
+Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/camlpdf.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/camlpdf.git
 
 Package: libcamlpdf-ocaml-dev
 Architecture: any
@@ -32,3 +31,17 @@ Description: library for reading, writing and manipulating PDF files and data
  .
  This package contains all the development stuff you need to develop
  OCaml programs which use camlpdf.
+
+Package: libcamlpdf-ocaml
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: library for reading, writing and manipulating PDF files and data (runtime)
+ CamlPDF consists of a set of low level modules for representing,
+ reading and writing the basic structure of PDF, together with an
+ initial attempt at a higher level API.
+ .
+ This package contains runtime libraries.
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index bc70f80..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,33 +0,0 @@
-Source: camlpdf
-Section: non-free/ocaml
-Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders:
- Romain Beauxis <toots at rastageeks.org>,
- Stéphane Glondu <glondu at debian.org>
-Build-Depends:
- @cdbs@,
- ocaml-findlib (>= 1.2.5),
- libzip-ocaml-dev (>= 1.04-6~),
- dh-ocaml (>= 0.9)
-Standards-Version: 3.8.3
-XS-Autobuild: yes
-Homepage: http://www.coherentpdf.com/ocaml-libraries.html
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlpdf.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlpdf.git
-
-Package: libcamlpdf-ocaml-dev
-Architecture: any
-Depends:
- ${ocaml:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Provides: ${ocaml:Provides}
-Recommends: ocaml-findlib
-Description: library for reading, writing and manipulating PDF files and data
- CamlPDF consists of a set of low level modules for representing,
- reading and writing the basic structure of PDF, together with an
- initial attempt at a higher level API.
- .
- This package contains all the development stuff you need to develop
- OCaml programs which use camlpdf.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 4f24002..cec628c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,2 @@
 [DEFAULT]
 pristine-tar = True
-compression = bzip2
diff --git a/debian/libcamlpdf-ocaml-dev.docs b/debian/libcamlpdf-ocaml-dev.docs
index 7ed2d12..d22129c 100644
--- a/debian/libcamlpdf-ocaml-dev.docs
+++ b/debian/libcamlpdf-ocaml-dev.docs
@@ -1,3 +1,3 @@
-README
+README.md
 introduction_to_camlpdf.pdf
 doc/camlpdf/html
diff --git a/debian/libcamlpdf-ocaml-dev.examples b/debian/libcamlpdf-ocaml-dev.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/libcamlpdf-ocaml-dev.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/libcamlpdf-ocaml-dev.install.in b/debian/libcamlpdf-ocaml-dev.install.in
index 8edfb21..1b16027 100644
--- a/debian/libcamlpdf-ocaml-dev.install.in
+++ b/debian/libcamlpdf-ocaml-dev.install.in
@@ -1,12 +1,7 @@
-debian/META      @OCamlStdlibDir@/camlpdf
-*.mli            @OCamlStdlibDir@/camlpdf
-*.cmi            @OCamlStdlibDir@/camlpdf
-*.cma            @OCamlStdlibDir@/camlpdf
-OPT: *.cmx*      @OCamlStdlibDir@/camlpdf
-OPT: *.a         @OCamlStdlibDir@/camlpdf
-pdfmerge.ml      usr/share/doc/libcamlpdf-ocaml-dev/examples
-pdfhello.ml      usr/share/doc/libcamlpdf-ocaml-dev/examples
-pdfdecomp.ml     usr/share/doc/libcamlpdf-ocaml-dev/examples
-pdfdraft.ml      usr/share/doc/libcamlpdf-ocaml-dev/examples
-pdftest.ml       usr/share/doc/libcamlpdf-ocaml-dev/examples
-pdfdecrypt.ml    usr/share/doc/libcamlpdf-ocaml-dev/examples
+ at OCamlStdlibDir@/camlpdf/META
+ at OCamlStdlibDir@/camlpdf/*.cmi
+ at OCamlStdlibDir@/camlpdf/*.mli
+ at OCamlStdlibDir@/camlpdf/*.cma
+ at OCamlStdlibDir@/camlpdf/*.a
+OPT: @OCamlStdlibDir@/camlpdf/*.cmxa
+OPT: pdf*.cmx @OCamlStdlibDir@/camlpdf
diff --git a/debian/libcamlpdf-ocaml.install.in b/debian/libcamlpdf-ocaml.install.in
new file mode 100644
index 0000000..1d5ce78
--- /dev/null
+++ b/debian/libcamlpdf-ocaml.install.in
@@ -0,0 +1 @@
+ at OCamlDllDir@/*.so
diff --git a/debian/rules b/debian/rules
index 3cbb899..d2d3019 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,35 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
-
-# In order to regenerate 'debian/control' :
-#   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
-# Then check manually if everything's ok
-
-DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
-DEB_MAKE_INSTALL_TARGET :=
-DEB_MAKE_CLEAN_TARGET   := clean clean-doc
-DEB_MAKE_BUILD_TARGET := byte-code-library
-DEB_DH_COMPRESS_ARGS := -X.pdf
-
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-        DEB_MAKE_BUILD_TARGET += native-code-library
-endif
-
-DEB_DH_INSTALL_SOURCEDIR := .
-CFLAGS += -fPIC
-
-build/libcamlpdf-ocaml-dev::
-	mkdir -p $(DESTDIR)
-	make htdoc
-	VERSION=$(DEB_NOEPOCH_VERSION); \
-	VERSION=$${VERSION%%-*}; \
-	sed -e "s#@VERSION@#$$VERSION#" < debian/META.in > debian/META
-
-clean::
-	rm -f debian/META
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DESTDIR=$(CURDIR)/debian/tmp
+
+include /usr/share/ocaml/ocamlvars.mk
+
+OCAMLFIND_DESTDIR=$(DESTDIR)$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR
+
+OCAMLFIND_LDCONF=ignore
+export OCAMLFIND_LDCONF
+
+%:
+	dh $@ --with ocaml
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	mkdir -p $(OCAMLFIND_DESTDIR) $(DESTDIR)$(OCAML_DLL_DIR)
+	dh_auto_install
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing -X.so.owner
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf doc
+
+.PHONY: override_dh_compress
+override_dh_compress:
+	dh_compress -X/examples/ -X.pdf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/camlpdf.git

More information about the Pkg-ocaml-maint-commits mailing list