[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, master, updated. upstream/3.5-103-g447143e

[Eric Cooper]

The following commit has been merged in the master branch:
commit 3c364ef43dc8d564b319020c7961270443c3b198
Author: Eric Cooper <ecc at cmu.edu>
Date:   Tue Mar 10 14:42:36 2009 -0400

    update changelog and NEWS for inetd version of approx
    
    su no longer required in cron jobs
    no need to install DLL in debian/rules
    add dependency on inet-superserver

diff --git a/debian/NEWS b/debian/NEWS
index f4cd12d..d107451 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+approx (4.0-1) unstable; urgency=low
+
+  The approx program no longer runs as an independent daemon;
+  it is now run by inetd.  Since the listening port and addresses
+  can be specified in /etc/inetd.conf, the $port and $interface
+  configuration parameters have been removed.  Host access control
+  using /etc/hosts.allow and /etc/hosts.deny is also supported by inetd.
+
+ -- Eric Cooper <ecc at cmu.edu>  Tue, 10 Mar 2009 13:37:00 -0400
+
 approx (3.4-1) unstable; urgency=low
 
   A new program, approx-import, has been added. It can be used to populate
diff --git a/debian/approx.cron.daily b/debian/approx.cron.daily
index 2fee7db..30520d1 100644
--- a/debian/approx.cron.daily
+++ b/debian/approx.cron.daily
@@ -3,5 +3,5 @@
 # Update the approx(8) cache
 
 if [ -x /usr/sbin/approx-update ]; then
-    su --shell /bin/sh --command "/usr/sbin/approx-update --quiet" approx
+    /usr/sbin/approx-update --quiet
 fi
diff --git a/debian/approx.cron.weekly b/debian/approx.cron.weekly
index b021b4b..899b863 100644
--- a/debian/approx.cron.weekly
+++ b/debian/approx.cron.weekly
@@ -3,5 +3,5 @@
 # Garbage collect the approx(8) cache
 
 if [ -x /usr/sbin/approx-gc ]; then
-    su --shell /bin/sh --command "/usr/sbin/approx-gc --quiet" approx
+    /usr/sbin/approx-gc --quiet
 fi
diff --git a/debian/approx.postinst b/debian/approx.postinst
index bb84f08..fc5c9bb 100644
--- a/debian/approx.postinst
+++ b/debian/approx.postinst
@@ -14,7 +14,12 @@ if [ ! -d /var/cache/approx ]; then
 fi
 
 # add entry to /etc/inetd.conf
-update-inetd --add '9999\t\tstream\ttcp\tnowait\tapprox\t/usr/sbin/approx'
+update-inetd --add "9999\t\tstream\ttcp\tnowait\tapprox\t/usr/sbin/approx"
+
+# remove unused defaults file
+if [ -f /etc/default/approx ]; then
+    rm -f /etc/default/approx
+fi
 
 # remove unused init script
 if [ -f /etc/init.d/approx ]; then
@@ -22,9 +27,4 @@ if [ -f /etc/init.d/approx ]; then
     update-rc.d approx remove >/dev/null
 fi
 
-# remove unused defaults file
-if [ -f /etc/default/approx ]; then
-    rm -f /etc/default/approx
-fi
-
 #DEBHELPER#
diff --git a/debian/changelog b/debian/changelog
index 48ca25a..5247980 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ approx (4.0-1) unstable; urgency=low
   * Update packaging for OCaml 3.11 (closes: #518727)
   * Revert to dropping privileges in gc, update, and import
     (closes: #510761)
+  * approx-import: use MD5 checksums instead of names and versions
+    (closes: #518753, #518763)
+  * approx-import: print status of each file when importing in verbose mode
+    (closes: #518761)
 
- -- Eric Cooper <ecc at cmu.edu>  Sun, 08 Mar 2009 15:07:56 -0400
+ -- Eric Cooper <ecc at cmu.edu>  Tue, 10 Mar 2009 13:37:00 -0400
 
 approx (3.5-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index da49a31..ff3f1cc 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Homepage: http://git.debian.org/?p=pkg-ocaml-maint/packages/approx.git
 
 Package: approx
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlDeps}, lsb-base (>= 3.2), adduser, bzip2, curl, update-inetd
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlDeps}, lsb-base (>= 3.2), adduser, bzip2, curl, openbsd-inetd | inet-superserver, update-inetd
 Description: caching proxy server for Debian archive files
  Approx is an HTTP-based Debian archive server.
  It fetches packages from remote repositories on demand,
diff --git a/debian/rules b/debian/rules
index 057a7f8..ded4bea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ include /usr/share/cdbs/1/rules/ocaml.mk
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),no)
     DEB_MAKE_BUILD_TARGET = TARGET=byte
-    DEB_DH_INSTALL_ARGS += _build/dllapprox.so $(OCAML_DLL_DIR)
     libs_with_stubs := ocamlnet pcre sha syslog
     comma := ,
     libdeps := $(patsubst %,lib%-ocaml$(comma),$(libs_with_stubs))

-- 
approx upstream and debian packaging