[Pkg-ocaml-maint-commits] r2930 - in /trunk/packages/ocamli18n/trunk/debian: changelog control control.in patches/00list patches/03_camlp4_loc.dpatch rules

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Tue Jul 11 21:53:36 UTC 2006 

Author: gildor
Date: Tue Jul 11 21:53:35 2006
New Revision: 2930

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2930
Log:
* Made architecture of not yet released package more compliant -- SLG

Added:
    trunk/packages/ocamli18n/trunk/debian/control.in
      - copied, changed from r2809, trunk/packages/ocamli18n/trunk/debian/control
    trunk/packages/ocamli18n/trunk/debian/patches/03_camlp4_loc.dpatch   (with props)
Modified:
    trunk/packages/ocamli18n/trunk/debian/changelog
    trunk/packages/ocamli18n/trunk/debian/control
    trunk/packages/ocamli18n/trunk/debian/patches/00list
    trunk/packages/ocamli18n/trunk/debian/rules

Modified: trunk/packages/ocamli18n/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamli18n/trunk/debian/changelog?rev=2930&op=diff
==============================================================================
--- trunk/packages/ocamli18n/trunk/debian/changelog (original)
+++ trunk/packages/ocamli18n/trunk/debian/changelog Tue Jul 11 21:53:35 2006
@@ -1,19 +1,5 @@
-ocamli18n (0.3-3) unstable; urgency=low
-
-  * Remove direct reference to ocaml library dir
-  * Upgrade to standards version 3.6.2.0 (no change)
-
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 18:13:12 +0100
-
-ocamli18n (0.3-2) unstable; urgency=low
-
-  * Transition to svn-buildpackage
-
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Mon, 22 Aug 2005 23:51:47 +0200
-
 ocamli18n (0.3-1) unstable; urgency=low
 
   * Initial upload ( Closes: #266129 )
 
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  8 Dec 2004 00:22:49 +0100
-
+ -- Sylvain Le Gall <gildor at debian.org>  Wed,  9 Nov 2005 18:13:12 +0100

Modified: trunk/packages/ocamli18n/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamli18n/trunk/debian/control?rev=2930&op=diff
==============================================================================
--- trunk/packages/ocamli18n/trunk/debian/control (original)
+++ trunk/packages/ocamli18n/trunk/debian/control Tue Jul 11 21:53:35 2006
@@ -1,15 +1,14 @@
 Source: ocamli18n
 Section: libdevel
 Priority: optional
-Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
-Uploaders: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>, Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, dpatch, ocaml-findlib, libpxp-ocaml-dev
-Standards-Version: 3.6.2.0
+Maintainer: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2), dpatch, ocaml-findlib, libpxp-ocaml-dev
+Standards-Version: 3.7.2
 
 Package: libocamli18n-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-3.08.3
+Depends: ocaml-nox-${F:OCamlABI}
 Description: OCaml internationalization library
  OCamlI18N provides an I18N module modeling locales, time zones,
  calendars and dates, numbers and collations for any language, provided

Copied: trunk/packages/ocamli18n/trunk/debian/control.in (from r2809, trunk/packages/ocamli18n/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamli18n/trunk/debian/control.in?rev=2930&op=diff
==============================================================================
--- trunk/packages/ocamli18n/trunk/debian/control (original)
+++ trunk/packages/ocamli18n/trunk/debian/control.in Tue Jul 11 21:53:35 2006
@@ -1,15 +1,14 @@
 Source: ocamli18n
 Section: libdevel
 Priority: optional
-Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
-Uploaders: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>, Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, dpatch, ocaml-findlib, libpxp-ocaml-dev
-Standards-Version: 3.6.2.0
+Maintainer: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= #OCamlABI#), dpatch, ocaml-findlib, libpxp-ocaml-dev
+Standards-Version: 3.7.2
 
 Package: libocamli18n-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-3.08.3
+Depends: ocaml-nox-${F:OCamlABI}
 Description: OCaml internationalization library
  OCamlI18N provides an I18N module modeling locales, time zones,
  calendars and dates, numbers and collations for any language, provided

Modified: trunk/packages/ocamli18n/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamli18n/trunk/debian/patches/00list?rev=2930&op=diff
==============================================================================
--- trunk/packages/ocamli18n/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamli18n/trunk/debian/patches/00list Tue Jul 11 21:53:35 2006
@@ -1,2 +1,3 @@
 02_correct_ocamldoc_generation
+03_camlp4_loc
 

Added: trunk/packages/ocamli18n/trunk/debian/patches/03_camlp4_loc.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamli18n/trunk/debian/patches/03_camlp4_loc.dpatch?rev=2930&op=file
==============================================================================
--- trunk/packages/ocamli18n/trunk/debian/patches/03_camlp4_loc.dpatch (added)
+++ trunk/packages/ocamli18n/trunk/debian/patches/03_camlp4_loc.dpatch Tue Jul 11 21:53:35 2006
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_camlp4_loc.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad ocamli18n-0.3~/src/generate_parser.ml ocamli18n-0.3/src/generate_parser.ml
+--- ocamli18n-0.3~/src/generate_parser.ml	2005-11-10 01:14:48.000000000 +0100
++++ ocamli18n-0.3/src/generate_parser.ml	2006-06-14 21:48:10.000000000 +0200
+@@ -7,7 +7,7 @@
+ open Lexing
+ #load "pr_o.cmo";;
+ 
+-let loc = Lexing.dummy_pos, Lexing.dummy_pos
++let _loc = Lexing.dummy_pos, Lexing.dummy_pos
+ 
+ let idexpr = (<:expr< fun x -> x >> )
+ 

Propchange: trunk/packages/ocamli18n/trunk/debian/patches/03_camlp4_loc.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/ocamli18n/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamli18n/trunk/debian/rules?rev=2930&op=diff
==============================================================================
--- trunk/packages/ocamli18n/trunk/debian/rules (original)
+++ trunk/packages/ocamli18n/trunk/debian/rules Tue Jul 11 21:53:35 2006
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 include /usr/share/dpatch/dpatch.make
 
 OCAMLIBDIR := $(shell ocamlc -where)
+OCAMLABI=$(shell ocamlc -version)
 DESTDIR = $(CURDIR)/debian/libocamli18n-ocaml-dev
 
+debian/control: debian/control.in
+	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
 
 build: build-stamp
 build-stamp: patch-stamp
@@ -49,9 +49,9 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	dh_gencontrol -a
+	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -a
 	dh_builddeb -a
 
 binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure debian/control

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