[Trisquel-devel] [PATCH] Add package helper for tcltrf, fixes #11006

Legimet legimet.calc at gmail.com
Tue Jun 24 23:34:35 CEST 2014


The old package helper didn't work because the Utopic tcltrf package had a build
dependency on tcl-dev of at least version 8.6, not included in the Toutatis repos.
The package builds fine with Tcl 8.5, so this updated helper just removes the
version requirement of the build dependency.

I had to set LOCALDEPENDS to true to make that work, but the config script doesn't
parse the dependencies correctly, so I used a script in devscripts called
mk-build-deps which parses the build dependencies from a Debian control file and
creates a metapackage depending on them.

Legimet

---
 helpers/config      |    4 ++--
 helpers/make-tcltrf |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 helpers/make-tcltrf

diff --git a/helpers/config b/helpers/config
index 86d6047..b0bac7d 100755
--- a/helpers/config
+++ b/helpers/config
@@ -123,9 +123,9 @@ done
 compile(){
 if [ 1$LOCALDEPENDS = 1true ]
 then
-    DEPENDS=$(/bin/sed -n '/Build-Dep/,/^[a-zA-W0-9]/ p' debian/control | head -n -1 | /bin/sed 's/.*://; s/(.*)//; s/,//g' |xargs echo -n)
     echo Installing Build-Depends: $DEPENDS
-    apt-get --force-yes -y install $DEPENDS
+    apt-get install --force-yes -y equivs
+    mk-build-deps -i debian/control -t "apt-get --force-yes -y"
 fi
 
 PROCESSORS=1
diff --git a/helpers/make-tcltrf b/helpers/make-tcltrf
new file mode 100644
index 0000000..4b8aff4
--- /dev/null
+++ b/helpers/make-tcltrf
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+#    Copyright (C) 2014  Legimet <legimet.calc at gmail.com>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+EXTERNAL="deb-src http://archive.ubuntu.com/ubuntu utopic universe"
+LOCALDEPENDS=true
+
+. ./config
+
+# Remove version from tcl-dev build dependency, Tcl 8.6 isn't in the 6.0 repos
+sed -i 's/tcl-dev (.*)/tcl-dev/g' debian/control
+
+changelog "Backported from Utopic to remove/replace nonfree bits, fixes #11006"
+
+compile
+
-- 
1.7.9.5



More information about the Trisquel-devel mailing list