From 66cc4d16bf220e7040d231372033a0db274d06bd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Fri, 2 Dec 2016 16:15:01 -0300
Subject: debootstrap-1.0.87-1.parabola2: add gNewSense 4, codenamed Ucclia

---
 libre/debootstrap/PKGBUILD  |  5 +++--
 libre/debootstrap/gnewsense | 13 +++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/libre/debootstrap/PKGBUILD b/libre/debootstrap/PKGBUILD
index d166dc5d2..43a5cb95e 100644
--- a/libre/debootstrap/PKGBUILD
+++ b/libre/debootstrap/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=debootstrap
 pkgver=1.0.87
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 pkgdesc="Bootstrap a basic gNewSense and Trisquel system, without Debian support"
 arch=('any')
 license=('GPL')
@@ -22,7 +22,7 @@ optdepends=('gnupg: check release signatures')
 md5sums=('SKIP'
          'af21c8c6e073dbedcd472d876f5a50c2'
          '654761198068b51b027d47cba4b7cfa2'
-         '13978bdd1d877a0dd2c3c874ecd54f03'
+         '600ffc24fdbed8659c993d21389c047d'
          'b020aa8426e70a6024c8e76312c17d78')
 
 prepare() {
@@ -55,6 +55,7 @@ prepare() {
   cd scripts
 
   # Create gNewSense symlinks
+  ln -s gnewsense ucclia
   ln -s gnewsense parkes
 
   # Create Trisquel symlinks
diff --git a/libre/debootstrap/gnewsense b/libre/debootstrap/gnewsense
index 884ac88a0..77805f3fb 100644
--- a/libre/debootstrap/gnewsense
+++ b/libre/debootstrap/gnewsense
@@ -1,4 +1,4 @@
-default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense
+default_mirror http://archive.gnewsense.org/gnewsense
 mirror_style release
 download_style apt
 finddebs_style from-indices
@@ -23,7 +23,7 @@ work_out_debs () {
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -47,12 +47,6 @@ first_stage_install () {
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -63,6 +57,7 @@ first_stage_install () {
 		echo \
 "Package: $pkg
 Version: $ver
+Maintainer: unknown
 Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
 
 		touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
@@ -72,6 +67,8 @@ Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
-- 
cgit v1.2.3