[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.3-1-6-g1408898

[Ralf Treinen (none)]

The following commit has been merged in the master branch:
commit aadd17734304ce26a7f3e5571eac008477618a3d
Merge: 8649bca1ddc9888245ba4e0608a3f54c81e78e0e 014ab9b7d68cc6451ce737ef6f29bf52d0db194c
Author: Ralf Treinen <treinen at debian.(none)>
Date:   Sun Apr 12 19:40:41 2009 +0900

    Merge commit 'upstream/1.4', some debian/control updates
    
    Conflicts:
    	Makefile
    	dql/interpreter.ml

diff --combined Makefile
index 3fe7448,07aae95..46c7156
--- a/Makefile
+++ b/Makefile
@@@ -1,25 -1,29 +1,31 @@@
+ include Makefile.config
+ 
  OCAMLFIND= ocamlfind 
  PACKAGE=  -linkpkg -package dose2.conduit,dose2.io,dose2.lifetime,dose2.napkin,dose2.packetology,dose2.rapids,ledit
 +DESTDIR = /usr/bin
  
  pkglab: dql/dql.cma pkglab.ml
+ ifdef	PROFILE
+ 	$(OCAMLFIND) ocamlcp $(PACKAGE) -I dql -o pkglab $^
+ else
  	$(OCAMLFIND) ocamlc $(PACKAGE) -I dql -o pkglab $^
+ endif
  
  pkglab.opt: dql/dql.cmxa pkglab.ml
  	$(OCAMLFIND) ocamlopt $(PACKAGE) -I dql -o pkglab.opt $^
  
  dql/dql.cma:
- 	$(MAKE) -C dql dql.cma
+ 	$(MAKE) PROFILE=${PROFILE} -C dql dql.cma
  
  dql/dql.cmxa:
  	$(MAKE) -C dql dql.cmxa
  
  install:
 +	test -d $(DESTDIR) || mkdir -p $(DESTDIR)
  	if [ -x pkglab.opt ] ; then \
 -		cp pkglab.opt $(BINDIR)/pkglab ; \
 +		cp pkglab.opt $(DESTDIR)/pkglab ; \
  	elif [ -x pkglab ] ; then \
 -		cp pkglab $(BINDIR)/pkglab ; \
 +		cp pkglab $(DESTDIR)/pkglab ; \
  	else \
  		echo "No executable to install found" ; exit 2 ; \
  	fi
diff --combined debian/watch
index 0000000,0000000..8dd1ffb
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,2 @@@
++version=3
++http://gforge.inria.fr/frs/?group_id=929 .*/pkglab-(.*)\.tar\.gz
diff --combined dql/query.ml
index 96becb7,3749ef5..3922f33
--- a/dql/query.ml
+++ b/dql/query.ml
@@@ -78,11 -78,11 +78,11 @@@ type value_ 
    | Thunk of (value_ -> value_)
    | Regexp of Pcre.regexp
    | Record of (string * value_) list
 -  | Versioned of (unit_id, version_number * release_number, glob) Napkin.versioned
 +  | Versioned of (unit_id, version_number * release_number) Napkin.versioned
    | Diagnosis of
 -      (Package_set.elt, Package_set.elt, (unit_id, version_number * release_number, glob) Napkin.versioned) Diagnosis.diagnosis
 +      (Package_set.elt, Package_set.elt, (unit_id, version_number * release_number) Napkin.versioned) Diagnosis.diagnosis
    | Diagnosis_list of
 -      (Package_set.elt list, Package_set.elt, (unit_id, version_number * release_number, glob) Napkin.versioned) Diagnosis.diagnosis
 +      (Package_set.elt list, Package_set.elt, (unit_id, version_number * release_number) Napkin.versioned) Diagnosis.diagnosis
  ;;
  
  type variable_name = string;;
@@@ -102,6 -102,8 +102,8 @@@ type ternary 
  | Ternary_operator of (value_ -> value_ -> value_ -> value_) resolution
  | Find_package
  | Build_versioned
+ | Strong_dep
+ | Dep_path
  ;;
  
  type binary =

-- 
pkglab packaging