diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-08 22:38:27 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-08 22:38:27 +0000 |
| commit | dc2cd7d5c4889a6cc09b5a5a9eb35c74f86c2712 (patch) | |
| tree | fb68b5f06efb992d9bb537b61e8ffae7d678ef2b /debian/patches/01_ubuntu_archive_key.dpatch | |
| parent | 7ef96224b8f697b74089ab8f47688f28e5025b42 (diff) | |
* removed the lsb_release build patch (nobody except me seems to like it)
Diffstat (limited to 'debian/patches/01_ubuntu_archive_key.dpatch')
| -rwxr-xr-x | debian/patches/01_ubuntu_archive_key.dpatch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/debian/patches/01_ubuntu_archive_key.dpatch b/debian/patches/01_ubuntu_archive_key.dpatch deleted file mode 100755 index 4eb5bbccd..000000000 --- a/debian/patches/01_ubuntu_archive_key.dpatch +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_ubuntu_archive_key.dpatch by <egon@localhost.localdomain> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: use the ubuntu archive key (instead of the debian one) - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./cmdline/apt-key /tmp/dpep-work.o4yrSO/apt--mvo/cmdline/apt-key ---- ./cmdline/apt-key 2005-06-26 22:41:36.000000000 +0200 -+++ /tmp/dpep-work.o4yrSO/apt--mvo/cmdline/apt-key 2005-08-01 17:59:56.000000000 +0200 -@@ -9,14 +9,14 @@ - GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" - - --ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg --REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg -+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg -+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg - - - update() { - if [ ! -f $ARCHIVE_KEYRING ]; then - echo >&2 "ERROR: Can't find the archive-keyring" -- echo >&2 "Is the debian-keyring package installed?" -+ echo >&2 "Is the ubuntu-keyring package installed?" - exit 1 - fi - -diff -urNad --exclude=CVS --exclude=.svn ./debian/apt.postinst /tmp/dpep-work.o4yrSO/apt--mvo/debian/apt.postinst ---- ./debian/apt.postinst 2005-06-26 22:41:36.000000000 +0200 -+++ /tmp/dpep-work.o4yrSO/apt--mvo/debian/apt.postinst 2005-08-01 18:00:23.000000000 +0200 -@@ -17,7 +17,7 @@ - configure) - - if ! test -f /etc/apt/trusted.gpg; then -- cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg -+ cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg - fi - - ;; |