[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, master, updated. debian/3.3.0-25-g89572fc
Eric Cooper
ecc at cmu.edu
Fri Oct 24 16:04:38 UTC 2008
The following commit has been merged in the master branch:
commit 89572fc662f8d25bef760b50827398e3e5919bc0
Merge: c0312dd58e50967490d3dbfed50632bdd9f2af72 fdc1649d39c67d97761d25a6d40195ea8a924bb2
Author: Eric Cooper <ecc at cmu.edu>
Date: Fri Oct 24 11:53:09 2008 -0400
Merge branch 'upstream'
diff --combined debian/NEWS
index 3f69fde,0000000..f4cd12d
mode 100644,000000..100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@@ -1,109 -1,0 +1,120 @@@
++approx (3.4-1) unstable; urgency=low
++
++ A new program, approx-import, has been added. It can be used to populate
++ the approx cache with existing .deb files, such as those found in
++ /var/cache/apt/archives.
++
++ For consistency, the other auxiliary programs have been renamed to
++ approx-gc and approx-update.
++
++ -- Eric Cooper <ecc at cmu.edu> Thu, 23 Oct 2008 21:16:00 -0400
++
+approx (3.2.0) unstable; urgency=low
+
+ If both IPv4 and IPv6 sockets are supported, approx will listen on both.
+
+ -- Eric Cooper <ecc at cmu.edu> Wed, 16 Apr 2008 21:49:01 -0400
+
+approx (3.1.0~rc1) experimental; urgency=low
+
+ TCP wrappers support has been added. Access control rules can be specified
+ for the approx daemon in /etc/hosts.allow and /etc/hosts.deny.
+
+ Approx now listens on an IPv6 socket if supported by the kernel, otherwise
+ it falls back to IPv4. The $interface parameter is not supported for IPv6,
+ but TCP wrappers or iptables rules can be used instead.
+
+ A new configuration parameter, $max_redirects, specifies the maximum number
+ of HTTP redirections that will be followed when downloading a remote file.
+
+ Requests for directories are now passed through without caching, so that
+ tools like "wget -r" can be used to mirror a repository known to approx.
+ Directory requests are detected by a path with a trailing / (or an HTTP
+ redirection to one).
+
+ -- Eric Cooper <ecc at cmu.edu> Thu, 13 Mar 2008 10:05:56 -0400
+
+approx (3.0.0) unstable; urgency=low
+
+ The approx server now handles pdiffs: incremental diffs to Packages files.
+ When a client downloads a pdiff, the approx server uses it to update
+ the cached Packages file if possible. When an up-to-date Packages file
+ is present in the cache, the client's DiffIndex request is denied,
+ forcing the client to fall back to the full Packages file.
+
+ A new configuration parameter, $pdiffs, controls this behavior.
+ Setting it to false causes approx to deny all DiffIndex requests,
+ as it did previously.
+
+ Since approx must decompress and recompress Packages files when applying
+ pdiffs, and gzip is significantly faster than bzip2, approx denies requests
+ for .bz2 versions and only delivers .gz versions.
+
+ The $interval parameter has been eliminated. Now the approx server
+ always contacts the remote repository when a Release or Release.gpg file
+ is requested, and all other index files in the cache are validated
+ against the Release file.
+
+ A new configuration parameter, $offline, causes the approx server
+ to deliver (possibly out-of-date) cached files when they cannot be
+ downloaded from remote repositories.
+
+ -- Eric Cooper <ecc at cmu.edu> Tue, 04 Dec 2007 12:24:16 -0500
+
+approx (2.9.0) unstable; urgency=low
+
+ Configuration parameters in /etc/approx/approx.conf should now begin
+ with '$' to distinguish them from repository names. The old style is
+ still accepted with a warning message.
+
+ Several parameters have been added: $user, $group, $syslog, $verbose.
+ See the approx.conf man page for details.
+
+ The gc_approx program now removes empty subdirectories from the cache,
+ simplifying the weekly cron job.
+
+ -- Eric Cooper <ecc at cmu.edu> Wed, 13 Jun 2007 16:04:53 -0400
+
+approx (2.06) unstable; urgency=low
+
+ A new configuration variable, interface, forces approx to listen for
+ connections on a specific network interface only.
+
+ The approx server can now listen on privileged ports such as port 80.
+
+ File: URIs are now supported in the approx.conf file.
+
+ -- Eric Cooper <ecc at cmu.edu> Mon, 24 Apr 2006 16:09:22 -0400
+
+approx (2.00) unstable; urgency=low
+
+ Approx now uses curl subprocesses to download files from remote
+ repositories.
+
+ -- Eric Cooper <ecc at cmu.edu> Mon, 10 Oct 2005 10:04:09 -0400
+
+approx (1.16) unstable; urgency=low
+
+ The approx server now forks multiple processes to handle concurrent
+ requests. A new configuration variable, max_wait, can be used to
+ specify how many seconds an approx process will wait for a concurrent
+ download of a file to complete, before attempting to download the file
+ itself.
+
+ -- Eric Cooper <ecc at cmu.edu> Fri, 13 May 2005 12:23:37 -0400
+
+approx (1.14) unstable; urgency=low
+
+ The --foreground option allows approx to be run more easily from
+ the command line, a debugger, or the runit init scheme.
+
+ -- Eric Cooper <ecc at cmu.edu> Thu, 5 May 2005 10:43:36 -0400
+
+approx (1.13) unstable; urgency=low
+
+ The approx daemon always uses /var/cache/approx now;
+ the cache directory can no longer be changed in the approx.conf file.
+ But /var/cache/approx can be a symbolic link, so the cache directory
+ can still be located elsewhere.
+
+ -- Eric Cooper <ecc at cmu.edu> Wed, 27 Apr 2005 18:39:13 -0400
diff --combined debian/approx.cron.daily
index 2c5e00a,0000000..30520d1
mode 100644,000000..100644
--- a/debian/approx.cron.daily
+++ b/debian/approx.cron.daily
@@@ -1,7 -1,0 +1,7 @@@
+#!/bin/sh
+
+# Update the approx(8) cache
+
- if [ -x /usr/sbin/update_approx ]; then
- /usr/sbin/update_approx --quiet
++if [ -x /usr/sbin/approx-update ]; then
++ /usr/sbin/approx-update --quiet
+fi
diff --combined debian/approx.cron.weekly
index ead26bc,0000000..899b863
mode 100644,000000..100644
--- a/debian/approx.cron.weekly
+++ b/debian/approx.cron.weekly
@@@ -1,7 -1,0 +1,7 @@@
+#!/bin/sh
+
+# Garbage collect the approx(8) cache
+
- if [ -x /usr/sbin/gc_approx ]; then
- /usr/sbin/gc_approx --quiet
++if [ -x /usr/sbin/approx-gc ]; then
++ /usr/sbin/approx-gc --quiet
+fi
diff --combined debian/approx.install
index 34b6444,0000000..9cd5f28
mode 100644,000000..100644
--- a/debian/approx.install
+++ b/debian/approx.install
@@@ -1,4 -1,0 +1,5 @@@
+approx usr/sbin
- gc_approx usr/sbin
- update_approx usr/sbin
++approx-gc usr/sbin
++approx-update usr/sbin
++approx-import usr/sbin
+etc/approx.conf etc/approx
diff --combined debian/approx.manpages
index 0e22b5c,0000000..8b462a0
mode 100644,000000..100644
--- a/debian/approx.manpages
+++ b/debian/approx.manpages
@@@ -1,4 -1,0 +1,5 @@@
+doc/approx.8
- doc/gc_approx.8
- doc/update_approx.8
++doc/approx-gc.8
++doc/approx-update.8
++doc/approx-import.8
+doc/approx.conf.5
diff --combined debian/changelog
index 7db027c,0000000..4526725
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,377 -1,0 +1,389 @@@
++approx (3.4-1) unstable; urgency=low
++
++ * Change to non-native Debian package
++ * Update VCS info in debian/control to reflect change from svn to git
++ * Fix race condition when creating directory for cache file
++ (closes: #501406)
++ * Add approx-import program to import local .debs into approx cache
++ (closes: #488096)
++ * Renamed auxiliary programs approx-gc and approx-update for consistency
++
++ -- Eric Cooper <ecc at cmu.edu> Thu, 23 Oct 2008 21:16:00 -0400
++
+approx (3.3.0) unstable; urgency=low
+
+ * Allow empty host name in file URLs (closes: #479022)
+ * Use unique temporary names to avoid race condition
+ when opening cache files (closes: #488080)
+ * Use hint files to avoid (but not eliminate) duplicate downloads
+ * Remove unnecessary getpeername call in server loop
+
+ -- Eric Cooper <ecc at cmu.edu> Sat, 03 May 2008 16:43:25 -0400
+
+approx (3.2.0) unstable; urgency=low
+
+ * Listen on both IPv4 and IPv6 sockets when available
+ * Add setsockopt IPV6_V6ONLY to allow both kinds of sockets to bind
+ to the same port, as suggested by Julien Cristau <jcristau at debian.org>
+ * Enable -custom for all bytecode executables, not just ones that
+ directly use C stubs, to avoid missing DLLs from libpcre-ocaml, etc.
+ at runtime (closes: #476367)
+
+ -- Eric Cooper <ecc at cmu.edu> Wed, 16 Apr 2008 21:49:01 -0400
+
+approx (3.1.0) unstable; urgency=low
+
+ * Prevent dh_strip from stripping custom bytecode executables
+ (closes: #473707)
+ * Change to debhelper v6 mode
+
+ -- Eric Cooper <ecc at cmu.edu> Wed, 02 Apr 2008 11:00:55 -0400
+
+approx (3.1.0~rc2) experimental; urgency=low
+
+ * Pass -byte-plugin flag to ocamlbuild when building bytecode
+ (closes: #471665)
+
+ -- Eric Cooper <ecc at cmu.edu> Tue, 01 Apr 2008 14:49:03 -0400
+
+approx (3.1.0~rc1) experimental; urgency=low
+
+ * Added support for IPv6 and TCP wrappers
+ - added build-dependency on libwrap0-dev
+ - closes: #468058
+ * Fixed mishandling of HTTP redirections
+ - handle redirection status codes and location headers in approx.ml,
+ following patch supplied by Håkon Stordahl <haastord at online.no>
+ - remove curl --location option from Url.download but not Url.download_file
+ - closes: #469580
+ * Added transparent proxying for requests that should be passed through
+ without caching (closes: #469616)
+ * Perform server initializations like binding to port and dropping privileges
+ before daemonizing, so that any failures will be noticed by the init script
+ (closes: #465450)
+ * Changed Patch module to use a single composite operator
+ instead of a list, so Patch.apply is just function application
+ * Updated Standards-Version, DM-Upload-Allowed and VCS-* in debian/control
+ * Changed from ocamlmakefile to ocamlbuild
+ - removed ocamlmakefile from Build-Depends
+ - added _tags files and myocamlbuild.ml plugin
+ - new, simpler Makefile
+ - updated debian/rules to deal with .native and .byte targets
+ * Improved documentation of the garbage collection algorithm in gc.ml
+ * Changed debug_message and info_message to check corresponding
+ config parameters ($debug, $verbose) so callers don't have to
+ * Renamed config -> config_file and default_config -> config
+ * Style changes (mostly whitespace-only)
+ - use only spaces in indentation, no tabs
+ - write lists like this: [1; 2; 3]
+ - avoid single begin/end lines
+
+ -- Eric Cooper <ecc at cmu.edu> Thu, 13 Mar 2008 10:05:56 -0400
+
+approx (3.0.0) unstable; urgency=low
+
+ * Support pdiffs (closes: #405535)
+ * Create temp files in approx cache rather than TMPDIR (closes: #451768)
+ * Added $offline parameter to control delivery of cached files
+ when remote downloads fail (closes: #442801)
+
+ -- Eric Cooper <ecc at cmu.edu> Tue, 04 Dec 2007 12:24:16 -0500
+
+approx (2.9.1) unstable; urgency=low
+
+ * Make sure cron job doesn't fail if approx has been removed
+ (closes: #404819)
+ * Add Homepage field
+
+ -- Eric Cooper <ecc at cmu.edu> Wed, 03 Oct 2007 11:31:56 -0400
+
+approx (2.9.0) unstable; urgency=low
+
+ [ Eric Cooper ]
+ * Changed debian/rules to use cdbs
+ * Improve postinst check for conflict with apt-proxy
+ (closes: #395375)
+ * Make sure cron job doesn't fail if cache directory is empty
+ (closes: #416361)
+ * Require configuration parameters to begin with '$' to distinguish
+ them from repository names
+ * Added $verbose parameter to control logging of informational messages
+ (closes: #403514)
+ * Added $syslog parameter to specify the syslog facility
+ (closes: #406504)
+ * Added $user and $group parameters to control the approx daemon's user
+ and group [Alexandra N. Kossovsky <sasha at oktetlabs.ru>]
+ (closes: #423836)
+ * Don't assume deluser is still available in postrm (closes: #416643)
+ * Migrated to Ocamlnet 2 (closes: #420478)
+ * Changed dependency from ocaml-tools to ocamlmakefile (closes: #428723)
+
+ [ Ralf Treinen ]
+ * Added myself to uploaders.
+ * Build-depend on ocaml >= 3.10 in order to force the ocaml version on
+ autobuilders.
+
+ -- Ralf Treinen <treinen at debian.org> Wed, 05 Sep 2007 16:43:00 +0200
+
+approx (2.8.0) unstable; urgency=low
+
+ * Make sure syslog messages are newline-terminated for syslog-ng
+ (closes: #394925)
+ * Handle tabs as well as spaces in control files (closes: #394062)
+ * Added "max_rate" configuration variable (closes: #392802)
+ * Improved description in approx man page of how repository mapping works
+ * Added XS-Vcs-Svn header to debian/control file
+
+ -- Eric Cooper <ecc at cmu.edu> Mon, 23 Oct 2006 22:15:34 -0400
+
+approx (2.7.0) unstable; urgency=low
+
+ * New version numbering with third component for packaging-only changes
+ * Deny DiffIndex requests, forcing download of full index files
+ (closes: #367475)
+ * Keep live source packages (those listed in Sources files)
+ (closes: #374736)
+ * Decode request URLs to handle '~' in pathnames (closes: #390121)
+ * Validate packages with SHA256, otherwise SHA1, otherwise MD5
+ * Added --fail option to curl to handle errors better
+ * Made init script LSB-compliant and added dependency on lsb-base
+
+ -- Eric Cooper <ecc at cmu.edu> Mon, 11 Sep 2006 13:09:11 -0400
+
+approx (2.06) unstable; urgency=low
+
+ * Added "interface" configuration variable to allow listening only
+ on a specific network interface, as requested by Romain Lenglet
+ <rlenglet at users.forge.objectweb.org> (closes: #352025)
+ * Added simple-minded support for file URIs, using the same logic as FTP
+ * The server is now started as root by the init script, and then drops
+ privileges to user approx after binding its socket. This allows approx
+ to listen on port 80, as requested by Andreas John <aj at net-lab.net>
+
+ -- Eric Cooper <ecc at cmu.edu> Mon, 24 Apr 2006 16:09:22 -0400
+
+approx (2.05) unstable; urgency=low
+
+ * Factor out all uses of curl command (missed one in previous fix)
+ * Transition to OCaml 3.09.1
+
+ -- Eric Cooper <ecc at cmu.edu> Sun, 8 Jan 2006 14:29:20 -0500
+
+approx (2.04) unstable; urgency=low
+
+ * Added --location option to curl so that it will follow HTTP redirections
+ (closes: #346082)
+
+ -- Eric Cooper <ecc at cmu.edu> Thu, 5 Jan 2006 13:56:03 -0500
+
+approx (2.03) unstable; urgency=low
+
+ * Fixed cron script (closes: #343105)
+ * Updated debian/compat to 5
+
+ -- Eric Cooper <ecc at cmu.edu> Mon, 12 Dec 2005 15:43:46 -0500
+
+approx (2.02) unstable; urgency=low
+
+ * Make sure all data that is streamed to the client during download
+ gets flushed afterwards using cgi#output#commit_work
+ * Added debian/control.in and a rule to generate debian/control from it
+ * Added conditional dependency on OCaml bytecode interpreter
+ for architectures without native compilation
+
+ -- Eric Cooper <ecc at cmu.edu> Sun, 20 Nov 2005 12:20:58 -0500
+
+approx (2.01) unstable; urgency=low
+
+ * Updated debian/control for ocaml version 3.09.0
+ * Added dependency on adduser (for postinst script)
+ * Removed unused variables (or renamed with _) to eliminate warnings
+
+ -- Eric Cooper <ecc at cmu.edu> Tue, 1 Nov 2005 17:43:55 -0500
+
+approx (2.00) unstable; urgency=low
+
+ * Stream the response to the client while downloading to the cache
+ * Release with new major version
+
+ -- Eric Cooper <ecc at cmu.edu> Mon, 10 Oct 2005 10:04:09 -0400
+
+approx (1.51) unstable; urgency=low
+
+ * Changed client to use curl subprocesses instead of ocurl
+ * For simplicity, all downloads are cached first, then sent to the client
+
+ -- Eric Cooper <ecc at cmu.edu> Wed, 14 Sep 2005 09:37:54 -0400
+
+approx (1.50) unstable; urgency=low
+
+ * Changed server to use nethttpd instead of ocaml-http
+
+ -- Eric Cooper <ecc at cmu.edu> Mon, 22 Aug 2005 16:53:22 -0400
+
+approx (1.18) unstable; urgency=low
+
+ * Secure APT imposes additional consistency requirements on the cache:
+ - Release and Release.gpg files must agree
+ - Packages and Sources files must agree with the Release file
+ that mentions them
+ * Closes: #322847
+
+ -- Eric Cooper <ecc at cmu.edu> Sun, 31 Jul 2005 16:10:13 -0400
+
+approx (1.17) unstable; urgency=low
+
+ * Incorporate patch by Flavio Stanchina <flavio at stanchina.net>
+ to recognize Release.gpg and *.bz2 files in gc_approx (closes: #313188)
+ * Include Last-Modified header in local responses
+ * Support If-Modified-Since for FTP requests using MDTM
+
+ -- Eric Cooper <ecc at cmu.edu> Fri, 15 Jul 2005 15:34:21 -0400
+
+approx (1.16) unstable; urgency=low
+
+ * Support concurrent requests
+ - use http_daemon's Fork mode
+ - rely on atomic rename of foo.tmp -> foo in cache
+ - detect concurrent downloads in progress and wait for them
+ * Differentiate levels of syslog messages
+
+ -- Eric Cooper <ecc at cmu.edu> Fri, 13 May 2005 12:23:37 -0400
+
+approx (1.15) unstable; urgency=low
+
+ * Build byte-code version on architectures with no ocamlopt
+ * Create /var/cache/approx directory in postinst script
+
+ -- Eric Cooper <ecc at cmu.edu> Sat, 7 May 2005 11:08:38 -0400
+
+approx (1.14) unstable; urgency=low
+
+ * Added --foreground option to approx (closes: #306898)
+
+ -- Eric Cooper <ecc at 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
+ (closes: #306621)
+ * 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 at cmu.edu> Wed, 27 Apr 2005 18:39:13 -0400
+
+approx (1.12) unstable; urgency=low
+
+ * New description, from suggestions by
+ Raphaël Berbain <raphael.berbain at free.fr>
+ * approx
+ - run as unprivileged user (closes: #305451)
+ - added /etc/default/approx with example of setting
+ http_proxy environment variable (closes: #305453)
+ - detect possible conflict with apt-proxy at installation time
+ and at runtime if binding to port 9999 fails
+ * gc_approx
+ - remove unused distributions and empty parent directories from cache
+ - don't recheck files that have already been checked
+ - uncompress Packages.gz files to disk
+ - use wget to download Packages.gz file if decompression fails
+
+ -- Eric Cooper <ecc at cmu.edu> Mon, 25 Apr 2005 09:01:56 -0400
+
+approx (1.11) unstable; urgency=low
+
+ * Daemonize correctly (closes: #305102)
+
+ -- Eric Cooper <ecc at cmu.edu> Sun, 17 Apr 2005 19:57:56 -0400
+
+approx (1.10) unstable; urgency=low
+
+ * Bumped dependency on syslog-ocaml (closes: #305019)
+
+ -- Eric Cooper <ecc at cmu.edu> Sun, 17 Apr 2005 12:47:12 -0400
+
+approx (1.09) unstable; urgency=low
+
+ * rebuilt against ocamlnet 1.0 and ocaml-http 0.1.0-3
+ * debian/control
+ - added me as an uploader
+ - bumped dependencies on ocamlnet and ocaml-http
+
+ -- Stefano Zacchiroli <zack at debian.org> Sat, 16 Apr 2005 10:13:30 +0200
+
+approx (1.08) unstable; urgency=low
+
+ * Removed trunk directory layer
+ * Add build-dependency on ocaml-tools (closes: #303774)
+
+ -- Eric Cooper <ecc at cmu.edu> Fri, 8 Apr 2005 14:57:43 -0400
+
+approx (1.07) unstable; urgency=low
+
+ * Eliminate timeout for approx daemon callbacks
+ * Make gc_approx handle "Filename: ./foo" correctly
+ * Turn on all OCaml compiler warnings and clean up code
+ * Sven Luther :
+ - Preparing upload built with ocaml 3.08.3.
+ - Taking over maintainership of this package, since Eric is not a DD.
+ - Tested on my home setup since the past three weeks.
+
+ -- Eric Cooper <ecc at cmu.edu> Sat, 12 Mar 2005 17:27:43 -0500
+
+approx (1.06) unstable; urgency=low
+
+ * Use native syslog client instead of piping output to logger
+ * Use open_process_in and gzip instead of camlzip to uncompress
+ package files in gc_approx
+ * gc_approx removes garbage files unless --keep option is specified
+ * APPROX_CONF environment variable no longer used;
+ pathname is now hard-coded in default_config.ml
+ * Write /var/run/approx.pid for use by init script
+
+ -- Eric Cooper <ecc at cmu.edu> Thu, 24 Feb 2005 13:36:26 -0500
+
+approx (1.05) unstable; urgency=low
+
+ * Use proper content type and encoding when relaying *.gz files
+ * Log client IP address
+ * Install into /usr/sbin
+ * Add init.d and cron scripts
+ * Double fork to detach daemon
+ * Use distribution names from the config file as roots for GC,
+ to detect remote repositories no longer in use
+
+ -- Eric Cooper <ecc at cmu.edu> Wed, 23 Feb 2005 23:59:35 -0500
+
+approx (1.04) unstable; urgency=low
+
+ * Add build-dependency on the version of ocamlnet
+ which fixes a problem with '+' characters in URLs
+ * Append ".tmp" to download in progress and rename it when complete,
+ to avoid invalid files in the cache if the daemon is interrupted
+
+ -- Eric Cooper <ecc at cmu.edu> Sun, 6 Feb 2005 17:20:18 -0500
+
+approx (1.03) unstable; urgency=low
+
+ * Cleanup libcurl connection after each transfer
+
+ -- Eric Cooper <ecc at cmu.edu> Fri, 4 Feb 2005 09:05:00 -0500
+
+approx (1.02) unstable; urgency=low
+
+ * Use libcurl-ocaml instead of my own wrapper
+
+ -- Eric Cooper <ecc at cmu.edu> Thu, 3 Feb 2005 21:42:36 -0500
+
+approx (1.01) unstable; urgency=low
+
+ * Don't garbage collect only .deb files;
+ consider everything except Packages, Release, and Sources files
+
+ -- Eric Cooper <ecc at cmu.edu> Tue, 1 Feb 2005 15:52:02 -0500
+
+approx (1.00) unstable; urgency=low
+
+ * Initial release
+
+ -- Eric Cooper <ecc at cmu.edu> Sun, 23 Jan 2005 14:05:29 -0500
diff --combined debian/control
index 911645d,0000000..cb8a0f8
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,36 -1,0 +1,36 @@@
+Source: approx
+Section: admin
+Priority: optional
+Maintainer: Eric Cooper <ecc at cmu.edu>
+Uploaders: Sylvain Le Gall <gildor at debian.org>, Ralf Treinen <treinen at debian.org>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 6.0), cdbs, ocaml-nox (>= 3.10), ocaml-best-compilers, libnethttpd-ocaml-dev (>= 2.2.8), libpcre-ocaml-dev (>= 5.11), libsha-ocaml-dev (>= 1.3), libsyslog-ocaml-dev (>= 1.3), libwrap0-dev
- Standards-Version: 3.7.3
- Homepage: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/projects/approx
- Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/projects/approx/trunk
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/projects/approx/trunk/
++Standards-Version: 3.8.0
++Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/approx.git
++Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/approx.git
++Homepage: http://git.debian.org/?p=pkg-ocaml-maint/packages/approx.git
+
+Package: approx
+Architecture: any
+Depends: ${shlibs:Depends}, ${F:OCamlRun}, lsb-base (>= 3.1), adduser, bzip2, curl
+Description: caching proxy server for Debian archive files
+ Approx is an HTTP-based Debian archive server.
+ It fetches packages from remote repositories on demand,
+ and caches them for local use.
+ .
+ Approx saves time and network bandwidth if you need to install or
+ 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.
+ 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,
+ not in every client's /etc/apt/sources.list file.
+ .
+ Approx can be used as a replacement for apt-proxy,
+ with no need to modify clients' /etc/apt/sources.list files,
+ or as an alternative to apt-cacher.
+ .
+ Approx is intended to be robust, simple, and efficient.
+ It is written in OCaml (Objective Caml).
diff --combined debian/mkversion.pl
index b55fc0d,0000000..27f374e
mode 100755,000000..100644
--- a/debian/mkversion.pl
+++ b/debian/mkversion.pl
@@@ -1,31 -1,0 +1,31 @@@
+use strict;
- #!/usr/bin/perl -Tw
++use warnings;
+
+$ENV{PATH} = "/usr/bin";
+
+my $name = undef;
+my $number = undef;
+
+sub parse_changelog() {
+ open(CHANGELOG, "-|", "dpkg-parsechangelog") or exit 1;
+ while (<CHANGELOG>) {
+ $name = $1 if /^Source:\s+(\S+)/;
+ $number = $1 if /^Version:\s+(\S+)/;
+ }
+ close(CHANGELOG);
+ defined $name or die "$0: package name not found in changelog\n";
+ defined $number or die "$0: version number not found in changelog\n";
+}
+
+sub write_version() {
+ my $t = localtime;
+ print <<EOF;
- (* Automatically generated by $0 on $t *)
++(* Generated by $0 on $t *)
+
+let name = "$name"
+let number = "$number"
+EOF
+}
+
+parse_changelog();
+write_version();
diff --combined debian/rules
index 209643d,0000000..41a077d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,20 -1,0 +1,20 @@@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/class/ocaml.mk
+
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+ DEB_MAKE_BUILD_TARGET = TARGET=native
+ DEB_DH_GENCONTROL_ARGS += -VF:OCamlRun=""
+else
+ DEB_MAKE_BUILD_TARGET = TARGET=byte
+ DEB_DH_GENCONTROL_ARGS += -VF:OCamlRun="ocaml-base-nox-$(OCAML_ABI)"
+ DEB_STRIP_EXCLUDE += usr/sbin
+endif
+
+configure/approx::
- debian/mkversion > version.ml
++ /usr/bin/perl debian/mkversion.pl > version.ml
+
+clean::
+ rm -f version.ml
--
approx upstream and debian packaging
More information about the Pkg-ocaml-maint-commits
mailing list