[Pkg-ocaml-maint-commits] r2763 - in /trunk/packages/camlzip/trunk/debian: changelog control control.in libzip-ocaml-dev.dirs libzip-ocaml-dev.dirs.in libzip-ocaml.dirs libzip-ocaml.dirs.in libzip-ocaml.files libzip-ocaml.files.in rules

zack at users.alioth.debian.org zack at users.alioth.debian.org
Sat May 20 02:11:11 UTC 2006


Author: zack
Date: Sat May 20 02:11:10 2006
New Revision: 2763

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2763
Log:
ready for the 3.09.2 transition

Added:
    trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs
    trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs
    trunk/packages/camlzip/trunk/debian/libzip-ocaml.files
Modified:
    trunk/packages/camlzip/trunk/debian/changelog
    trunk/packages/camlzip/trunk/debian/control
    trunk/packages/camlzip/trunk/debian/control.in
    trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs.in
    trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs.in
    trunk/packages/camlzip/trunk/debian/libzip-ocaml.files.in
    trunk/packages/camlzip/trunk/debian/rules

Modified: trunk/packages/camlzip/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/changelog?rev=2763&op=diff
==============================================================================
--- trunk/packages/camlzip/trunk/debian/changelog (original)
+++ trunk/packages/camlzip/trunk/debian/changelog Sat May 20 02:11:10 2006
@@ -1,9 +1,19 @@
-camlzip (1.01-17) UNRELEASED; urgency=low
+camlzip (1.01-17) unstable; urgency=low
 
+  [ Julien Cristau ]
   * Add build-dep on chrpath and delete rpath from the stublib (fixes lintian
     warning).
 
- -- Julien Cristau <julien.cristau at ens-lyon.org>  Wed, 30 Nov 2005 20:42:29 +0100
+  [ Stefano Zacchiroli ]
+  * Rebuilt against ocaml 3.09.2, bumped deps accordingly.
+  * debian/control
+    - bumped Standards-Version (no changes needed)
+  * debian/*
+    - use the more common 'ocamlinit' target in debian/rules to update the
+      hard-coded version of the ocaml ABI. Avoids unintented re-generation of
+      debian/control during the build
+
+ -- Stefano Zacchiroli <zack at debian.org>  Fri, 19 May 2006 21:06:10 -0500
 
 camlzip (1.01-16) unstable; urgency=low
 

Modified: trunk/packages/camlzip/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/control?rev=2763&op=diff
==============================================================================
--- trunk/packages/camlzip/trunk/debian/control (original)
+++ trunk/packages/camlzip/trunk/debian/control Sat May 20 02:11:10 2006
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 3.0.0), zlib1g-dev (>> 1.1.4), ocaml-nox (>= 3.09.0), dpatch, chrpath
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>> 3.0.0), zlib1g-dev (>> 1.1.4), ocaml-nox (>= 3.09.2), dpatch, chrpath
+Standards-Version: 3.7.2
 
 Package: libzip-ocaml
 Architecture: any

Modified: trunk/packages/camlzip/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/control.in?rev=2763&op=diff
==============================================================================
--- trunk/packages/camlzip/trunk/debian/control.in (original)
+++ trunk/packages/camlzip/trunk/debian/control.in Sat May 20 02:11:10 2006
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 3.0.0), zlib1g-dev (>> 1.1.4), ocaml-nox (>= #OcamlABI#), dpatch, chrpath
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>> 3.0.0), zlib1g-dev (>> 1.1.4), ocaml-nox (>= @OCamlABI@), dpatch, chrpath
+Standards-Version: 3.7.2
 
 Package: libzip-ocaml
 Architecture: any

Added: trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs?rev=2763&op=file
==============================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs (added)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs Sat May 20 02:11:10 2006
@@ -1,0 +1,1 @@
+/usr/lib/ocaml/3.09.2/zip

Modified: trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs.in?rev=2763&op=diff
==============================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs.in (original)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs.in Sat May 20 02:11:10 2006
@@ -1,1 +1,1 @@
-/usr/lib/ocaml/#OcamlABI#/zip
+/usr/lib/ocaml/@OCamlABI@/zip

Added: trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs?rev=2763&op=file
==============================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs (added)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs Sat May 20 02:11:10 2006
@@ -1,0 +1,1 @@
+/usr/lib/ocaml/3.09.2/stublibs

Modified: trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs.in?rev=2763&op=diff
==============================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs.in (original)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs.in Sat May 20 02:11:10 2006
@@ -1,1 +1,1 @@
-/usr/lib/ocaml/#OcamlABI#/stublibs
+/usr/lib/ocaml/@OCamlABI@/stublibs

Added: trunk/packages/camlzip/trunk/debian/libzip-ocaml.files
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/libzip-ocaml.files?rev=2763&op=file
==============================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml.files (added)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml.files Sat May 20 02:11:10 2006
@@ -1,0 +1,1 @@
+usr/lib/ocaml/3.09.2/stublibs/dllcamlzip.so

Modified: trunk/packages/camlzip/trunk/debian/libzip-ocaml.files.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/libzip-ocaml.files.in?rev=2763&op=diff
==============================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml.files.in (original)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml.files.in Sat May 20 02:11:10 2006
@@ -1,1 +1,1 @@
-usr/lib/ocaml/#OcamlABI#/stublibs/dllcamlzip.so
+usr/lib/ocaml/@OCamlABI@/stublibs/dllcamlzip.so

Modified: trunk/packages/camlzip/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/rules?rev=2763&op=diff
==============================================================================
--- trunk/packages/camlzip/trunk/debian/rules (original)
+++ trunk/packages/camlzip/trunk/debian/rules Sat May 20 02:11:10 2006
@@ -5,26 +5,22 @@
 # We want to use dpatch.
 include /usr/share/dpatch/dpatch.make
 PACKAGE = camlzip
-OCAMLABI = $(shell ocamlc -version)
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 export OCAML_LIBDIR=`ocamlc -where`
 
-
-debian/control:
-	 sed -e 's%#OcamlABI#%$(OCAMLABI)%' $@.in >$@
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 	
 configure: configure-stamp
 configure-stamp:
-	for t in `find . -name \*.in | grep -v debian/control.in`; do \
-		sed -e 's%#OcamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
-	done
 
 	dh_testdir
 	# Add here commands to configure the package.
-	
 
 	touch configure-stamp
 




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