[Pkg-ocaml-maint-commits] r2876 - in /trunk/packages/edos-debcheck/trunk/debian: changelog control control.in patches/01Makefile.dpatch rules

treinen at users.alioth.debian.org treinen at users.alioth.debian.org
Mon Jul 3 20:35:33 UTC 2006 

Author: treinen
Date: Mon Jul  3 20:35:20 2006
New Revision: 2876

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2876
Log:
edos-debcheck 0.0.2006.03.19-2

Removed:
    trunk/packages/edos-debcheck/trunk/debian/control.in
Modified:
    trunk/packages/edos-debcheck/trunk/debian/changelog
    trunk/packages/edos-debcheck/trunk/debian/control
    trunk/packages/edos-debcheck/trunk/debian/patches/01Makefile.dpatch
    trunk/packages/edos-debcheck/trunk/debian/rules

Modified: trunk/packages/edos-debcheck/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/changelog?rev=2876&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/changelog (original)
+++ trunk/packages/edos-debcheck/trunk/debian/changelog Mon Jul  3 20:35:20 2006
@@ -1,8 +1,11 @@
-edos-debcheck (0.0.2006.03.19-2) UNRELEASED; urgency=low
+edos-debcheck (0.0.2006.03.19-2) unstable; urgency=low
 
   * Improved short and long description (closes: Bug#375209, Bug#375287)
+  * Don't code the ocaml version number into the build-dependency.
+  * Compile into bytecode on architectures where no native code compiler
+    is available (closes: Bug#376156)
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 25 Jun 2006 23:19:34 +0200
+ -- Ralf Treinen <treinen at debian.org>  Mon,  3 Jul 2006 22:24:06 +0200
 
 edos-debcheck (0.0.2006.03.19-1) unstable; urgency=low
 

Modified: trunk/packages/edos-debcheck/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/control?rev=2876&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/control (original)
+++ trunk/packages/edos-debcheck/trunk/debian/control Mon Jul  3 20:35:20 2006
@@ -7,7 +7,7 @@
 
 Package: edos-debcheck
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
 Description: Checks whether dependencies of debian packages can be satisfied
  This software checks for every package of a distribution (in the
  debian format .deb) whether it is possible to satisfy its
@@ -15,7 +15,7 @@
 
 Package: edos-rpmcheck
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
 Description: Checks whether dependencies of RPM packages can be satisfied
  This software checks for every package of a distribution (in the
  format RPM) whether it is possible to satisfy its dependencies and

Modified: trunk/packages/edos-debcheck/trunk/debian/patches/01Makefile.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/patches/01Makefile.dpatch?rev=2876&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/patches/01Makefile.dpatch (original)
+++ trunk/packages/edos-debcheck/trunk/debian/patches/01Makefile.dpatch Mon Jul  3 20:35:20 2006
@@ -6,9 +6,39 @@
 
 @DPATCH@
 diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2006-04-17 21:53:39.000000000 +0200
-+++ trunk/Makefile	2006-04-21 10:12:45.000000000 +0200
-@@ -26,6 +26,9 @@
+--- trunk~/Makefile	2006-05-20 08:51:20.000000000 +0200
++++ trunk/Makefile	2006-07-02 23:11:04.000000000 +0200
+@@ -5,27 +5,33 @@
+ 
+ OBJS = util.cmx common.cmx solver.cmx
+ OPTLINKFLAGS=unix.cmxa str.cmxa
++BYTEOBJS=${OBJS:%.cmx=%.cmo}
++BYTELINKFLAGS=${OPTLINKFLAGS:%.cmxa=%.cma}
+ 
+-all: debcheck rpmcheck checkupdate checkconflicts
++all: debcheck rpmcheck
++byte: debcheck.byte rpmcheck.byte
+ 
+ rpmcheck: $(OBJS) rpm.cmx
+ 	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
+ 
+ debcheck: $(OBJS) deb.cmx
+ 	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
+-#	ocamlopt -o check unix.cmxa str.cmxa check.ml
+ 
+-checkupdate: $(OBJS) update_check.ml
+-	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
++rpmcheck.byte: $(BYTEOBJS) rpm.cmo
++	$(OCAMLC) -o $@  $(BYTELINKFLAGS) $^ $(LINKFLAGS)
++
++debcheck.byte: $(BYTEOBJS) deb.cmo
++	$(OCAMLC) -o $@  $(BYTELINKFLAGS) $^ $(LINKFLAGS)
+ 
+-checkconflicts: $(OBJS) check_conflicts.ml
+-	$(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
+ 
+ #####
+ 
  clean::
  	find . -regex ".*\\.\(cm[oix]\|o\)" | xargs rm -f
  
@@ -18,7 +48,7 @@
  .SUFFIXES: .cmo .cmi .cmx .ml .mli .mly .mll .idl .o .c
  
  .ml.cmx:
-@@ -57,4 +60,4 @@
+@@ -57,4 +63,4 @@
  	$(OCAMLDEP) $(DEPFLAGS) $$i \
  	> .depend
  

Modified: trunk/packages/edos-debcheck/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/rules?rev=2876&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/rules (original)
+++ trunk/packages/edos-debcheck/trunk/debian/rules Mon Jul  3 20:35:20 2006
@@ -5,16 +5,14 @@
 
 # export DH_VERBOSE=1
 
-# for package maintainers only - target not used in build process!
 OCAMLABI := $(shell ocamlc -version)
-debian/control:
-	sed -e 's%#OcamlABI#%$(OCAMLABI)%' $@.in >$@
 
-build: debcheck
-debcheck: patch
+build: buildstamp
+buildstamp: patch
 	dh_testdir
 	$(MAKE) depend
-	$(MAKE) debcheck rpmcheck
+	if [ -x /usr/bin/ocamlopt ]; then $(MAKE) all; else $(MAKE) byte; fi
+	touch buildstamp
 
 clean: unpatch 
 	dh_testdir
@@ -22,6 +20,7 @@
 	touch .depend
 	$(MAKE) clean
 	-rm debcheck rpmcheck
+	-rm buildstamp
 	dh_clean
 
 install: build
@@ -29,8 +28,13 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs -A /usr/bin /usr/share/man/man1
-	cp debcheck debian/edos-debcheck/usr/bin/edos-debcheck
-	cp rpmcheck debian/edos-rpmcheck/usr/bin/edos-rpmcheck
+	if [ -x /usr/bin/ocamlopt ]; then \
+		cp debcheck debian/edos-debcheck/usr/bin/edos-debcheck; \
+		cp rpmcheck debian/edos-rpmcheck/usr/bin/edos-rpmcheck; \
+	else \
+		cp debcheck.byte debian/edos-debcheck/usr/bin/edos-debcheck; \
+		cp rpmcheck.byte debian/edos-rpmcheck/usr/bin/edos-rpmcheck; \
+	fi		
 	dh_installman -pedos-debcheck debian/edos-debcheck.1
 	dh_installman -pedos-rpmcheck debian/edos-rpmcheck.1
 
@@ -45,7 +49,7 @@
 	dh_shlibdeps
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums 
 	dh_builddeb

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