From 5834c9159ee2bcc18eca7c68c27d15a096c86e71 Mon Sep 17 00:00:00 2001
From: "R. Steve McKown" <rsmckown@gmail.com>
Date: Thu, 3 Dec 2009 13:56:51 -0700
Subject: [PATCH] No longer need dpatch patches.

---
 patches/001_tinyos-sh.dpatch | 55 ------------------------------------
 patches/002_distfiles.dpatch | 37 ------------------------
 patches/00list               |  2 --
 3 files changed, 94 deletions(-)
 delete mode 100755 patches/001_tinyos-sh.dpatch
 delete mode 100644 patches/002_distfiles.dpatch
 delete mode 100644 patches/00list

diff --git a/patches/001_tinyos-sh.dpatch b/patches/001_tinyos-sh.dpatch
deleted file mode 100755
index 2f5e73c0..00000000
--- a/patches/001_tinyos-sh.dpatch
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001_tinyos-sh.dpatch by  <rsmckown@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Sourced file that sets up TinyOS environment, with per-user persistence
-
-@DPATCH@
-
-diff -urN tinyos-2.1.0.orig/tinyos.sh tinyos-2.1.0/tinyos.sh
---- tinyos-2.1.0.orig/tinyos.sh	1969-12-31 17:00:00.000000000 -0700
-+++ tinyos-2.1.0/tinyos.sh	2008-08-27 13:28:48.000000000 -0600
-@@ -0,0 +1,43 @@
-+#! /usr/bin/env bash
-+# Here we setup the environment
-+# variables needed by the tinyos 
-+# make system
-+
-+TOSBASE=/opt/tinyos
-+
-+# $1 is a directory or tos version number
-+# returns a fully rooted and valid TOSROOT
-+getdir()
-+{
-+    if [ -d "$1" -a -d "$1/tos" ]; then
-+	echo "$1"
-+    elif [ -d "$TOSBASE/$1" -a -d "$TOSBASE/$1/tos" ]; then
-+	echo "$TOSBASE/$1"
-+    fi
-+}
-+
-+# Clear TOS environment
-+if [ -n "$TOSROOT" ]; then
-+    CLASSPATH=$(echo $CLASSPATH | sed -e "s|:$TOSROOT/support/sdk/java||")
-+fi
-+unset TOSDIR MAKERULES
-+
-+# Set TOS environment
-+TOSROOT=$(getdir "$1")
-+if [ -z "$TOSROOT" ]; then
-+    TOSROOT=$(cat ~/.tosrc 2>/dev/null)
-+fi
-+
-+if [ -z "$TOSROOT" ]; then
-+    echo "No TinyOS source directory found.  Usage:" >&2
-+    echo "source /opt/tinyos/tinyos.sh [<version> | <directory>]" >&2
-+    export TOSROOT TOSDIR MAKERULES
-+else
-+    echo "Setting up for TinyOS source in $TOSROOT"
-+    echo "$TOSROOT" > ~/.tosrc
-+    TOSDIR="$TOSROOT/tos"
-+    CLASSPATH=$CLASSPATH:$TOSROOT/support/sdk/java
-+    MAKERULES="$TOSROOT/support/make/Makerules"
-+    export TOSROOT TOSDIR CLASSPATH MAKERULES
-+fi
-+unset TOSBASE tmp
diff --git a/patches/002_distfiles.dpatch b/patches/002_distfiles.dpatch
deleted file mode 100644
index b5edfa76..00000000
--- a/patches/002_distfiles.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 003_distfiles.dpatch by  <rsmckown@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch tinyos.files to exclude debian build related files
-
-@DPATCH@
-
---- tinyos-2.1.0/tools/release/tinyos.files	2008-09-02 08:26:42.000000000 -0600
-+++ tinyos-2.1.0/tools/tinyos.files	2008-09-02 08:18:52.000000000 -0600
-@@ -4,6 +4,11 @@
- cd ../..
- rm -rf $NAME-$VERSION
- tools/release/extractor $NAME-$VERSION <<'EOF' | gzip >../$NAME-$VERSION.tar.gz
-+!^./tinyos.sh
-+!^./tos.mk
-+!^./debian
-+!^./builddir
-+!^./(patch|configure|build|install)-stamp
- !^./apps/tests/(eyesIFX|mica2|msp430|rf230|mts300|telosb)
- !^./apps/tests/(RadioStress|TestAlarm|TestAM|TestAMOnOff|TestAMService|TestBroadcast|TestCollection|TestLocalTime|TestMultihopLqi|TestOscilloscopeLQI|TestPowerManager|TestPowerup|TestPrintf|TestRadioPM|TestScheduler|TestSerialBandwidth|TestSharedResource|TestSimTimers|TestSleep|TestTimerSync|TestTreeRouting|TestTrickleTimer|TestTymo)
- !^/apps/(BlinkAlarm|BlinkMSP430|BlinkTask|BlinkToRadio|Test|TestADC|TestArbiter|TestCC2420|TestRadio|TestSPI|TestScheduler|TestSchedulerTemp|TestSerial)
-@@ -27,6 +31,9 @@
- !/.cvsignore
- !/CVS/
- !/CVS$
-+!/.svn/
-+!/.svn$
-+!^./.git
- !~$
- !/build/
- !/build$
-@@ -45,4 +49,3 @@
- ./tests/TestSerial/TestSerial.class
- ./RadioCountToLeds/RadioCountMsg.class
- EOF
--rm -rf $NAME-$VERSION
diff --git a/patches/00list b/patches/00list
deleted file mode 100644
index afd1311c..00000000
--- a/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-001_tinyos-sh.dpatch
-002_distfiles.dpatch
-- 
2.39.2