From 845db5330d0aba3b7979a28af40df4607f889b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Tue, 18 Mar 2014 20:26:42 +0100
Subject: [PATCH] Fixed compilation errors in update-manager and
software-properties
---
helpers/make-software-properties | 12 ++++++------
helpers/make-update-manager | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/helpers/make-software-properties b/helpers/make-software-properties
index 5208d01de..11b8c71b6 100644
--- a/helpers/make-software-properties
+++ b/helpers/make-software-properties
@@ -23,21 +23,21 @@ VERSION=3
. ./config
cat << EOF | patch -p1
---- software-properties-0.76.7/softwareproperties/SoftwareProperties.py 2010-09-20 13:52:10.000000000 +0100
-+++ software-properties-0.76.7-2/softwareproperties/SoftwareProperties.py 2011-04-17 02:49:49.000000000 +0100
-@@ -644,7 +644,14 @@
+--- software-properties-0.82.7.7.orig/softwareproperties/SoftwareProperties.py 2013-12-06 23:44:01.000000000 +0000
++++ software-properties-0.82.7.7/softwareproperties/SoftwareProperties.py 2014-03-18 03:45:07.000000000 +0000
+@@ -694,7 +694,14 @@
Add a source with the given apt line and auto-add
signing key if we have it in the whitelist
"""
-- (deb_line, file) = expand_ppa_line(line.strip(), self.distro.codename)
+- (deb_line, file) = expand_shortcut_line(line.strip(), self.distro.codename)
+ codenames = {}
+ codenames["toutatis"] = "precise"
+ codenames["brigantia"] = "oneiric"
+ codenames["dagda"] = "natty"
+ codenames["slaine"] = "maverick"
+ codenames["taranis"] = "lucid"
-+ codenames["awen"] = "karmic"
-+ (deb_line, file) = expand_ppa_line(line.strip(), codenames[self.distro.codename])
++ codenames["awen"] = "karmic"
++ (deb_line, file) = expand_shortcut_line(line.strip(), codenames[self.distro.codename])
deb_line = self.expand_http_line(deb_line)
debsrc_line = 'deb-src' + deb_line[3:]
new_deb_entry = SourceEntry(deb_line, file)
diff --git a/helpers/make-update-manager b/helpers/make-update-manager
index 4e9fc9343..b702e10a6 100644
--- a/helpers/make-update-manager
+++ b/helpers/make-update-manager
@@ -300,6 +300,6 @@ replace Trisquel-Gettext Ubuntu-Gettext . -R
changelog "Compiled for Trisquel"
-compile
+PARALLEL=false compile
cp ../dist-upgrader* /root
--
GitLab