From ad046680f7c5ea7a8e9363a446bfa5a01b4d6f6a Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 4 Aug 2016 12:37:48 +0100
Subject: [PATCH 1/5] tiny polish to cpp

---
 cplusplus/VImage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cplusplus/VImage.cpp b/cplusplus/VImage.cpp
index 4b8b34f2..92511694 100644
--- a/cplusplus/VImage.cpp
+++ b/cplusplus/VImage.cpp
@@ -570,7 +570,7 @@ VImage::new_from_image( std::vector<double> pixel )
 	VImage onepx = VImage::black( 1, 1, 
 		VImage::option()->set( "bands", bands() ) ); 
 
-	onepx = onepx.linear( to_vectorv( 1, 1.0 ), pixel ).cast( format() );
+	onepx = (onepx + pixel).cast( format() );
 
 	VImage big = onepx.embed( 0, 0, width(), height(), 
 		VImage::option()->set( "extend", VIPS_EXTEND_COPY ) ); 

From 866cfd5ce3cc4b5b2d70466f12f9d915f0f1ffcd Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 5 Aug 2016 14:52:34 +0100
Subject: [PATCH 2/5] rename bootstrap.sh as autogen

necessary for snapcraft
---
 ChangeLog               | 1 +
 README.md               | 2 +-
 bootstrap.sh => autogen | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename bootstrap.sh => autogen (100%)

diff --git a/ChangeLog b/ChangeLog
index e31d008e..b6ea89eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@
 - gif loader can write 1, 2, 3, or 4 bands depending on file contents
 - support --strip for pngsave
 - add svgz support [Felix Bünemann]
+- rename boostrap.sh -> autogen to help snapcraft
 
 30/7/16 started 8.3.3
 - fix performance regression in 8.3.2, thanks Lovell
diff --git a/README.md b/README.md
index bb8c6e4f..1349268c 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ and `gobject-introspection`, see the dependencies section below. For example:
 
 Then build the build system with:
 
-	$ ./bootstrap.sh
+	$ ./autogen
 
 Debug build:
 
diff --git a/bootstrap.sh b/autogen
similarity index 100%
rename from bootstrap.sh
rename to autogen

From 3dd88d7752d3b31f2b3f63ac2d2448d50e705861 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 5 Aug 2016 14:57:36 +0100
Subject: [PATCH 3/5] argh

---
 autogen => autogen.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename autogen => autogen.sh (100%)

diff --git a/autogen b/autogen.sh
similarity index 100%
rename from autogen
rename to autogen.sh

From db8dafb430d58428781c48aef38dc7b0ae8d5e9a Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 5 Aug 2016 14:58:27 +0100
Subject: [PATCH 4/5] and travis to

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f105dad2..27aab72d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: cpp
 
 before_script:
-  - ./bootstrap.sh
+  - ./autogen.sh
   - ./configure
     --disable-dependency-tracking
     --with-jpeg-includes=$JPEG/include

From 0f55c9b7ace71327786c1a896ea85b00ad3c73f6 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 5 Aug 2016 15:00:37 +0100
Subject: [PATCH 5/5] note change on README too

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1349268c..bbac874b 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ and `gobject-introspection`, see the dependencies section below. For example:
 
 Then build the build system with:
 
-	$ ./autogen
+	$ ./autogen.sh
 
 Debug build: