From 84de5b1894eaff944dbe125c12a600fe8c130916 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Tue, 17 Oct 2017 10:30:44 +0100
Subject: [PATCH 1/2] switch from svn to bzr for source, streamboard currently
 awol

---
 Dockerfile | 4 ++--
 README.md  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 851304a..798238a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 # install build packages
 RUN \
  apk add --no-cache --virtual=build-dependencies \
+	bzr \
 	curl \
 	gcc \
 	g++ \
@@ -17,7 +18,6 @@ RUN \
 	make \
 	libressl-dev \
 	pcsc-lite-dev \
-	subversion \
 	tar && \
 
 # install runtime packages
@@ -30,7 +30,7 @@ RUN \
 
 
 # compile oscam from source
- svn checkout http://www.streamboard.tv/svn/oscam/trunk /tmp/oscam-svn && \
+ bzr branch lp:oscam /tmp/oscam-svn && \
  cd /tmp/oscam-svn && \
  ./config.sh \
 	--enable all \
diff --git a/README.md b/README.md
index de3de9a..84add89 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,7 @@ The web interface is at port 8888.
 
 ## Versions
 
++ **17.10.2017:** Switch to using bzr for source code, streamboard awol.
 + **28.05.2017:** Rebase to alpine 3.6.
 + **09.02.2017:** Rebase to alpine 3.5.
 + **14.10.2016:** Add version layer information.

From 3c372e78361c518d699be8bfbef689b33bb8b14a Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Tue, 17 Oct 2017 10:40:31 +0100
Subject: [PATCH 2/2] switch from svn to bzr for source, streamboard currently
 awol

---
 Dockerfile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 798238a..151fcf2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,27 +28,26 @@ RUN \
 	pcsc-lite \
 	pcsc-lite-libs && \
 
-
 # compile oscam from source
  bzr branch lp:oscam /tmp/oscam-svn && \
  cd /tmp/oscam-svn && \
  ./config.sh \
 	--enable all \
 	--disable \
-		CARDREADER_DB2COM \
-		CARDREADER_INTERNAL \
-		CARDREADER_STINGER \
-		CARDREADER_STAPI \
-		CARDREADER_STAPI5 \
-		IPV6SUPPORT \
-		LCDSUPPORT \
-		LEDSUPPORT \
-		READ_SDT_CHARSETS && \
+	CARDREADER_DB2COM \
+	CARDREADER_INTERNAL \
+	CARDREADER_STINGER \
+	CARDREADER_STAPI \
+	CARDREADER_STAPI5 \
+	IPV6SUPPORT \
+	LCDSUPPORT \
+	LEDSUPPORT \
+	READ_SDT_CHARSETS && \
  make \
-	OSCAM_BIN=/usr/bin/oscam \
-	NO_PLUS_TARGET=1 \
 	CONF_DIR=/config \
 	DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
+	NO_PLUS_TARGET=1 \
+	OSCAM_BIN=/usr/bin/oscam \
 	pcsc-libusb && \
 
 # fix broken permissions from pcscd install.
@@ -63,7 +62,8 @@ RUN \
  curl -o \
  /tmp/omnikey.tar.gz -L \
 	https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \
- tar xzf /tmp/omnikey.tar.gz -C \
+ tar xzf \
+ /tmp/omnikey.tar.gz -C \
 	/tmp/omnikey --strip-components=2 && \
  cd /tmp/omnikey && \
  ./install && \