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

[Stefano Zacchiroli]

Author: zack
Date: 2005-10-09 12:48:29 +0000 (Sun, 09 Oct 2005)
New Revision: 1813

Added:
   trunk/packages/ocamlnet/trunk/debian/rm_on_clean.txt
Modified:
   trunk/packages/ocamlnet/trunk/debian/changelog
   trunk/packages/ocamlnet/trunk/debian/control
   trunk/packages/ocamlnet/trunk/debian/rules
Log:
fixed ftbfs


Modified: trunk/packages/ocamlnet/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog	2005-10-07 19:41:43 UTC (rev 1812)
+++ trunk/packages/ocamlnet/trunk/debian/changelog	2005-10-09 12:48:29 UTC (rev 1813)
@@ -1,3 +1,15 @@
+ocamlnet (1.1-5) unstable; urgency=low
+
+  * debian/rules
+    - removed stdlib overrinding in "install" target, fixing FTBFS
+      (closes: Bug#332283)
+    - better cleanup on "clean" target, after "clean" the debianized
+      source tree should now be identical to a freshly unpacked one
+  * debian/control
+    - versioned equeue dependency
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun,  9 Oct 2005 12:13:20 +0200
+
 ocamlnet (1.1-4) unstable; urgency=low
 
   * ships upstream examples in

Modified: trunk/packages/ocamlnet/trunk/debian/control
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/control	2005-10-07 19:41:43 UTC (rev 1812)
+++ trunk/packages/ocamlnet/trunk/debian/control	2005-10-09 12:48:29 UTC (rev 1813)
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, libpcre-ocaml-dev (>= 5.10), libequeue-ocaml-dev, ocaml-findlib, dpatch
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, libpcre-ocaml-dev (>= 5.10), libequeue-ocaml-dev (>= 2.1.3), ocaml-findlib, dpatch
 Standards-Version: 3.6.2
 
 Package: libocamlnet-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-3.08.3, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.10), libequeue-ocaml-dev, ocaml-findlib, ${misc:Depends}
+Depends: ocaml-nox-3.08.3, libocamlnet-ocaml (= ${Source-Version}), libpcre-ocaml-dev (>= 5.10), libequeue-ocaml-dev (>= 2.1.3), ocaml-findlib, ${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.

Added: trunk/packages/ocamlnet/trunk/debian/rm_on_clean.txt
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/rm_on_clean.txt	2005-10-07 19:41:43 UTC (rev 1812)
+++ trunk/packages/ocamlnet/trunk/debian/rm_on_clean.txt	2005-10-09 12:48:29 UTC (rev 1813)
@@ -0,0 +1,12 @@
+src/netstring/depend
+src/netstring/dllnetaccel_c.so
+src/netstring/META
+src/netstring/netdb.cmi
+src/netstring/netdb.ml
+src/netstring/netdb-packlist
+src/netstring/netmappings_jp.ml
+src/netstring/tools_done
+src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml
+src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml.cmi
+src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml.cmo
+src/tmp/

Modified: trunk/packages/ocamlnet/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/rules	2005-10-07 19:41:43 UTC (rev 1812)
+++ trunk/packages/ocamlnet/trunk/debian/rules	2005-10-09 12:48:29 UTC (rev 1813)
@@ -37,12 +37,7 @@
 
 	$(MAKE) -C src/netstring/tools/unimap_to_ocaml/ clean distclean
 	$(MAKE) -C src/ clean distclean
-	rm -f \
-		src/tmp/* src/netstring/dllnetaccel_c.so \
-		src/netstring/netdb.{cmi,ml} \
-		src/netstring/netdb-packlist \
-		src/netstring/netmappings_jp.ml \
-		src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml{,.cmi,.cmo}
+	rm -rf `cat debian/rm_on_clean.txt`
 
 	dh_clean
 
@@ -52,7 +47,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	CAMLLIB=`pwd` $(MAKE) -C src/ install \
+	$(MAKE) -C src/ install \
 		NETDBDESTDIR=$(TARGETDIR)$(NETDBDESTDIR) \
 		DESTDIR=$(TARGETDIR)$(OCAML_LIB_DIR)
 	mv $(TARGETDIR)$(OCAML_LIB_DIR)/netstring/*.so \