perl-clearsilver debian package

cryptobox debian package
directories restructured

add-ons-tree.d/var/www/index.html

@@ -1 +0,0 @@
-cgi-bin/cryptobox.pl

etc-defaults.d/cbox-dev.conf

@@ -11,8 +11,7 @@
 BUILD_DIR="$ROOT_DIR/_builddir"
 
 # the cryptobox development files
-TEMPLATE_DIR="$ROOT_DIR/cbox-tree.d"
-TEMPLATE_EXTRAS_DIR="$ROOT_DIR/add-ons-tree.d"
+TEMPLATE_DIR="$ROOT_DIR/live-cd-tree.d"
 
 # the iso image
 IMAGE_FILE="$BUILD_DIR/cryptobox.iso"

etc-defaults.d/dfs-cbox.conf

@@ -155,7 +155,8 @@ unpackdebs = packages/kernel-image-2.6.12.6_cryptobox0.3_i386.deb
 packages = %(allpackages)s
 
 # Debs from local fs to isntall on live fs
-#installdebs =
+installdebs = packages/cryptobox_0.3.0-1_all.deb
+	packages/perl-clearsilver_0.9.13-3.2_all.deb
 
 # Bootloader (see options under default)
 bootloader = grub-no-emul

live-cd-tree.d/var/www/index.html

@@ -0,0 +1 @@
+cryptobox

packages/perl-clearsilver_debian_packaging.patch

@@ -0,0 +1,59 @@
+# how to build the perl-clearsilver package:
+# apt-get source clearsilver
+# cat THIS_FILE | patch -p0
+# cd clearsilver-*
+# debian/rules binary
+diff -ruN clearsilver-0.9.13.orig/debian/control clearsilver-0.9.13/debian/control
+--- clearsilver-0.9.13.orig/debian/control	2005-11-30 23:09:24.000000000 +0100
++++ clearsilver-0.9.13/debian/control	2005-11-30 23:38:10.000000000 +0100
+@@ -39,3 +39,13 @@
+  This Debian package is an empty dummy package that always depends on
+  a package built for Debian's default Python version.
+ 
++Package: perl-clearsilver
++Architecture: all
++Section: perl
++Priority: optional
++Depends: perl (>= 5.6)
++Description: perl bindings for clearsilver
++ Clearsilver is a fast, powerful, and language-neutral HTML template system. 
++ In both static content sites and dynamic HTML applications, it
++ provides a separation between presentation code and application logic which
++ makes working with your project easier.
+diff -ruN clearsilver-0.9.13.orig/debian/rules clearsilver-0.9.13/debian/rules
+--- clearsilver-0.9.13.orig/debian/rules	2005-11-30 23:09:24.000000000 +0100
++++ clearsilver-0.9.13/debian/rules	2005-11-30 23:49:57.000000000 +0100
+@@ -9,7 +9,7 @@
+ include /usr/share/cdbs/1/rules/simple-patchsys.mk
+ 
+ DEB_CONFIGURE_EXTRA_FLAGS := --with-python=/usr/bin/python2.3 \
+-			  --disable-perl \
++			  --with-perl=/usr/bin/perl \
+ 			  --disable-ruby \
+                           --disable-csharp \
+ 			  --disable-apache \
+@@ -18,6 +18,7 @@
+ CFLAGS += -fPIC
+ 
+ DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp
++DEB_SHLIBDEPS_INCLUDE_perl-clearsilver := debian/perl-clearsilver/usr/lib/perl5
+ DEB_SHLIBDEPS_INCLUDE_python2.3-clearsilver := debian/python2.3-clearsilver/usr/lib/python2.3/site-packages
+ 
+ build/python2.3-clearsilver::
+@@ -27,3 +28,16 @@
+ 
+ binary-post-install/python2.3-clearsilver::
+ 	dh_movefiles --package=python2.3-clearsilver usr/lib/python2.3
++
++build/perl-clearsilver::
++	install -d debian/tmp/usr/lib/perl5
++	install -d debian/tmp/usr/lib/perl5/auto/ClearSilver
++	install -m644 $(DEB_BUILDDIR)/perl/ClearSilver.pm \
++	    debian/tmp/usr/lib/perl5/ClearSilver.pm
++	install -m755 $(DEB_BUILDDIR)/perl/blib/arch/auto/ClearSilver/ClearSilver.so \
++	    debian/tmp/usr/lib/perl5/auto/ClearSilver/ClearSilver.so
++	install -m644 $(DEB_BUILDDIR)/perl/ClearSilver.bs \
++	    debian/tmp/usr/lib/perl5/auto/ClearSilver/ClearSilver.bs
++
++binary-post-install/perl-clearsilver::
++	dh_movefiles --package=perl-clearsilver usr/lib/perl5

