[Pkg-ocaml-maint-commits] r5177 - in /trunk/packages/galax/trunk/debian: control dirs docs galax-doc.dirs galax-doc.doc-base galax-doc.docs galax-extra.install galax.doc-base galax.install galaxd.install libgalax-ocaml-dev.install rules

zack at users.alioth.debian.org zack at users.alioth.debian.org
Sun Feb 17 15:00:20 UTC 2008 

Author: zack
Date: Sun Feb 17 15:00:20 2008
New Revision: 5177

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5177
Log:
medium-sized step to the goal (galax packaging)
- package structure in place
- missing descriptions, copyright, and various documentation info
- missing manpages
- lintian still complains heavily

Added:
    trunk/packages/galax/trunk/debian/galax-doc.dirs
    trunk/packages/galax/trunk/debian/galax-doc.doc-base
      - copied, changed from r5176, trunk/packages/galax/trunk/debian/galax.doc-base
    trunk/packages/galax/trunk/debian/galax-doc.docs
    trunk/packages/galax/trunk/debian/galax-extra.install
    trunk/packages/galax/trunk/debian/galax.install
    trunk/packages/galax/trunk/debian/galaxd.install
    trunk/packages/galax/trunk/debian/libgalax-ocaml-dev.install
Removed:
    trunk/packages/galax/trunk/debian/dirs
    trunk/packages/galax/trunk/debian/galax.doc-base
Modified:
    trunk/packages/galax/trunk/debian/control
    trunk/packages/galax/trunk/debian/docs
    trunk/packages/galax/trunk/debian/rules

Modified: trunk/packages/galax/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/control?rev=5177&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/control (original)
+++ trunk/packages/galax/trunk/debian/control Sun Feb 17 15:00:20 2008
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: cdbs, debhelper (>= 6), autotools-dev
+Build-Depends: cdbs, debhelper (>= 6), dpatch, ocaml-nox (>= 3.10.1), libpcre-ocaml-dev, libocamlnet-ocaml-dev, libpxp-ocaml-dev, libcamomile-ocaml-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/galax/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/
@@ -13,3 +13,31 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: galax ....
  galax ...
+
+Package: galax-extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: galax
+Description: galax ....
+ galax ...
+
+Package: galaxd
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: galax
+Description: galax ....
+ galax ...
+
+Package: libgalax-ocaml-dev
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libpcre-ocaml-dev, libocamlnet-ocaml-dev, libpxp-ocaml-dev, libcamomile-ocaml-dev, ${shlibs:Depends}, ${misc:Depends}
+Description: galax ....
+ galax ...
+
+Package: galax-doc
+Section: doc
+Architecture: all
+Suggests: galax
+Description: galax ....
+ galax ...
+

Modified: trunk/packages/galax/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/docs?rev=5177&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/docs (original)
+++ trunk/packages/galax/trunk/debian/docs Sun Feb 17 15:00:20 2008
@@ -1,4 +1,3 @@
 BUGS
 CRAlignmentNotes.txt
-README
 TODO

Added: trunk/packages/galax/trunk/debian/galax-doc.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/galax-doc.dirs?rev=5177&op=file
==============================================================================
--- trunk/packages/galax/trunk/debian/galax-doc.dirs (added)
+++ trunk/packages/galax/trunk/debian/galax-doc.dirs Sun Feb 17 15:00:20 2008
@@ -1,0 +1,2 @@
+usr/share/doc/libgalax-ocaml-dev/html
+usr/share/doc-base

Copied: trunk/packages/galax/trunk/debian/galax-doc.doc-base (from r5176, trunk/packages/galax/trunk/debian/galax.doc-base)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/galax-doc.doc-base?rev=5177&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/galax.doc-base (original)
+++ trunk/packages/galax/trunk/debian/galax-doc.doc-base Sun Feb 17 15:00:20 2008
@@ -1,6 +1,6 @@
-Document: galax
+Document: galax-manual
 Title: Galax Manual - an implementation of XQuery
-Author: <insert document author here>
+Author: Mary Fernández and Jérôme Siméon
 Abstract: This document describes the Galax System, an
  implementation of XQuery. It contains a quick-start tutorial, a
  user's manual describing the available frontends to the Galax

