[Pkg-ocaml-maint-commits] r3092 - in
/trunk/packages/edos-debcheck/trunk/debian: changelog control
patches/00list patches/02tilde_in_version.dpatch rules watch
treinen at users.alioth.debian.org
treinen at users.alioth.debian.org
Sat Sep 9 18:48:27 UTC 2006
Author: treinen
Date: Sat Sep 9 18:48:27 2006
New Revision: 3092
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3092
Log:
edos-debcheck 1.0-2
Added:
trunk/packages/edos-debcheck/trunk/debian/patches/02tilde_in_version.dpatch (with props)
trunk/packages/edos-debcheck/trunk/debian/watch
Modified:
trunk/packages/edos-debcheck/trunk/debian/changelog
trunk/packages/edos-debcheck/trunk/debian/control
trunk/packages/edos-debcheck/trunk/debian/patches/00list
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=3092&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/changelog (original)
+++ trunk/packages/edos-debcheck/trunk/debian/changelog Sat Sep 9 18:48:27 2006
@@ -1,3 +1,13 @@
+edos-debcheck (1.0-2) unstable; urgency=low
+
+ * Add a debian/watch file.
+ * Patch 02tilde_in_version: allow tilde character in version numbers. Thanks
+ to Julien Cristau for the patch (closes: Bug#386646).
+ * Don't depend on ocaml-nox when compiling to native code.
+ * Better factorization of debian/rule (inspired by the approx package).
+
+ -- Ralf Treinen <treinen at debian.org> Sat, 9 Sep 2006 20:47:39 +0200
+
edos-debcheck (1.0-1) unstable; urgency=low
* New upstream release.
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=3092&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/control (original)
+++ trunk/packages/edos-debcheck/trunk/debian/control Sat Sep 9 18:48:27 2006
@@ -8,7 +8,7 @@
Package: edos-debcheck
Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${F:OCamlRun}
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
@@ -16,7 +16,7 @@
Package: edos-rpmcheck
Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${F:OCamlRun}
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/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/patches/00list?rev=3092&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/patches/00list (original)
+++ trunk/packages/edos-debcheck/trunk/debian/patches/00list Sat Sep 9 18:48:27 2006
@@ -1,1 +1,2 @@
01Makefile
+02tilde_in_version
Added: trunk/packages/edos-debcheck/trunk/debian/patches/02tilde_in_version.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/patches/02tilde_in_version.dpatch?rev=3092&op=file
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/patches/02tilde_in_version.dpatch (added)
+++ trunk/packages/edos-debcheck/trunk/debian/patches/02tilde_in_version.dpatch Sat Sep 9 18:48:27 2006
@@ -1,0 +1,84 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02tilde_in_version.dpatch based on a patch by Julien Cristau
+## <julien.cristau at ens-lyon.org>
+##
+## DP: Allow the tilde character in version numbers
+
+ at DPATCH@
+diff -urNad trunk~/deb.ml trunk/deb.ml
+--- trunk~/deb.ml 2006-07-02 18:39:30.000000000 +0200
++++ trunk/deb.ml 2006-09-09 20:32:55.000000000 +0200
+@@ -103,19 +103,19 @@
+ let strict_version_re_1 =
+ Str.regexp
+ ("^\\(\\([0-9]+\\):\\)?" ^
+- "\\([0-9][A-Za-z0-9.:+-]*\\)" ^
+- "-\\([A-Za-z0-9.+]+\\)$")
++ "\\([0-9][A-Za-z0-9.:+~-]*\\)" ^
++ "-\\([A-Za-z0-9.+~]+\\)$")
+ let strict_version_re_2 =
+ Str.regexp
+ ("^\\(\\([0-9]+\\):\\)?" ^
+- "\\([0-9][A-Za-z0-9.:+]*\\)\\( \\)?$")
++ "\\([0-9][A-Za-z0-9.:+~]*\\)\\( \\)?$")
+ (* Some upstream version do not start with a digit *)
+ let version_re_1 =
+ Str.regexp
+- "^\\(\\([0-9]+\\):\\)?\\([A-Za-z0-9._:+-]+\\)-\\([A-Za-z0-9.+]+\\)$"
++ "^\\(\\([0-9]+\\):\\)?\\([A-Za-z0-9._:+~-]+\\)-\\([A-Za-z0-9.+~]+\\)$"
+ let version_re_2 =
+ Str.regexp
+- "^\\(\\([0-9]+\\):\\)?\\([A-Za-z0-9._:+]+\\)\\( \\)?$"
++ "^\\(\\([0-9]+\\):\\)?\\([A-Za-z0-9._:+~]+\\)\\( \\)?$"
+
+ let split_version s =
+ if not (Str.string_match strict_version_re_1 s 0 ||
+@@ -144,7 +144,7 @@
+ ("[ \t]+\\|\\(" ^
+ String.concat "\\|"
+ [","; "|"; "("; ")"; "<<"; "<="; "="; ">="; ">>"; "<"; ">";
+- "[A-Za-z0-9.:_+-]+"] ^
++ "[A-Za-z0-9.:_+~-]+"] ^
+ "\\)")
+
+ let rec next_token s p =
+@@ -344,7 +344,11 @@
+ let is_num c = c >= '0' && c <= '9'
+
+ let char_map =
+- Array.init 256 (fun c -> if is_letter (Char.chr c) then c else c + 256)
++ Array.init 256
++ (fun c ->
++ if Char.chr c = '~' then c - 256 else
++ if is_letter (Char.chr c) then c else
++ c + 256)
+
+ let compare_ver_char c1 c2 =
+ compare (char_map.(Char.code c1)) (char_map.(Char.code c2))
+@@ -357,12 +361,20 @@
+ while !p1 < l1 && !p2 < l2 && s1.[!p1] = s2.[!p2] do
+ incr p1; incr p2
+ done;
+- if !p1 = l1 then begin
+- if !p2 = l2 then 0 else -1
+- end else if !p2 = l2 then
+- 1
+- else
+- compare_ver_char s1.[!p1] s2.[!p2]
++ if !p1 = l1
++ then
++ if !p2 = l2
++ then
++ 0
++ else
++ if s2.[!p2] = '~' then 1 else -1
++ else
++ if !p2 = l2
++ then
++ if s1.[!p1] = '~' then -1 else 1
++ else
++ compare_ver_char s1.[!p1] s2.[!p2]
++
+
+ let first_num s p l =
+ let p = ref p in
Propchange: trunk/packages/edos-debcheck/trunk/debian/patches/02tilde_in_version.dpatch
------------------------------------------------------------------------------
svn:executable = *
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=3092&op=diff
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/rules (original)
+++ trunk/packages/edos-debcheck/trunk/debian/rules Sat Sep 9 18:48:27 2006
@@ -6,12 +6,14 @@
# export DH_VERBOSE=1
OCAMLABI := $(shell ocamlc -version)
+BYTECODE = $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
+OCAMLRUN = $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI))
build: buildstamp
buildstamp: patch
dh_testdir
$(MAKE) depend
- if [ -x /usr/bin/ocamlopt ]; then $(MAKE) all; else $(MAKE) byte; fi
+ $(MAKE) $(if $(BYTECODE),byte,all)
touch buildstamp
clean: unpatch
@@ -28,13 +30,10 @@
dh_testroot
dh_clean -k
dh_installdirs -A /usr/bin /usr/share/man/man1
- 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
+ cp debcheck$(if $(BYTECODE),.byte) \
+ debian/edos-debcheck/usr/bin/edos-debcheck
+ cp rpmcheck$(if $(BYTECODE),.byte) \
+ debian/edos-rpmcheck/usr/bin/edos-rpmcheck
dh_installman -pedos-debcheck debian/edos-debcheck.1
dh_installman -pedos-rpmcheck debian/edos-rpmcheck.1
@@ -49,7 +48,7 @@
dh_shlibdeps
dh_fixperms
dh_installdeb
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+ dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)" -VF:OCamlRun="$(OCAMLRUN)"
dh_md5sums
dh_builddeb
Added: trunk/packages/edos-debcheck/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/edos-debcheck/trunk/debian/watch?rev=3092&op=file
==============================================================================
--- trunk/packages/edos-debcheck/trunk/debian/watch (added)
+++ trunk/packages/edos-debcheck/trunk/debian/watch Sat Sep 9 18:48:27 2006
@@ -1,0 +1,2 @@
+version=2
+http://www.edos-project.org/xwiki/bin/download/Main/debcheck_home/debrpmcheck-([\d.]*)\.tar\.gz
More information about the Pkg-ocaml-maint-commits
mailing list