From 48faa53d7b9d978cf9cda7b93cb3b14d56412c47 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 11 Aug 2015 11:51:00 +0200 Subject: [PATCH] merge lp:~sil2100/livecd-rootfs/deb-src_for_extra_ppas to include deb-src lines for extra ppa sources.list entries --- debian/changelog | 8 ++++++++ live-build/auto/config | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fd9736e5..9d9f577b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.337) UNRELEASED; urgency=medium + + * merge lp:~sil2100/livecd-rootfs/deb-src_for_extra_ppas, + In case of extra PPAs also include the deb-src entry in the sources list. + (LP: #1482703) + + -- Oliver Grawert Tue, 11 Aug 2015 11:48:54 +0200 + livecd-rootfs (2.336) wily; urgency=medium * make apparmor precompilation more verbose, list the dir contents of diff --git a/live-build/auto/config b/live-build/auto/config index 1c9cc697..1f569376 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -690,7 +690,12 @@ if [ "$EXTRA_PPAS" ]; then ;; esac extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")" - echo "deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main" >> config/archives/extra-ppas.list.chroot + + cat >> config/archives/extra-ppas.list.chroot <> config/archives/extra-ppas.pref.chroot