0install 2.15

debian/changelog

@@ -1,3 +1,9 @@
+zeroinstall-injector (2.15-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Leonard <[email protected]>  Wed, 18 Dec 2019 14:51:21 +0000
+
 zeroinstall-injector (2.14.1-3) unstable; urgency=medium
 
   * Fix link error on MIPS.

debian/control

@@ -15,6 +15,9 @@ Build-Depends: binutils,
                libsha-ocaml-dev,
                libxmlm-ocaml-dev,
                libyojson-ocaml-dev,
+               libppxlib-ocaml-dev,
+               liblwt-log-ocaml-dev,
+               menhir,
                ocaml-dune,
                ocaml-findlib,
                ocaml-nox,

debian/copyright

@@ -29,11 +29,8 @@ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 Due to the Debian transition to OCaml 4.08, this package is currently vendoring
 several libraries which have been removed from the archive. They are:
 
-- camlp4-4.05+2 (LGPL-2) https://github.com/ocaml/camlp4
 - lwt_glib-1.1.1 (LGPL-2.1) https://github.com/ocsigen/lwt_glib
-- lwt_camlp4-2018-03-25 (LGPL-2.1) https://github.com/ocsigen/lwt_camlp4
-- type_conv-113.00.02 (Apache-2.0 + BSD-C3) https://github.com/janestreet/type_conv
-- obus-1.1.7 (BSD-C3) https://github.com/ocaml-community/obus/
+- obus-1.2.0 (BSD-C3) https://github.com/ocaml-community/obus/
 
 The Debian packaging is (C) Copyright 2014, Thomas Leonard <[email protected]>
 and is also licensed under the LGPL 2.1 or later.

debian/rules

@@ -14,12 +14,11 @@ build-indep:
 build-arch: build-stamp
 
 VENDOR := /tmp/0install-build-vendor
-OCAMLPATH := $(VENDOR)/usr/lib/ocaml
-PATH := $(VENDOR)/usr/bin:$(PATH)
+OCAMLPATH := $(VENDOR)/lib
 
 build-stamp:
 	dh_testdir
-	(cd vendor && ./fix-debian.sh) && rm -rf vendor
+	mv vendor/lwt_glib-1.1.1 . && dune build @lwt_glib-1.1.1/install && dune install --prefix=$(VENDOR) lwt_glib && rm -rf lwt_glib-1.1.1
 	if [ -x /usr/bin/ocamlopt ]; then \
 		make OCAMLPATH=$(OCAMLPATH) TYPE=native; \
 	else \

docker-template/Dockerfile

@@ -1,5 +1,4 @@
 FROM debian:sid
-RUN apt-get update
 
 # Core build tools
 
@@ -33,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y xdg-utils python-gobject-2 ocaml-native-compilers
 
 # merge-me
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y unzip ocamlbuild --no-install-recommends
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y unzip ocamlbuild libppxlib-ocaml-dev liblwt-log-ocaml-dev menhir --no-install-recommends
 
 RUN useradd -U -u 1000 -m tal
 

makedeb.debian

@@ -14,32 +14,29 @@ OLD_DEB_VERSION="2.14.1-1"
 
 VERSION="$1"
 DEBIANVERSION=`echo $VERSION | sed 's/-/~/g'`
-DEBIANMOD="-3"
-TMP_TAR="/home/tal/Out/zero-install/0install/$VERSION/0install-$VERSION.tar.bz2"
+DEBIANMOD="-1"
+#TMP_TAR="/home/tal/Out/zero-install/0install/$VERSION/0install-$VERSION.tar.bz2"
+TMP_TAR="/home/tal/Out/zero-install/0install/$VERSION/0install-$VERSION-debian.tar.bz2"
 
 if [ ! -e "$TMP_TAR" ]; then
   echo Missing: $TMP_TAR
   exit 1
 fi
-TMP_TAR=/DISABLED
 
-orig="zeroinstall-injector_$DEBIANVERSION.orig.tar.gz"
+orig="zeroinstall-injector_$DEBIANVERSION.orig.tar.bz2"
 
 BUILD_DIR="build-$VERSION$DEBIANMOD"
 if true; then
 	rm -rf "$BUILD_DIR"
 	mkdir -p "$BUILD_DIR"
 
-	#echo "Copying $TMP_TAR as $BUILD_DIR/$orig..."
+	echo "Copying $TMP_TAR as $BUILD_DIR/$orig..."
 
-	#cp "$TMP_TAR" "$BUILD_DIR/$orig"
-	#cp "$TMP_TAR".sig "$BUILD_DIR/$orig".asc
+	cp "$TMP_TAR" "$BUILD_DIR/$orig"
+	cp "$TMP_TAR".sig "$BUILD_DIR/$orig".asc
 
 	cd "$BUILD_DIR"
-	cp ../$orig .
-	cp ../$orig.asc .
 	tar xf "$orig"
-	mv 0install-debian-fix-debian-4.05 0install-$DEBIANVERSION
 	cp -r ../debian 0install-$DEBIANVERSION/
 	cd ..
 
@@ -77,11 +74,11 @@ if [ "$BINARY" = "y" ]; then
 
 	cp test-script $BUILD_DIR
 	mkdir $BUILD_DIR/gnupg
-	docker run --rm -u tal -it -u root -v `pwd`/$BUILD_DIR:/mnt talex5/deb-builder ./test-script
+	docker run --rm -it -u root -v `pwd`/$BUILD_DIR:/mnt talex5/deb-builder ./test-script
 	DEB=$BUILD_DIR/0install-core_${DEBIANVERSION}${DEBIANMOD}_amd64.deb
 
-	echo "OK! Hint:"
-	echo docker run --rm -u tal -v `pwd`:/mnt -v `pwd`/gnupg:/mnt/gnupg -it -w /mnt/$BUILD_DIR talex5/deb-builder dput "$CHANGES"
+	#echo "OK! Now do a source build."
+	#echo docker run --rm -u tal -v `pwd`:/mnt -v `pwd`/gnupg:/mnt/gnupg -it -w /mnt/$BUILD_DIR talex5/deb-builder dput "$CHANGES"
 else
 	# sudo pbuilder --create sid --debootstrapopts --variant=buildd --removepackages tzdata
 	#echo "Updating pbuilder"