diff -Nru /tmp/1Egjn8R2hV/apt-proxy-1.9.33/debian/changelog /tmp/j3Foxziqj3/apt-proxy-1.9.33ubuntu1/debian/changelog --- /tmp/1Egjn8R2hV/apt-proxy-1.9.33/debian/changelog 2006-01-26 06:09:10.000000000 -0600 +++ /tmp/j3Foxziqj3/apt-proxy-1.9.33ubuntu1/debian/changelog 2006-03-05 15:08:30.000000000 -0600 @@ -1,3 +1,18 @@ +apt-proxy (1.9.33ubuntu1) dapper; urgency=low + + * Resynchronize with Debian. + - UVF exception granted by Reinhard Tartler. + https://lists.ubuntu.com/archives/ubuntu-motu/2006-February/000546.html + - Work correctly with python-twisted (>= 2.1.0). (Ubuntu #29267) + * Add a missing comma in the Depends line in debian/control. + (Debian #353386) + * Ubuntu specific changes: + - doc/apt-proxy.conf: Set min_refresh=1s. + - debian/init.d: Use LSB init-functions. + - debian/install: Install into python2.4 dirs instead of python2.3. + + -- Ming Hua Sun, 5 Mar 2006 15:01:56 -0600 + apt-proxy (1.9.33) unstable; urgency=low [ Chris Halls ] @@ -15,6 +30,28 @@ -- Chris Halls Thu, 26 Jan 2006 11:59:56 +0000 +apt-proxy (1.9.32ubuntu2) dapper; urgency=low + + * Add our changes back to the package: + * doc/apt-proxy.conf: set min_refresh=1s to avoid a situation that the + Release{.gpg} file is not in sync and apt-proxy don't refresh that file + for 1h + * debian/init.d: + - Use LSB init-functions. + * debian/install: + - Install into python2.4 dirs instead of python2.3. + + -- Christian Bjälevik Thu, 10 Nov 2005 09:08:45 +0100 + +apt-proxy (1.9.32ubuntu1) dapper; urgency=low + + * Resynchronize with Debian + * Threw away ubuntu changes (all of them are in new Debian upstream) + * debian/control: updated build-deps and deps to match python2.4 + * Merged changelog to show our releases + + -- Stephan Hermann Wed, 9 Nov 2005 23:51:11 +0100 + apt-proxy (1.9.32) unstable; urgency=low [ Chris Halls ] @@ -51,6 +88,36 @@ -- Otavio Salvador Fri, 19 Aug 2005 14:22:25 -0300 +apt-proxy (1.9.31ubuntu3) breezy; urgency=low + + * debian/init.d: + - Use LSB init-functions. + * debian/control: + - Bump Standards-Version to 3.6.2. + - Add missing depends on adduser and netbase. + * debian/changelog: + - Converted the changelog to UTF-8. + + -- Christian Bjälevik Mon, 5 Sep 2005 04:19:25 +0200 + +apt-proxy (1.9.31ubuntu2) breezy; urgency=low + + * apt_proxy/apt_proxy.py: + applied a patch from svn to add file backends to the apt-proxy code + (this will be part of the next release but we want to use it now for + the NetworkWideUpdates code) + * doc/apt-proxy.conf: set min_refresh=1s to avoid a situation that the + Release{.gpg} file is not in sync and apt-proxy don't refresh that file + for 1h + + -- Michael Vogt Wed, 6 Jul 2005 10:44:30 +0200 + +apt-proxy (1.9.31ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Michael Vogt Fri, 17 Jun 2005 16:51:37 +0200 + apt-proxy (1.9.31) unstable; urgency=low * Merged back changes from 1.9.29 that were reverted for sarge release @@ -98,6 +165,12 @@ -- Otavio Salvador Mon, 16 May 2005 01:29:14 -0300 +apt-proxy (1.9.28ubuntu1) hoary; urgency=low + + * Merge changes from Debian + + -- Chris Halls Tue, 29 Mar 2005 12:26:53 +0100 + apt-proxy (1.9.28) unstable; urgency=low * Fix exception in dynamic backends. Closes: #296513 @@ -132,6 +205,12 @@ -- Chris Halls Tue, 22 Feb 2005 23:52:09 +0000 +apt-proxy (1.9.25ubuntu1) unstable; urgency=low + + * Merge changes from Debian + + -- Chris Halls Fri, 28 Jan 2005 11:32:14 +0000 + apt-proxy (1.9.25) unstable; urgency=low * Postpone database creating to first request. Closes: #288829. (Otavio) @@ -147,6 +226,21 @@ -- Chris Halls Fri, 28 Jan 2005 10:26:49 +0000 +apt-proxy (1.9.24.ubuntu2) hoary; urgency=low + + * Tighten Depends on python twisted, because earlier versions of the + package did not inclue non-versioned binary. + + -- Chris Halls Wed, 26 Jan 2005 15:07:15 +0000 + +apt-proxy (1.9.24.ubuntu1) hoary; urgency=low + + * Rebuild on Ubuntu + * Add ubuntu archives to example apt-proxy.conf + * Change twistd2.3 to twistd + + -- Chris Halls Mon, 24 Jan 2005 15:00:10 +0000 + apt-proxy (1.9.24) unstable; urgency=low * Fix module import. diff -Nru /tmp/1Egjn8R2hV/apt-proxy-1.9.33/debian/control /tmp/j3Foxziqj3/apt-proxy-1.9.33ubuntu1/debian/control --- /tmp/1Egjn8R2hV/apt-proxy-1.9.33/debian/control 2006-01-26 06:09:10.000000000 -0600 +++ /tmp/j3Foxziqj3/apt-proxy-1.9.33ubuntu1/debian/control 2006-02-16 23:43:18.000000000 -0600 @@ -8,7 +8,7 @@ Package: apt-proxy Architecture: all -Depends: debconf (>= 0.5.00) | debconf-2.0, ${python:Depends}, python-twisted (>= 1.3.0-7) | python2.3 (<< 2.3.5-1), python-twisted (>= 1.0.0), python-twisted-web | python-twisted (<< 2.1.0) python-apt (>= 0.5.8), python-bsddb3, bzip2, logrotate, adduser +Depends: debconf (>= 0.5.00) | debconf-2.0, ${python:Depends}, python-twisted (>= 1.3.0-7) | python2.3 (<< 2.3.5-1), python-twisted (>= 1.0.0), python-twisted-web | python-twisted (<< 2.1.0), python-apt (>= 0.5.8), python-bsddb3, bzip2, logrotate, adduser Conflicts: apt-proxy-v2 (<= 1.9.5) Replaces: apt-proxy-v2 (<= 1.9.5) Suggests: rsync diff -Nru /tmp/1Egjn8R2hV/apt-proxy-1.9.33/debian/init.d /tmp/j3Foxziqj3/apt-proxy-1.9.33ubuntu1/debian/init.d --- /tmp/1Egjn8R2hV/apt-proxy-1.9.33/debian/init.d 2005-02-25 06:13:22.000000000 -0600 +++ /tmp/j3Foxziqj3/apt-proxy-1.9.33ubuntu1/debian/init.d 2006-02-16 16:14:58.000000000 -0600 @@ -10,6 +10,8 @@ user=aptproxy group=nogroup +. /lib/lsb/init-functions + [ -r /etc/default/apt-proxy ] && . /etc/default/apt-proxy test -x $twistd || exit 0 @@ -33,7 +35,7 @@ case "$1" in start) - echo -n "Starting apt-proxy" + log_daemon_msg "Starting apt-proxy" [ ! -d $rundir ] && mkdir $rundir [ ! -f $logfile ] && touch $logfile chown $user $rundir $logfile @@ -43,11 +45,11 @@ start-stop-daemon --start --quiet --exec $twistd -- \ --pidfile=$pidfile --rundir=$rundir --python=$application \ --logfile=$logfile --no_save - echo "." + log_end_msg $? ;; stop) - echo -n "Stopping apt-proxy" + log_daemon_msg "Stopping apt-proxy" start-stop-daemon --stop --quiet --pidfile $pidfile # # Continue stopping until daemon finished or time over @@ -70,7 +72,7 @@ if [ $count -gt 1 ]; then echo -n "]" fi - echo "." + log_end_msg $? ;; restart) @@ -83,7 +85,7 @@ ;; *) - echo "Usage: /etc/init.d/apt-proxy {start|stop|restart|force-reload}" >&2 + log_success_msg "Usage: /etc/init.d/apt-proxy {start|stop|restart|force-reload}" exit 1 ;; esac diff -Nru /tmp/1Egjn8R2hV/apt-proxy-1.9.33/debian/install /tmp/j3Foxziqj3/apt-proxy-1.9.33ubuntu1/debian/install --- /tmp/1Egjn8R2hV/apt-proxy-1.9.33/debian/install 2005-08-18 10:12:35.000000000 -0500 +++ /tmp/j3Foxziqj3/apt-proxy-1.9.33ubuntu1/debian/install 2006-02-16 16:14:58.000000000 -0600 @@ -2,6 +2,6 @@ bin/apt-proxy usr/sbin bin/apt-proxy-import usr/sbin bin/apt-proxy-v1tov2 usr/sbin -apt_proxy/*.py usr/lib/python2.3/site-packages/apt_proxy -apt_proxy/twisted_compat/*.py usr/lib/python2.3/site-packages/apt_proxy/twisted_compat -debian/lintian-overrides usr/share/lintian/overrides/apt-proxy/ \ No newline at end of file +apt_proxy/*.py usr/lib/python2.4/site-packages/apt_proxy +apt_proxy/twisted_compat/*.py usr/lib/python2.4/site-packages/apt_proxy/twisted_compat +debian/lintian-overrides usr/share/lintian/overrides/apt-proxy/ diff -Nru /tmp/1Egjn8R2hV/apt-proxy-1.9.33/doc/apt-proxy.conf /tmp/j3Foxziqj3/apt-proxy-1.9.33ubuntu1/doc/apt-proxy.conf --- /tmp/1Egjn8R2hV/apt-proxy-1.9.33/doc/apt-proxy.conf 2005-01-28 04:24:02.000000000 -0600 +++ /tmp/j3Foxziqj3/apt-proxy-1.9.33ubuntu1/doc/apt-proxy.conf 2006-02-16 16:14:58.000000000 -0600 @@ -11,7 +11,7 @@ ;; Control files (Packages/Sources/Contents) refresh rate ;; ;; Minimum time between attempts to refresh a file -min_refresh_delay = 1h +min_refresh_delay = 1s ;; Minimum age of a file before attempting an update (NOT YET IMPLEMENTED) ;min_age = 23h