[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 447143ecb1aa4538a227525eb9d1479b9be8d9d2
Author: Eric Cooper <ecc at cmu.edu>
Date:   Wed Mar 11 11:51:22 2009 -0400

    remove existing inetd.conf entry in postinst script
    
    handle service names as well as numeric ports

diff --git a/debian/approx.config b/debian/approx.config
index d28379f..681b038 100644
--- a/debian/approx.config
+++ b/debian/approx.config
@@ -2,16 +2,5 @@
 
 . /usr/share/debconf/confmodule
 
-db_set approx/port 9999
-numeric=no
-while [ $numeric = no ]; do
-    db_input medium approx/port || true
-    db_go || true
-    db_get approx/port
-    if echo "$RET" | grep -q '^[0-9][0-9]*$'; then
-        numeric=yes
-    else
-        db_input medium approx/numeric_port || true
-        db_go || true
-    fi
-done
+db_input medium approx/port || true
+db_go || true
diff --git a/debian/approx.postinst b/debian/approx.postinst
index 987a177..915fc1a 100644
--- a/debian/approx.postinst
+++ b/debian/approx.postinst
@@ -16,6 +16,9 @@ if [ ! -d /var/cache/approx ]; then
     chown approx:approx /var/cache/approx
 fi
 
+# first remove any "vanilla" entry from /etc/inetd.conf
+update-inetd --remove '^(\d|\w)+\s.*\bapprox\b'
+
 # add entry to /etc/inetd.conf
 db_get approx/port
 port="$RET"
diff --git a/debian/approx.templates b/debian/approx.templates
index 7c183dd..652b046 100644
--- a/debian/approx.templates
+++ b/debian/approx.templates
@@ -2,10 +2,6 @@ Template: approx/port
 Type: string
 Default: 9999
 _Description: TCP port for approx service:
- Please enter the numeric TCP port on which approx should listen for requests.
- The default is 9999 (for compatibility with apt-proxy).
-
-Template: approx/numeric_port
-Type: error
-_Description: Port must be numeric
-  The port must be specified as a decimal number.
+ Please enter the TCP port on which approx should listen for requests.
+ The default is the value used by apt-proxy, for compatibility with
+ its clients' /etc/apt/sources.list files.
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 0fe3cd9..94ff603 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: approx at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-10 18:46-0400\n"
+"POT-Creation-Date: 2009-03-11 12:25-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -26,18 +26,7 @@ msgstr ""
 #. Description
 #: ../approx.templates:1001
 msgid ""
-"Please enter the numeric TCP port on which approx should listen for "
-"requests. The default is 9999 (for compatibility with apt-proxy)."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../approx.templates:2001
-msgid "Port must be numeric"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../approx.templates:2001
-msgid " The port must be specified as a decimal number."
+"Please enter the TCP port on which approx should listen for requests. The "
+"default is the value used by apt-proxy, for compatibility with its clients' /"
+"etc/apt/sources.list files."
 msgstr ""

-- 
approx upstream and debian packaging