scripts/cbox-build.sh

@@ -97,12 +97,9 @@ function configure_cb()
 		exit 1
 	fi
 
-echo "Copying base files to the box ..."
+echo "Copying files to the box ..."
 		svn export --force "$TEMPLATE_DIR/." "$IMAGE_DIR"
 	
-	echo "Copying add-on files to the box ..."
-		svn export --force "$TEMPLATE_EXTRAS_DIR/." "$IMAGE_DIR"
-	
 	echo "Configuring the cryptobox ..."
 		chroot "$IMAGE_DIR" "$CHROOT_START" /usr/lib/cryptobox/configure-cryptobox.sh normal
 	

scripts/common.sh.inc

@@ -38,9 +38,6 @@ LOCALCONF_DIR="$ROOT_DIR/etc-local.d"
 # 'configure'
 CUSTOM_CONFIGURE_DIR="$ROOT_DIR/configure-local.d"
 
-# template directory for cryptobox specific configuration
-TEMPLATE_DIR="cbox-tree.d"
-
 # the chroot-wrapper within the cryptobox
 CHROOT_START="/usr/lib/cryptobox/chroot-start.sh"
 

scripts/debian

@@ -31,11 +31,11 @@ ACTION=build
 case "$ACTION" in
 	build )
 		# check for uid=0 (necessary for building)
-		[ "$(id -u)" -ne 0 ] && echo "this script ($0) has to be called as root" >&2 && exit 1
-		svn export "$DEB_ROOT_DIR" "$DEB_BUILD_DIR"
-		svn export "$DEB_CONTROL_DIR" "$DEB_BUILD_DIR/DEBIAN"
-		chown -R root. "$DEB_BUILD_DIR/usr/share/doc/"
-		dpkg-deb --build "$DEB_BUILD_DIR" "$DEB_PACKAGE_DIR"
+		#[ "$(id -u)" -ne 0 ] && echo "this script ($0) has to be called as root" >&2 && exit 1
+		svn export "$DEB_ROOT_DIR" "$DEB_BUILD_DIR" >/dev/null
+		svn export "$DEB_CONTROL_DIR" "$DEB_BUILD_DIR/DEBIAN" >/dev/null
+		#chown -R root. "$DEB_BUILD_DIR/usr/share/doc/"
+		fakeroot dpkg-deb --build "$DEB_BUILD_DIR" "$DEB_PACKAGE_DIR"
 		rm -rf "$DEB_BUILD_DIR"
 		;;
 	check )

scripts/userdocexport.sh

@@ -34,7 +34,7 @@ CBOX_CGI="/cryptobox?action=doc\&page="
 LANGUAGES="de en"
 
 DEST_DIR="$ROOT_DIR/cbox-tree.d/usr/share/doc/cryptobox/html"
-OFFLINE_DIR="$ROOT_DIR/cbox-tree.d/_offline/doc"
+OFFLINE_DIR="$ROOT_DIR/live-cd-tree.d/_offline/doc"
 IMAGE_DIR="$ROOT_DIR/cbox-tree.d/var/www/cryptobox-img"
 TMP_DIR=/tmp/$(basename $0)-$$.d