From e9b902d45362affb7fecdecf3774b5e87d42132f Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 2 May 2013 20:26:33 +0200 Subject: [PATCH] drop super-friends and ubuntu-sdk PPAs from touch builds --- debian/changelog | 8 ++++++++ .../archives/super-friends-ppa.key.chroot | 13 ------------- .../archives/super-friends-ppa.list.chroot | 2 -- .../archives/ubuntu-sdk-team-ppa.key.chroot | 13 ------------- .../archives/ubuntu-sdk-team-ppa.list.chroot | 2 -- 5 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 live-build/ubuntu-touch/archives/super-friends-ppa.key.chroot delete mode 100644 live-build/ubuntu-touch/archives/super-friends-ppa.list.chroot delete mode 100644 live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.key.chroot delete mode 100644 live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.list.chroot diff --git a/debian/changelog b/debian/changelog index 4019d0b1..2f53606e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.126) UNRELEASED; urgency=low + + * drop the super-friends (sorry batman and robin ...) and ubuntu-sdk PPAs + from live-build config for ubuntu-touch, their packages should be in the + saucy archive already + + -- Oliver Grawert Thu, 02 May 2013 20:23:13 +0200 + livecd-rootfs (2.125) saucy; urgency=low * live-build/auto/config: Add basic ubuntu-touch enablement (based on diff --git a/live-build/ubuntu-touch/archives/super-friends-ppa.key.chroot b/live-build/ubuntu-touch/archives/super-friends-ppa.key.chroot deleted file mode 100644 index 9535043b..00000000 --- a/live-build/ubuntu-touch/archives/super-friends-ppa.key.chroot +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.4 -Comment: Hostname: keyserver.ubuntu.com - -mI0EUH8XrQEEALDyjXfN4zqPtDiEEdbAbOI0oGSbObbFJU5tgDlOBrVvPNRaNdl1LIu06pJ7 -PzJ+HItFiiaUtzPynv9BC7V7B3gIVaOs27nDqc4K1wHhA0Z2s+exsxKbRvkqPZ4cqIZeGDH0 -ysl0ab1QY+1zvvLP0o7WHPNObukskPVuEG46UHEZABEBAAG0H0xhdW5jaHBhZCBQUEEgZm9y -IFN1cGVyIEZyaWVuZHOIuAQTAQIAIgUCUH8XrQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC -F4AACgkQQL0bIXINpHkl/QP/bB66lkTCQj9oHaDmtGblbk8K95PPQHTzJnzywi4hcVNrvwvN -bKjCP6PBJrUregq7OWrG1WLtPmL31wo55CeWdt3jI0qZqw1DnKwSXbZiFOLCigfKGm52v7MA -YwUoCDbonTgG/T3gOA05EbkduVLOTd1jHw8nZfNkTz5uuL29GYo= -=a6Bh ------END PGP PUBLIC KEY BLOCK----- diff --git a/live-build/ubuntu-touch/archives/super-friends-ppa.list.chroot b/live-build/ubuntu-touch/archives/super-friends-ppa.list.chroot deleted file mode 100644 index bbf650a8..00000000 --- a/live-build/ubuntu-touch/archives/super-friends-ppa.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/super-friends/ppa/ubuntu @DISTRIBUTION@ main -# deb-src http://ppa.launchpad.net/super-friends/ppa/ubuntu @DISTRIBUTION@ main diff --git a/live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.key.chroot b/live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.key.chroot deleted file mode 100644 index b80e3a93..00000000 --- a/live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.key.chroot +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.4 -Comment: Hostname: keyserver.ubuntu.com - -mI0EUOxoDQEEALOxcA9MBALWvQKz8Wo7kcpSgMfIBzLI3RI4Q+FpeeAJr5iHfwMVn1v9vhCa -/ArUFBOcRIES4j/xmXt/DaFeZsyPZeFWKn1Z8IxUy/sdGqfmF0IUtsMap/Hp3jAFGcGUXKwP -Wt51IxMzgMIE808nbCNv+wAoyZXYAotTm0g3XPLPABEBAAG0IUxhdW5jaHBhZCBQUEEgZm9y -IFVidW50dSBTREsgdGVhbYi4BBMBAgAiBQJQ7GgNAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe -AQIXgAAKCRDxQbXwxxIvmzu5A/9BmZCUVSVGh5E1p5vHV4bEmuirJWN2GBJJ8tsg0MIiYSW8 -2Imm2lDmw7Am1HEc5ypKrtVuxHo5Q8bE/9NcYRWJhV0SlDkyJSt7W6RJAAdlKKQ610w4Kzi3 -sclZrZR3aCVCccMPCFwSgBUuYrR7OvQvYJdYRCygEDdg9qerHOo7ng== -=eVbG ------END PGP PUBLIC KEY BLOCK----- diff --git a/live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.list.chroot b/live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.list.chroot deleted file mode 100644 index 4d2af50c..00000000 --- a/live-build/ubuntu-touch/archives/ubuntu-sdk-team-ppa.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/ubuntu-sdk-team/ppa/ubuntu @DISTRIBUTION@ main -# deb-src http://ppa.launchpad.net/ubuntu-sdk-team/ppa/ubuntu @DISTRIBUTION@ main