Added: trunk/packages/galax/trunk/debian/galax-doc.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/galax-doc.docs?rev=5177&op=file
==============================================================================
--- trunk/packages/galax/trunk/debian/galax-doc.docs (added)
+++ trunk/packages/galax/trunk/debian/galax-doc.docs Sun Feb 17 15:00:20 2008
@@ -1,0 +1,1 @@
+doc/*

Added: trunk/packages/galax/trunk/debian/galax-extra.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/galax-extra.install?rev=5177&op=file
==============================================================================
--- trunk/packages/galax/trunk/debian/galax-extra.install (added)
+++ trunk/packages/galax/trunk/debian/galax-extra.install Sun Feb 17 15:00:20 2008
@@ -1,0 +1,9 @@
+debian/tmp/usr/bin/galax-mapschema	usr/bin/
+debian/tmp/usr/bin/galax-mapwsdl	usr/bin/
+debian/tmp/usr/bin/galax-project	usr/bin/
+
+debian/tmp/usr/bin/xmlplan2plan		usr/bin/
+debian/tmp/usr/bin/xquery2plan		usr/bin/
+debian/tmp/usr/bin/xquery2soap		usr/bin/
+debian/tmp/usr/bin/xquery2xmlplan	usr/bin/
+debian/tmp/usr/bin/xqueryx2xquery	usr/bin/

Added: trunk/packages/galax/trunk/debian/galax.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/galax.install?rev=5177&op=file
==============================================================================
--- trunk/packages/galax/trunk/debian/galax.install (added)
+++ trunk/packages/galax/trunk/debian/galax.install Sun Feb 17 15:00:20 2008
@@ -1,0 +1,2 @@
+debian/tmp/usr/bin/galax-run		usr/bin/
+debian/tmp/usr/bin/galax-parse		usr/bin/

Added: trunk/packages/galax/trunk/debian/galaxd.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/galaxd.install?rev=5177&op=file
==============================================================================
--- trunk/packages/galax/trunk/debian/galaxd.install (added)
+++ trunk/packages/galax/trunk/debian/galaxd.install Sun Feb 17 15:00:20 2008
@@ -1,0 +1,3 @@
+debian/tmp/usr/bin/galaxd		usr/bin/
+debian/tmp/usr/bin/zerod		usr/bin/
+debian/tmp/usr/bin/webgui		usr/bin/

Added: trunk/packages/galax/trunk/debian/libgalax-ocaml-dev.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/libgalax-ocaml-dev.install?rev=5177&op=file
==============================================================================
--- trunk/packages/galax/trunk/debian/libgalax-ocaml-dev.install (added)
+++ trunk/packages/galax/trunk/debian/libgalax-ocaml-dev.install Sun Feb 17 15:00:20 2008
@@ -1,0 +1,5 @@
+debian/tmp/usr/lib/				usr/
+debian/tmp/usr/share/doc/galax/config/		usr/share/doc/libgalax-ocaml-dev/
+debian/tmp/usr/share/doc/galax/examples/	usr/share/doc/libgalax-ocaml-dev/
+debian/tmp/usr/share/doc/galax/regress/		usr/share/doc/libgalax-ocaml-dev/
+debian/tmp/usr/share/doc/galax/usecases/	usr/share/doc/libgalax-ocaml-dev/

Modified: trunk/packages/galax/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/rules?rev=5177&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/rules (original)
+++ trunk/packages/galax/trunk/debian/rules Sun Feb 17 15:00:20 2008
@@ -4,21 +4,58 @@
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/ocaml.mk
 
+PKGNAME = galax
+OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
+OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package pcre,netstring,equeue,netclient,netsys,pxp-engine,pxp-lex-iso88591,pxp-lex-utf8,camomile
+
 DEB_MAKE_BUILD_TARGET = world
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp
+ # $(LN) override so that we only install the best binary, instead of both .opt
+ # and .byte together with the best symlink
+DEB_MAKE_INSTALL_TARGET = install LN=cp DESTDIR=$(CURDIR)/debian/tmp
 
+ifneq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_STRIP_EXCLUDE += usr/bin
+endif
+
+# configuration flags (incrementally defined)
 CFGFLAGS =
+
+# FHS integration
+CFGFLAGS += -galax-camllib $(OCAML_STDLIB_DIR)/galax
 CFGFLAGS += -galax-home /usr
-CFGFLAGS += -galax-camllib $(OCAML_STDLIB_DIR)/galax
+CFGFLAGS += -galax-lib /usr/lib/galax
 CFGFLAGS += -galax-usecases /usr/share/doc/galax/usecases
 CFGFLAGS += -galax-regress /usr/share/doc/galax/regress
 CFGFLAGS += -galax-examples /usr/share/doc/galax/examples
 CFGFLAGS += -galax-config /usr/share/doc/galax/config
 CFGFLAGS += -galax-man /usr/share/man
 
+# features
+CFGFLAGS += -with-galaxd
+
 configure/$(PKGNAME):: debian/configure-stamp
 debian/configure-stamp:
 	./configure $(CFGFLAGS)
+	# prefix installation directories with $(DESTDIR)
+	sed -i 's:^\(CONF_GALAX_\w\+\)=/:\1=$$(DESTDIR)/:' config/Makefile.conf
 	touch debian/configure-stamp
 clean::
 	rm -f debian/configure-stamp
+
+# fix wrong permissions (+x) on some .mli files
+binary-post-install/libgalax-ocaml-dev::
+	chmod 644 debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/galax/*.mli
+# move generated API reference to the -doc package (ugly hack!)
+binary-post-install/galax-doc:: binary-post-install/libgalax-ocaml-dev
+binary-post-install/libgalax-ocaml-dev::
+	mv debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api/ \
+		debian/galax-doc/usr/share/doc/$(cdbs_curpkg)/html/
+	mv debian/$(cdbs_curpkg)/usr/share/doc-base/*api-reference \
+		debian/galax-doc/usr/share/doc-base/
+# avoid cluttering usr/bin with too generic names
+binary-post-install/galaxd::
+	mv debian/$(cdbs_curpkg)/usr/bin/zerod \
+		debian/$(cdbs_curpkg)/usr/bin/galax-zerod
+	mv debian/$(cdbs_curpkg)/usr/bin/webgui \
+		debian/$(cdbs_curpkg)/usr/bin/galax-webgui
+

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