[Pkg-ocaml-maint-commits] r5691 - in /trunk/packages/ocamlgsl/trunk/debian: changelog control control.in patches/00list patches/match_gcc_4_2.dpatch rules

Mon May 26 10:17:56 UTC 2008

Author: gildor
Date: Mon May 26 10:17:56 2008
New Revision: 5691

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5691
Log:
* Remove control.in
* Add patch to recognize gcc-4.2 on arm
* Add arch hurd-i386

Added:
    trunk/packages/ocamlgsl/trunk/debian/patches/match_gcc_4_2.dpatch   (with props)
Removed:
    trunk/packages/ocamlgsl/trunk/debian/control.in
Modified:
    trunk/packages/ocamlgsl/trunk/debian/changelog
    trunk/packages/ocamlgsl/trunk/debian/control
    trunk/packages/ocamlgsl/trunk/debian/patches/00list
    trunk/packages/ocamlgsl/trunk/debian/rules

Modified: trunk/packages/ocamlgsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/changelog?rev=5691&op=diff
==============================================================================

--- trunk/packages/ocamlgsl/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgsl/trunk/debian/changelog Mon May 26 10:17:56 2008
@@ -1,13 +1,15 @@
-ocamlgsl (0.6.0-2) UNRELEASED; urgency=low
-
-  [ Sylvain Le Gall ]
-  * NOT RELEASED YET
-  * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
+ocamlgsl (0.6.0-2) unstable; urgency=low
 
   [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
 
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 18 Oct 2007 01:13:11 +0200
+  [ Sylvain Le Gall ]
+  * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
+  * Modify gcc matching to help recognize gcc-4.2 as gcc 
+    (Closes: #482920)
+  * Add hurd-i386 to arch (Closes: #482906)
+
+ -- Sylvain Le Gall <gildor at debian.org>  Mon, 26 May 2008 12:15:49 +0200
 
 ocamlgsl (0.6.0-1) unstable; urgency=low
 

Modified: trunk/packages/ocamlgsl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/control?rev=5691&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/control (original)
+++ trunk/packages/ocamlgsl/trunk/debian/control Mon May 26 10:17:56 2008
@@ -9,7 +9,7 @@
 
 Package: libocamlgsl-ocaml-dev
 Section: libdevel
-Architecture: i386 arm ia64 s390 alpha powerpc m68k mips mipsel amd64 kfreebsd-i386
+Architecture: i386 arm ia64 s390 alpha powerpc m68k mips mipsel amd64 kfreebsd-i386 hurd-i386
 Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlgsl-ocaml (= ${binary:Version}), libgsl0-dev
 Description: GNU scientific library for OCaml
  This is an interface to GSL (GNU scientific library), for the
@@ -19,7 +19,7 @@
 
 Package: libocamlgsl-ocaml
 Section: libs
-Architecture: i386 arm ia64 s390 alpha powerpc m68k mips mipsel amd64 kfreebsd-i386
+Architecture: i386 arm ia64 s390 alpha powerpc m68k mips mipsel amd64 kfreebsd-i386 hurd-i386
 Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
 Description: GNU scientific library for OCaml
  This is an interface to GSL (GNU scientific library), for the

Modified: trunk/packages/ocamlgsl/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/patches/00list?rev=5691&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamlgsl/trunk/debian/patches/00list Mon May 26 10:17:56 2008
@@ -1,2 +1,3 @@
 make_bytecode
 02_correct_examples
+match_gcc_4_2

Added: trunk/packages/ocamlgsl/trunk/debian/patches/match_gcc_4_2.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/patches/match_gcc_4_2.dpatch?rev=5691&op=file
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/patches/match_gcc_4_2.dpatch (added)
+++ trunk/packages/ocamlgsl/trunk/debian/patches/match_gcc_4_2.dpatch Mon May 26 10:17:56 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## match_gcc_4_2.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 ocamlgsl-0.6.0~/Makefile ocamlgsl-0.6.0/Makefile
+--- ocamlgsl-0.6.0~/Makefile	2008-05-26 12:12:17.000000000 +0200
++++ ocamlgsl-0.6.0/Makefile	2008-05-26 12:12:26.000000000 +0200
+@@ -21,7 +21,7 @@
+ OCAML_BACKEND := mingw
+ endif
+ 
+-OCAML_BACKEND ?= $(shell $(OCAMLC) -verbose foo.c 2>&1 | $(AWK) "NR==1 { print \$$2 }")
++OCAML_BACKEND ?= $(shell $(OCAMLC) -verbose foo.c 2>&1 | $(AWK) "NR==1 && /\+ gcc-.*/ { print \"gcc\"; next; } NR==1 { print \$$2 }")
+ OCAML_VERSION ?= $(shell $(OCAMLC) -version)
+ 
+ OCAMLBCFLAGS := -g 

Propchange: trunk/packages/ocamlgsl/trunk/debian/patches/match_gcc_4_2.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/ocamlgsl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/rules?rev=5691&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/rules (original)
+++ trunk/packages/ocamlgsl/trunk/debian/rules Mon May 26 10:17:56 2008
@@ -16,9 +16,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
-
-# Generate debian/control using
-# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
@@ -42,8 +39,6 @@
 
 DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-9),$(CDBS_BUILD_DEPENDS))
-
 OCAML_OCAMLDOC_PACKAGES_DOCBASE := libocamlgsl-ocaml-dev
 
 clean::


