From 2abb92c06432de1a65e045258bc13464dd599d30 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini
Date: Sun, 29 Jan 2017 00:49:01 +0100
Subject: [PATCH] added how to build psensor debian package
---
src/psensor/build_debian_pkg.adoc | 81 +++++++++++++++++++++++++++++++++++++++
src/psensor/index.adoc | 1 +
src/psensor/raspbian.pbuilderrc | 18 +++++++++
www-update.sh | 2 +
www/psensor/NEWS.html | 7 +++-
www/psensor/README.html | 3 +-
www/psensor/TODO.html | 3 +-
www/psensor/contribute.html | 3 +-
www/psensor/faq.html | 3 +-
www/psensor/index.html | 6 ++-
www/psensor/remote.html | 3 +-
www/psensor/ubuntu.html | 3 +-
12 files changed, 117 insertions(+), 16 deletions(-)
create mode 100644 src/psensor/build_debian_pkg.adoc
create mode 100644 src/psensor/raspbian.pbuilderrc
diff --git a/src/psensor/build_debian_pkg.adoc b/src/psensor/build_debian_pkg.adoc
new file mode 100644
index 0000000..795b059
--- /dev/null
+++ b/src/psensor/build_debian_pkg.adoc
@@ -0,0 +1,81 @@
+= How to build the Debian package of `psensor` from GIT
+:docinfo2:
+:icons: font
+
+This document is explaining step by step how to build the Debian
+package of psensor directly from the GIT repository.
+
+== Build the Debian package
+
+Install `git-buildpackage`:
+
+----
+sudo apt-get install git-buildpackage
+----
+
+Install all build dependencies (you can get it from
+the variable `Build-depends` of the file `debian/control`):
+
+----
+sudo apt-get install ...
+----
+
+Checkout the source of `psensor` and its packaging:
+
+----
+git clone https://git.wpitchoune.net/psensor-pkg-debian.git
+----
+
+Build the Debian package:
+
+----
+cd psensor-pkg-debian.git
+git-buildpackage
+----
+
+== Build to another Debian distribution
+
+`pbuilder` can be used to build `psensor` to another Debian
+distribution than the one used by the build machine.
+
+Installation of `pbuilder`:
+
+----
+apt-get install pbuilder qemu-user-static
+----
+
+Create the distribution image:
+
+----
+git-pbuilder create --config raspbian.pbuilderrc
+----
+
+The variable `DISTRIBUTION` in the configuration file is specifying
+the distribution target of the build. It might be useful for
+example to check the compilation on the 'testing' flavor of `Debian`.
+
+See a configuration example for `Raspbian`:
+link:raspbian.pbuilderrc[raspbian].
+
+To update the image:
+
+----
+git-pbuilder update
+----
+
+Checkout the source of `psensor` and its packaging:
+
+----
+git clone https://git.wpitchoune.net/psensor-pkg-debian.git
+----
+
+And finally, build the `Debian` package:
+
+----
+git-buildpackage --git-pbuilder
+----
+
+== References
+
+* https://wiki.debian.org/git-pbuilder
+* https://www.debian.org/doc/manuals/maint-guide/build.en.html
\ No newline at end of file
diff --git a/src/psensor/index.adoc b/src/psensor/index.adoc
index 8dc0ec0..dac6356 100644
--- a/src/psensor/index.adoc
+++ b/src/psensor/index.adoc
@@ -106,6 +106,7 @@ Binary packages of `psensor` are available for few Linux distributions:
* link:ubuntu.html[Psensor on Ubuntu]
* link:remote.html[Remote monitoring]
* link:contribute.html[How to contribute to psensor]
+* link:build_debian_pkg.html[How to build the debian package of psensor]
* link:faq.html[FAQ]
== Contact
diff --git a/src/psensor/raspbian.pbuilderrc b/src/psensor/raspbian.pbuilderrc
new file mode 100644
index 0000000..d926a37
--- /dev/null
+++ b/src/psensor/raspbian.pbuilderrc
@@ -0,0 +1,18 @@
+# pbuilderrc file for raspbian
+
+# specific to raspbian
+OS=raspbian
+ARCHITECTURE=armhf
+# use the correct keyring for raspbian
+DEBOOTSTRAPOPTS=( '--variant=buildd' '--keyring=/usr/share/keyrings/raspbian-archive-keyring.gpg')
+MIRRORSITE=http://archive.raspbian.org/raspbian/
+
+# debian distribution: sid, jessie, testing
+DISTRIBUTION=testing
+
+COMPONENTS="main"
+
+DEBOOTSTRAP=qemu-debootstrap
+
+# allow network so pbuilder can install build dependencies automaticaly
+USENETWORK=yes
\ No newline at end of file
diff --git a/www-update.sh b/www-update.sh
index fed5d14..a067f27 100755
--- a/www-update.sh
+++ b/www-update.sh
@@ -56,6 +56,8 @@ asciidoctor $OPTS src/psensor/index.adoc -D www/psensor/
asciidoctor $OPTS src/psensor/ubuntu.adoc -D www/psensor/
asciidoctor $OPTS src/psensor/remote.adoc -D www/psensor
asciidoctor $OPTS src/psensor/contribute.adoc -D www/psensor/
+asciidoctor $OPTS src/psensor/build_debian_pkg.adoc -D www/psensor/
+cp src/psensor/raspbian.pbuilderrc www/psensor
OPTS="-a linkcss -a stylesheet=../style.css"
diff --git a/www/psensor/NEWS.html b/www/psensor/NEWS.html
index d5f9e7e..dfca733 100644
--- a/www/psensor/NEWS.html
+++ b/www/psensor/NEWS.html
@@ -69,6 +69,10 @@ and default-sensor-alarm-enabled.
Added Polish translation (hawkeye116477).
+
+Fixed GtkDialog mapped without a transient parent (Francis
+Chin). (LP: #1642696).
+
@@ -1967,9 +1971,8 @@ Initial release
-Feed: RSS 2.0