[Pkg-ocaml-maint-commits] r1354 - trunk/projects/approx/debian

[Eric Cooper]

Author: ecc-guest
Date: 2005-05-07 15:12:20 +0000 (Sat, 07 May 2005)
New Revision: 1354

Modified:
   trunk/projects/approx/debian/changelog
   trunk/projects/approx/debian/control
   trunk/projects/approx/debian/rules
Log:
build byte-code version on architectures with no ocamlopt


Modified: trunk/projects/approx/debian/changelog
===================================================================
--- trunk/projects/approx/debian/changelog	2005-05-07 15:10:57 UTC (rev 1353)
+++ trunk/projects/approx/debian/changelog	2005-05-07 15:12:20 UTC (rev 1354)
@@ -1,14 +1,20 @@
+approx (1.15) unstable; urgency=low
+
+  * Build byte-code version on architectures with no ocamlopt
+
+ -- Eric Cooper <ecc@cmu.edu>  Sat,  7 May 2005 11:08:38 -0400
+
 approx (1.14) unstable; urgency=low
 
-  * added --foreground option to approx (closes: #306898)
+  * Added --foreground option to approx (closes: #306898)
 
  -- Eric Cooper <ecc@cmu.edu>  Thu,  5 May 2005 10:43:36 -0400
 
 approx (1.13) unstable; urgency=low
 
-  * make sure /var/cache/approx exists before trying to chown it
+  * Make sure /var/cache/approx exists before trying to chown it
     (closes: #306621)
-  * no longer allow the cache directory to be specified in approx.conf;
+  * No longer allow the cache directory to be specified in approx.conf;
     always use /var/cache/approx (which can be a symlink)
 
  -- Eric Cooper <ecc@cmu.edu>  Wed, 27 Apr 2005 18:39:13 -0400

Modified: trunk/projects/approx/debian/control
===================================================================
--- trunk/projects/approx/debian/control	2005-05-07 15:10:57 UTC (rev 1353)
+++ trunk/projects/approx/debian/control	2005-05-07 15:12:20 UTC (rev 1354)
@@ -18,7 +18,7 @@
  upgrade Debian software for a number of machines on a local network.
  Each package is downloaded from a remote site only once,
  regardless of how many local clients install it.
- Approx's cache typically uses only a few gigabytes of disk space.
+ The approx cache typically requires a few gigabytes of disk space.
  .
  Approx also simplifies the administration of client machines:
  repository locations need only be changed in approx's configuration file,

Modified: trunk/projects/approx/debian/rules
===================================================================
--- trunk/projects/approx/debian/rules	2005-05-07 15:10:57 UTC (rev 1353)
+++ trunk/projects/approx/debian/rules	2005-05-07 15:12:20 UTC (rev 1354)
@@ -1,26 +1,22 @@
 #!/usr/bin/make -f
-# Based on /usr/share/doc/debhelper/examples/rules
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
+	if [ -x /usr/bin/ocamlopt ]; then \
+	    $(MAKE) native-code; \
+	else \
+	    $(MAKE) byte-code; \
+	fi
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-
-	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
-
 	dh_clean
 
 DESTDIR = $(CURDIR)/debian/tmp/usr/bin
@@ -33,11 +29,8 @@
 	dh_install approx gc_approx usr/sbin
 	dh_install approx.conf etc/approx
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot