diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-02-11 14:05:12 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-02-11 14:05:12 +0100 |
| commit | 99a5ac4da1f64b233c3f66f32593231ce3066757 (patch) | |
| tree | d61a0ee4e74fb72844a4bb2fb56cd6f09703181b | |
| parent | 27dcb3155d74e5f66c86e18aa008ded8b2dd1367 (diff) | |
* share/apt-auth-failure.note:
- show update-notifier note if the nightly update fails with a
authentication failure (apt-authentication-reliability spec)
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | share/apt-auth-failure.note | 11 | ||||
| -rw-r--r-- | share/makefile | 12 |
5 files changed, 33 insertions, 0 deletions
@@ -15,6 +15,7 @@ all headers library clean veryclean binary program doc dirs: $(MAKE) -C apt-inst $@ $(MAKE) -C methods $@ $(MAKE) -C cmdline $@ + $(MAKE) -C share $@ $(MAKE) -C ftparchive $@ $(MAKE) -C dselect $@ $(MAKE) -C doc $@ diff --git a/debian/changelog b/debian/changelog index f1c694de2..cbe97d1cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.9ubuntu8) hardy; urgency=low + + * share/apt-auth-failure.note: + - show update-notifier note if the nightly update fails with a + authentication failure (apt-authentication-reliability spec) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 14:04:56 +0100 + apt (0.7.9ubuntu7) hardy; urgency=low * methods/connect.cc: diff --git a/debian/rules b/debian/rules index 7bf99f9ef..4f6d72e06 100755 --- a/debian/rules +++ b/debian/rules @@ -214,6 +214,7 @@ apt: build debian/shlibs.local cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu # head -n 500 ChangeLog > debian/ChangeLog diff --git a/share/apt-auth-failure.note b/share/apt-auth-failure.note new file mode 100644 index 000000000..3e8a9e71d --- /dev/null +++ b/share/apt-auth-failure.note @@ -0,0 +1,11 @@ +_Name: Apt Authentication issue +Priority: High +Terminal: False +Command: gksu -- synaptic --non-interactive --update-at-startup --hide-main-window +GettextDomain: apt +_Description: Problem during package list update. + The package list update failed with a authentication failure. + This usually happens behind a network proxy server. Please try + to click on the "Run this action now" button to correct the problem or + update the list manually by running Update Manager and clicking + on "Check". diff --git a/share/makefile b/share/makefile new file mode 100644 index 000000000..e35376d98 --- /dev/null +++ b/share/makefile @@ -0,0 +1,12 @@ + +BASE=.. +SUBDIR=share + +# Bring in the default rules +include ../buildlib/defaults.mak + +binary: apt-auth-failure.note.h + +apt-auth-failure.note.h: apt-auth-failure.note + intltool-extract -t gettext/rfc822deb apt-auth-failure.note + echo "share/apt-auth-failure.note.h" >> $(BUILD)/po/domains/apt/apt-auth-failure.note.srclist |