[Pkg-ocaml-maint-commits] r3441 - in /trunk/packages/ocamlnet/trunk/debian: changelog libocamlnet-ocaml-dev.install.in rules

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Jan  2 19:39:25 2007
New Revision: 3441

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3441
Log:
- more recent upstream tarball (which fixes rpc DH build failure)
- builds also rpc with DH auth

Modified:
    trunk/packages/ocamlnet/trunk/debian/changelog
    trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in
    trunk/packages/ocamlnet/trunk/debian/rules

Modified: trunk/packages/ocamlnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/changelog?rev=3441&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog (original)
+++ trunk/packages/ocamlnet/trunk/debian/changelog Tue Jan  2 19:39:25 2007
@@ -1,4 +1,4 @@
-ocamlnet (2.2-1) UNRELEASED; urgency=low
+ocamlnet (2.2.3-1) UNRELEASED; urgency=low
 
   * XXX Zack token: I'm working on packaging ocamlnet 2.2, this temp changelog
     entry is just to let others know that I'm working on it. Please get in

Modified: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in?rev=3441&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in (original)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.install.in Tue Jan  2 19:39:25 2007
@@ -15,6 +15,7 @@
 debian/tmp/usr/lib/ocaml/@OCamlABI@/netsys			@OCamlStdlibDir@
 debian/tmp/usr/lib/ocaml/@OCamlABI@/pop				@OCamlStdlibDir@
 debian/tmp/usr/lib/ocaml/@OCamlABI@/rpc				@OCamlStdlibDir@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/rpc-auth-dh			@OCamlStdlibDir@
 debian/tmp/usr/lib/ocaml/@OCamlABI@/rpc-auth-local		@OCamlStdlibDir@
 debian/tmp/usr/lib/ocaml/@OCamlABI@/rpc-generator		@OCamlStdlibDir@
 debian/tmp/usr/lib/ocaml/@OCamlABI@/rpc-ssl			@OCamlStdlibDir@

Modified: trunk/packages/ocamlnet/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/rules?rev=3441&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/rules (original)
+++ trunk/packages/ocamlnet/trunk/debian/rules Tue Jan  2 19:39:25 2007
@@ -11,33 +11,21 @@
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR) OCAMLFIND_DESTDIR=$(OCAMLFIND_DESTDIR)
 
 DEB_MAKE_BUILD_TARGET = all
-
-# XXX temporarily commented out, to speed up building while testing
-#ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-#DEB_MAKE_BUILD_TARGET += opt
-#endif
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET += opt
+endif
 
 DEB_DH_COMPRESS_ARGS = -X.ml
 
 configure/$(PKGNAME):: configure-stamp
 configure-stamp:
-	# XXX TODO: add back the following configure parameter, right now the
-	# compilation with it fails due to a missing file
-	# -with-rpc-auth-dh
 	./configure \
-		-enable-gtk2 -enable-ssl -enable-modcaml -with-nethttpd -prefer-netcgi2 \
+		-enable-gtk2 -enable-ssl -enable-modcaml -with-nethttpd -prefer-netcgi2 -with-rpc-auth-dh \
 		-bindir /usr/bin -datadir /usr/share/ocamlnet
 	touch debian/configure-stamp
 clean::
-	rm -rf debian/configure-stamp
-#	find src -name depend -exec rm -f {} \;
+	rm -f debian/configure-stamp
 
 build/$(PKGNAME)::
 	mkdir -p $(OCAMLFIND_DESTDIR) $(OCAMLFIND_DESTDIR)/stublibs
-#common-install-impl::
-#	mkdir -p debian/libocamlnet-ocaml$(OCAML_STDLIB_DIR)/stublibs
-#	mv debian/tmp/netstring/*.so debian/libocamlnet-ocaml$(OCAML_STDLIB_DIR)/stublibs
-#clean::
-#	rm -f /src/netstring/tools/unimap_to_ocaml/unimap_to_ocaml.cm*
-#	rm -f /src/tmp/t.cm*