[Pkg-ocaml-maint-commits] r2416 - trunk/packages/ocamlnet/trunk/debian

[Stefano Zacchiroli]

Author: zack
Date: 2006-01-08 10:07:52 +0000 (Sun, 08 Jan 2006)
New Revision: 2416

Modified:
   trunk/packages/ocamlnet/trunk/debian/changelog
   trunk/packages/ocamlnet/trunk/debian/control
   trunk/packages/ocamlnet/trunk/debian/control.in
   trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install
   trunk/packages/ocamlnet/trunk/debian/rules
Log:
- ported to ocaml 3.09.1
- better clean up on debian/rules clean


Modified: trunk/packages/ocamlnet/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog	2006-01-08 00:19:28 UTC (rev 2415)
+++ trunk/packages/ocamlnet/trunk/debian/changelog	2006-01-08 10:07:52 UTC (rev 2416)
@@ -1,3 +1,12 @@
+ocamlnet (1.1-8) unstable; urgency=low
+
+  * Rebuilt against OCaml 3.09.1, bumped deps accordingly.
+  * debian/control
+    - clean up of some files not cleaned by upstream's Makefile
+      (closes: #346278)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun,  8 Jan 2006 01:36:14 +0100
+
 ocamlnet (1.1-7) unstable; urgency=low
 
   * ships runtime .so in libocamlnet-ocaml instead of libocamlnet-ocaml-dev

Modified: trunk/packages/ocamlnet/trunk/debian/control
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/control	2006-01-08 00:19:28 UTC (rev 2415)
+++ trunk/packages/ocamlnet/trunk/debian/control	2006-01-08 10:07:52 UTC (rev 2416)
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.0), libpcre-ocaml-dev (>= 5.10.1), libequeue-ocaml-dev (>= 2.1.3-3), ocaml-findlib (>= 1.1), dpatch, cdbs
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.1), libpcre-ocaml-dev (>= 5.10.1-2), libequeue-ocaml-dev (>= 2.1.3-4), ocaml-findlib (>= 1.1), dpatch, cdbs
 Standards-Version: 3.6.2
 
 Package: libocamlnet-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.10.1), libequeue-ocaml-dev (>= 2.1.3-3), ocaml-findlib (>= 1.1), ${misc:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.10.1-2), libequeue-ocaml-dev (>= 2.1.3-4), ocaml-findlib (>= 1.1), ${misc:Depends}
 Description: OCaml application-level Internet protocols and conventions library
  Collection of modules for the Objective Caml language which
  focus on application-level Internet protocols and conventions.

Modified: trunk/packages/ocamlnet/trunk/debian/control.in
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/control.in	2006-01-08 00:19:28 UTC (rev 2415)
+++ trunk/packages/ocamlnet/trunk/debian/control.in	2006-01-08 10:07:52 UTC (rev 2416)
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= @OCamlABI@), libpcre-ocaml-dev (>= 5.10.1), libequeue-ocaml-dev (>= 2.1.3-3), ocaml-findlib (>= 1.1), dpatch, cdbs
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= @OCamlABI@), libpcre-ocaml-dev (>= 5.10.1-2), libequeue-ocaml-dev (>= 2.1.3-4), ocaml-findlib (>= 1.1), dpatch, cdbs
 Standards-Version: 3.6.2
 
 Package: libocamlnet-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.10.1), libequeue-ocaml-dev (>= 2.1.3-3), ocaml-findlib (>= 1.1), ${misc:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.10.1-2), libequeue-ocaml-dev (>= 2.1.3-4), ocaml-findlib (>= 1.1), ${misc:Depends}
 Description: OCaml application-level Internet protocols and conventions library
  Collection of modules for the Objective Caml language which
  focus on application-level Internet protocols and conventions.

Modified: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install	2006-01-08 00:19:28 UTC (rev 2415)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install	2006-01-08 10:07:52 UTC (rev 2416)
@@ -1,5 +1,5 @@
-debian/tmp/cgi/		usr/lib/ocaml/3.09.0/
-debian/tmp/nethttpd/	usr/lib/ocaml/3.09.0/
-debian/tmp/netstring/	usr/lib/ocaml/3.09.0/
-debian/tmp/pop/		usr/lib/ocaml/3.09.0/
-debian/tmp/smtp/	usr/lib/ocaml/3.09.0/
+debian/tmp/cgi/		usr/lib/ocaml/3.09.1/
+debian/tmp/nethttpd/	usr/lib/ocaml/3.09.1/
+debian/tmp/netstring/	usr/lib/ocaml/3.09.1/
+debian/tmp/pop/		usr/lib/ocaml/3.09.1/
+debian/tmp/smtp/	usr/lib/ocaml/3.09.1/

Modified: trunk/packages/ocamlnet/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/rules	2006-01-08 00:19:28 UTC (rev 2415)
+++ trunk/packages/ocamlnet/trunk/debian/rules	2006-01-08 10:07:52 UTC (rev 2416)
@@ -30,6 +30,9 @@
 common-install-impl::
 	mkdir -p debian/libocamlnet-ocaml$(OCAMLLIBDIR)/stublibs
 	mv debian/tmp/netstring/*.so debian/libocamlnet-ocaml$(OCAMLLIBDIR)/stublibs
+clean::
+	rm -f /src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml.cm*
+	rm -f /src/tmp/t.cm*
 
 # work around cdbs' bug
 unpatch: deapply-dpatches