[Pkg-electronics-commits] [SCM] Packaging for gEDA branch, master, updated. debian/1.6.1-4-8-g40f6c66

أحمد المحمودي (Ahmed El-Mahmoudy) aelmahmoudy at sabily.org
Sat Jan 15 12:48:41 UTC 2011


The following commit has been merged in the master branch:
commit 6306d9cbf2a156e322b77a3160878b75a16b3234
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Sat Jan 15 14:23:04 2011 +0200

    Removed sch2eaglepos_bashism.diff patch, as it got applied upstream.

diff --git a/debian/patches/sch2eaglepos_bashism.diff b/debian/patches/sch2eaglepos_bashism.diff
deleted file mode 100644
index b1adcf2..0000000
--- a/debian/patches/sch2eaglepos_bashism.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Fix bashism in sch2eaglepos.sh
- Note that even with #!/bin/bash the original code gave the error that 3 is an
- invalid file descriptor
-Bug-Debian: http://bugs.debian.org/581098
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2999951&group_id=161080&atid=818428
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
---- a/gnetlist/scripts/sch2eaglepos.sh
-+++ b/gnetlist/scripts/sch2eaglepos.sh
-@@ -43,16 +43,16 @@
- tmpf=${tmpdir}/tmpf
- grep -B1 refdes= "$FNAME" |sed 's/=/ /' | cut -d" " -f2,3 |grep -v '^--' >${tmpf}
- 
--3<$tmpf
--while read -u 3; do
-+
-+while read rslt; do
-     # the directory on the client to backup
--    X=`echo $REPLY | cut -d' ' -f1`
--    Y=`echo $REPLY | cut -d' ' -f2`
--    read -u 3;
--    PART="$REPLY"
-+    X=`echo $rslt | cut -d' ' -f1`
-+    Y=`echo $rslt | cut -d' ' -f2`
-+    read rslt;
-+    PART="$rslt"
-     X=`echo "scale=5; ($X - $XOFFSET) / $XSCALE" |bc`
-     Y=`echo "scale=5; ($Y - $YOFFSET) / $YSCALE" |bc`
-     echo "MOVE '$PART' ($X $Y);"
--done
-+done < $tmpf
- rm -fr "${tmpdir}"
- 
diff --git a/debian/patches/series b/debian/patches/series
index 561c79a..a371367 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 desktop.diff
 manpage_typos.diff
-sch2eaglepos_bashism.diff
 fix_string_exceptions.diff

-- 
Packaging for gEDA



More information about the Pkg-electronics-commits mailing list