* share/apt-auth-failure.note:

  - show update-notifier note if the nightly update fails with a
    authentication failure (apt-authentication-reliability spec)

diff --git a/Makefile b/Makefile
index 664caca41f2d9d67a63f1aeb4f170b9b3c00f4b5..8e3ed7e3c7055414886558e6645666e87c39e936 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 f1c694de298a8a1ec2be679e37908d8b1aaef361..cbe97d1cd44edada9b97b777feb3a9f457c71c5a 100644 (file)
--- 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 7bf99f9ef84b3f5bd7d59ddafe9aeead7d04bdc9..4f6d72e062fa935424357fd920c4bfa906d9ac1d 100755 (executable)
--- 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 (file)
index 0000000..3e8a9e7
--- /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 (file)
index 0000000..e35376d
--- /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