summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2005-02-05 06:49:51 +0000
committerChristian Perrier <bubulle@debian.org>2005-02-05 06:49:51 +0000
commit1b5a62221cc034658354692be6ba4dfb7ef152e7 (patch)
treed924467becc6bddbe453bd945e7e36385f0828df /debian
parenta40d89ae66e8b0c519cc8495982d9c1d1b0539dd (diff)
parent8a57929175a93466c83a8e697ad876b60b2eb3c2 (diff)
Merge with Matt and update French translation
Patches applied: * apt@packages.debian.org/apt--main--0--patch-49 Merge michael.vogt@canonical.com--2004/apt--status-fd--0 * apt@packages.debian.org/apt--main--0--patch-50 Increment libapt-pkg version * apt@packages.debian.org/apt--main--0--patch-51 0.6.30 * apt@packages.debian.org/apt--main--0--patch-52 0.6.31 * apt@packages.debian.org/apt--main--0--patch-53 Remove debugging from apt.cron.daily * apt@packages.debian.org/apt--main--0--patch-54 allow SHA1Summation to process a file descriptor until EOF * apt@packages.debian.org/apt--main--0--patch-55 Fix syntax in sha1.cc * apt@packages.debian.org/apt--main--0--patch-56 Fix build/install of Polish offline documentation * apt@packages.debian.org/apt--main--0--patch-57 Move CD-ROM handling backend into libapt-pkg * apt@packages.debian.org/apt--main--0--patch-58 Fix compilation errors from apt--auth-cdrom--0 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-32 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-1 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-2 * changed version of the library * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-3 * merged with matt again * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4 * merged with apt--main--0 and fixed permissions in po/ * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-1 tag of michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-2 * merged with matt's tree * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-3 * removed a stupid "<<<" merge in the changelog * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-4 * star-merged with apt@packages.debian.org/apt--main--0 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-5 * removed the "pre-fork/post-fork" change and put it into it's own branch, star-merged with matt so that it applies cleanly * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-6 * cleaned a incorrect log-file merge * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-7 * removed a conflict in =tagging-method * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-8 * cleaned up the delta so that it no longer contains unreleated whitespace changes * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-51 * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-1 * added support for signed cdroms * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-2 * merged with apt--main, seperated cmdline/apt-cdrom.cc into a library (apt-pkg/cdrom.{cc,h}) * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-3 * cleaned up the cmdline/apt-cdrom.cc code
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.cron.daily1
-rw-r--r--debian/changelog22
-rwxr-xr-xdebian/rules2
3 files changed, 21 insertions, 4 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 17fe8fb78..3e6b384d2 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -20,7 +20,6 @@ check_stamp()
stamp=$(date --date=$(date -r $stamp --iso-8601) +%s)
now=$(date --date=$(date --iso-8601) +%s)
delta=$(($now-$stamp))
- echo "stamp=$stamp, now=$now, delta=$delta"
if [ $delta -ge $interval ]; then
return 0
diff --git a/debian/changelog b/debian/changelog
index d0dae01d2..c384c399d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,26 @@
+apt (0.6.31) hoary; urgency=low
+
+ * Matt Zimmerman
+ - Remove debugging output from apt.cron.daily (no one noticed?)
+ - Apply patch from Anthony Towns to allow SHA1Summation to process a file
+ descriptor until EOF, rather than requiring that the length of input be
+ specified (Closes: #291338)
+ - Fix build/install of Polish offline documentation, based on patch from
+ Christian Perrier (Closes: #270404)
+ * Michael Vogt
+ - apt-cdrom.cc seperated into frontend (cmdline/apt-cdrom.cc and library
+ apt-pkg/cdrom.{cc,h}) (Ubuntu #5668)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Fri, 4 Feb 2005 10:23:01 -0800
+
apt (0.6.30) unstable; urgency=low
* Add ppc64 to buildlib/archtable
-
- --
+ * Merge michael.vogt@canonical.com--2004/apt--status-fd--0
+ - Support preserving dpkg status file descriptor, to support
+ better integration with synaptic
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 19 Jan 2005 00:26:01 -0800
apt (0.6.29) hoary; urgency=low
diff --git a/debian/rules b/debian/rules
index b756b3b32..e3254c2d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -171,7 +171,7 @@ apt-doc: build-doc
#
# Copy the guides
dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \
- $(BLD)/docs/offline.text $(BLD)/docs/offline.html
+ $(BLD)/docs/offline*.text $(BLD)/docs/offline*.html
dh_installchangelogs -p$@
dh_compress -p$@
dh_fixperms -p$@