From 7e54706f8125e6e439192bfa9c9fd4e65053c71e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 26 Mar 2014 16:42:20 +0100
Subject: [PATCH] Update helpers to Debian Jessie.

---
 prepare_rPI.sh         |  7 +++++--
 prepare_rPI_builder.sh | 21 ++-------------------
 proper_chroot.sh       |  2 +-
 resize_img.md          |  6 +++---
 update_builder.sh      | 10 +++-------
 5 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/prepare_rPI.sh b/prepare_rPI.sh
index 2d81016..f2deb0e 100755
--- a/prepare_rPI.sh
+++ b/prepare_rPI.sh
@@ -8,13 +8,16 @@ apt-get update
 apt-get dist-upgrade
 apt-get autoremove
 apt-get install libreoffice p7zip-full libfontforge1 timidity
-dpkg -i libpoppler37*.deb pdf2htmlex*.deb
+dpkg -i --ignore-depends=libpoppler27 pdf2htmlex*.deb
 
+# Make Libreoffice usable on a RO filesystem
 pushd /home/kitten
 ln -s /tmp/libreoffice
 popd
 
 chown -R kitten:kitten /home/kitten
 
-rm /etc/mtab
 ln -s /proc/mounts /etc/mtab
+
+# Disable swap
+dphys-swapfile uninstall
diff --git a/prepare_rPI_builder.sh b/prepare_rPI_builder.sh
index f8e798f..d9c380b 100755
--- a/prepare_rPI_builder.sh
+++ b/prepare_rPI_builder.sh
@@ -9,23 +9,6 @@ apt-get update
 apt-get dist-upgrade
 apt-get autoremove
 
-echo "deb http://ftp.de.debian.org/debian experimental main" >> /etc/apt/sources.list
-echo "deb-src http://ftp.de.debian.org/debian experimental main" >> /etc/apt/sources.list
-# Force User
-su root
-gpg --keyserver pgpkeys.mit.edu --recv-key 8B48AD6246925553
-gpg -a --export 8B48AD6246925553 | apt-key add -
-gpg --keyserver pgpkeys.mit.edu --recv-key AED4B06F473041FA
-gpg -a --export AED4B06F473041FA | apt-key add -
-apt-get update
-# Needed dependencies for building libpoppler
-#apt-get install debhelper autotools-dev libglib2.0-dev libgtk2.0-dev libfontconfig1-dev \
-#    libqt4-dev libcairo2-dev libopenjpeg-dev libjpeg-dev libpng-dev libtiff-dev \
-#    liblcms2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libglib2.0-doc \
-#    libcairo2-doc
-apt-get build-dep poppler
-
 # build dependencies of pdf2htmlEX
-apt-get install cmake libfontforge-dev libspiro-dev python-dev
-
-git clone https://github.com/coolwanglu/pdf2htmlEX.git
+apt-get install cmake debhelper libpoppler-dev libjpeg-dev libfontforge-dev \
+    libspiro-dev python-dev default-jre-headless libpoppler-private-dev
diff --git a/proper_chroot.sh b/proper_chroot.sh
index 0dc1c49..9691419 100755
--- a/proper_chroot.sh
+++ b/proper_chroot.sh
@@ -26,7 +26,7 @@ PARTITION_BOOT='/dev/sdd1'
 
 # If you use the img
 ##### Debian
-IMAGE='2013-09-10-wheezy-raspbian.img'
+IMAGE='2014-01-07-wheezy-raspbian.img'
 OFFSET_ROOTFS=$((122880 * 512))
 OFFSET_BOOT=$((8192 * 512))
 ##### Arch
diff --git a/resize_img.md b/resize_img.md
index 779127e..aa87a60 100644
--- a/resize_img.md
+++ b/resize_img.md
@@ -3,12 +3,12 @@ Add empty space to the image
 
 Add 2Gb
 
-> dd if=/dev/zero bs=1024k count=2048 >> 2013-09-10-wheezy-raspbian.img
+> dd if=/dev/zero bs=1024k count=2048 >> 2014-01-07-wheezy-raspbian.img
 
-Expend partition size
+Expand partition size
 =====================
 
-> fdisk 2013-09-10-wheezy-raspbian.img
+> fdisk 2014-01-07-wheezy-raspbian.img
 
 Command (m for help): *p*
 
diff --git a/update_builder.sh b/update_builder.sh
index 8c7d9c9..8ac06f1 100755
--- a/update_builder.sh
+++ b/update_builder.sh
@@ -3,13 +3,9 @@
 # Force the User
 su root
 
-apt-get -b source -t experimental poppler
+wget https://github.com/coolwanglu/pdf2htmlEX/archive/v0.11.zip
+unzip v0.11.zip
 
-# Note: libpoppler-private-dev is not listed in the dependencies of pdf2htmlEX
-# but still needed because of poppler-config.h
-dpkg -i libpoppler-dev* libpoppler37* libpoppler-private-dev*
-
-cd pdf2htmlEX/
-git pull
+cd pdf2htmlEX-0.11/
 
 dpkg-buildpackage -uc -b