summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--doc/contributing.mdwn4
-rw-r--r--doc/news/version_2.15.2.mdwn9
-rw-r--r--doc/news/version_2.17.1.mdwn8
-rw-r--r--propellor.cabal2
5 files changed, 15 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index 15587571..cd7a4c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (2.17.1) UNRELEASED; urgency=medium
+propellor (2.17.1) unstable; urgency=medium
* Avoid generating excessively long paths to the unix socket file
used for ssh connection caching. Mostly. Can still generate a too long
@@ -7,7 +7,7 @@ propellor (2.17.1) UNRELEASED; urgency=medium
Files without extensions were ignored by uwsgi.
Thanks, Félix Sipma.
- -- Joey Hess <id@joeyh.name> Fri, 25 Mar 2016 17:23:25 -0400
+ -- Joey Hess <id@joeyh.name> Mon, 28 Mar 2016 11:06:34 -0400
propellor (2.17.0) unstable; urgency=medium
diff --git a/doc/contributing.mdwn b/doc/contributing.mdwn
index 84aa5d64..e75784df 100644
--- a/doc/contributing.mdwn
+++ b/doc/contributing.mdwn
@@ -17,3 +17,7 @@ Propellor has its own [[coding_style]], which you are encouraged to follow
-- at least when you want to get a patch merged into propellor.
When writing code for your own internal use, feel free to ignore all the
rules, except the ones about avoiding partial functions.
+
+Also, mainline Propellor aims to be buildable with the version of ghc
+shipped in Debian stable. And, additional weighty dependencies are best
+avoided.
diff --git a/doc/news/version_2.15.2.mdwn b/doc/news/version_2.15.2.mdwn
deleted file mode 100644
index b1a3bf80..00000000
--- a/doc/news/version_2.15.2.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-propellor 2.15.2 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * Added GNUPGBIN environment variable or git.program git config
- to control the command run for gpg. Allows eg, GNUPGBIN=gpg2
- Thanks, Félix Sipma.
- * Bootstrap apt-get installs run with deconf noninteractive frontend.
- * spin --via: Avoid committing on relay host.
- * Postfix: Add service property to enable/disable services in master.cf.
- * Added Munin module, contributed by Jelmer Vernooij."""]] \ No newline at end of file
diff --git a/doc/news/version_2.17.1.mdwn b/doc/news/version_2.17.1.mdwn
new file mode 100644
index 00000000..22727666
--- /dev/null
+++ b/doc/news/version_2.17.1.mdwn
@@ -0,0 +1,8 @@
+propellor 2.17.1 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * Avoid generating excessively long paths to the unix socket file
+ used for ssh connection caching. Mostly. Can still generate a too long
+ one if $HOME is longer than 60 bytes.
+ * Uwsgi: add ".ini" extension to app config files.
+ Files without extensions were ignored by uwsgi.
+ Thanks, Félix Sipma."""]] \ No newline at end of file
diff --git a/propellor.cabal b/propellor.cabal
index dc322e88..96ef098c 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 2.17.0
+Version: 2.17.1
Cabal-Version: >= 1.8
License: BSD3
Maintainer: Joey Hess <id@joeyh.name>