Bump debian package to version 3.1-2

Updated all files to be more Debian compliant
Update release instructions for get mod vendor before releasing

debian/changelog

@@ -1,21 +1,24 @@
-yq (3.1-1ubuntu1) eoan; urgency=medium
+yq (3.1-2) eoan; urgency=medium
 
-  * yq 3 was removing empty inline-style objects and arrays (Closes: #355)
+  * Bug fix: yq 3 was removing empty inline-style objects and arrays (#355)
-  * Merge option returned different output when switching order of merging files (Closes: #347)
+  * Bug fix: Merge option returned different output when switching order of 
-  * Add new object to existing array object was failing in 3.1.1 (Closes: #361)
+    merging files(#347)
-  * yq 3 empty keys did not allow merging of values (Closes: #356)
+  * Bug fix: Add new object to existing array object was failing in 3.1.1 (#361)
-  * keys quoted during merge (Closes: #363)
+  * Bug fix: yq 3 empty keys did not allow merging of values (#356)
-  * Correct length with wc -l (Closes: #362)
+  * Bug fix: keys quoted during merge (#363)
-  * Write to empty document removed path (Closes: #359)
+  * Bug fix: Correct length with wc -l (#362)
+  * Bug fix: Write to empty document removed path (#359)
 
  -- Roberto Mier Escandon <rmescandon@gmail.com>  Mon, 24 Feb 2020 20:31:58 +0100
 
 yq (3.1-1) eoan; urgency=medium
 
   * Keeps yaml comments and formatting, can specify yaml tags when updating.
-  * Handles anchors!  https://github.com/mikefarah/yq/issues/310, https://github.com/mikefarah/yq/issues/178
+  * Handles anchors
-  * Can print out matching paths and values when splatting https://github.com/mikefarah/yq/issues/20
+  * Can print out matching paths and values when splatting
-  * JSON output works for all commands! Yaml files with multiple documents are printed out as one JSON document per line.
+  * JSON output works for all commands
+  * Yaml files with multiple documents are printed out as one JSON 
+    document per line.
   * Deep splat (**) to match arbitrary paths
   * Update scripts file format has changed to be more powerful
   * Reading and splatting, matching results are printed once per line

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -5,9 +5,8 @@ Maintainer: Roberto Mier Escandón <rmescandon@gmail.com>
 Build-Depends: debhelper (>=10),
                dh-golang (>=1.34),
                golang-1.13,
-               dpkg-dev,
                rsync
-Standards-Version: 3.9.6
+Standards-Version: 4.1.4
 Homepage: https://github.com/mikefarah/yq.git
 Vcs-Browser: https://github.com/mikefarah/yq.git
 Vcs-Git: https://github.com/mikefarah/yq.git
@@ -17,7 +16,7 @@ XSBC-Original-Maintainer: Roberto Mier Escandón <rmescandon@gmail.com>
 Package: yq
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: a lightweight and portable command-line YAML processor
+Description: lightweight and portable command-line YAML processor
  .
  The aim of the project is to be the 
  [jq](https://github.com/stedolan/jq) or sed of yaml files.

debian/copyright

@@ -3,5 +3,22 @@ Upstream-Name: yq
 Source: https://github.com/mikefarah/yq.git
 
 Files: *
-Copyright: 2017 Mike Farah Ltd. All rights reserved
+Copyright: 2017 Mike Farah
-License: Proprietary
+License: Expat
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+    .
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+    .
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.

debian/files

@@ -0,0 +1 @@
+yq_3.1-2_source.buildinfo devel optional

debian/rules

@@ -40,7 +40,7 @@ override_dh_auto_build:
 	mkdir -p ${SRCDIR}
 	mkdir -p ${GOBIN}
 	# copy project to local srcdir to build from there
-	rsync -avz --progress --exclude=_build --exclude=debian --exclude=tmp. --exclude=go.mod . $(SRCDIR)
+	rsync -avz --progress --exclude=_build --exclude=debian --exclude=tmp. --exclude=go.mod --exclude=docs . $(SRCDIR)
 	# build go code
 	(cd ${SRCDIR} && go install -buildmode=pie ./...)
 	
@@ -48,8 +48,6 @@ override_dh_auto_test:
 	(cd ${SRCDIR} && go test -v ./...)
 
 override_dh_auto_install:
-	mkdir -p ${DESTDIR}/${BINDIR}
-	mkdir -p ${DESTDIR}/${ASSETSDIR}
 	cp ${GOBIN}/yq ${DESTDIR}/${BINDIR}
 	cp -f ${SRCDIR}/LICENSE ${DESTDIR}/${ASSETSDIR}
 	chmod a+x ${DESTDIR}/${BINDIR}/yq

debian/yq.dirs

@@ -0,0 +1,3 @@
+usr/bin
+usr/share/yq
+usr/share/man/man1

release_instructions.txt

@@ -33,6 +33,8 @@
   - docker build .  -t mikefarah/yq:latest -t mikefarah/yq:VERSION 
 
 - debian package
+  - ensure you get all vendor dependencies before packaging
+	```go mod vendor```
   - execute 
     ```dch -i```
   - fill debian/changelog with changes from last version
@@ -42,4 +44,4 @@
   - put to PPA
     ```dput ppa:<REPOSITORY> ../yq_<VERSION>_source.changes```
     (current distro repository is ppa:rmescandon/yq. In case that a new version
-    is released, please contact rmescandon@gmail.com to bump debian package)
+    is released, please contact rmescandon@gmail.com to bump debian package)