summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-08-23 11:40:31 -0400
committerJoey Hess2017-08-23 11:40:31 -0400
commit5aeba7c622174307e05256afcb7e1ab4e734b0cf (patch)
tree266b37c12d1d83aa5b7c901de104fd02ed8de059
parenta11d4b95d53e526244fdf5e6d5913b9b442cb4e7 (diff)
parent656458f9c04a3c329fefb49de85f83c30d751e36 (diff)
Merge branch 'master' into joeyconfig
l---------config.hs2
-rw-r--r--debian/changelog4
-rw-r--r--doc/news/version_4.7.1.mdwn4
-rw-r--r--doc/news/version_4.7.6.mdwn6
-rw-r--r--privdata/relocate1
-rw-r--r--propellor.cabal2
6 files changed, 10 insertions, 9 deletions
diff --git a/config.hs b/config.hs
index 97d90636..ec313725 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-joeyconfig.hs \ No newline at end of file
+config-simple.hs \ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 157a7c98..40474c05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (4.7.6) UNRELEASED; urgency=medium
+propellor (4.7.6) unstable; urgency=medium
* Sbuild: Add Sbuild.userConfig property.
Thanks, Sean Whitton
@@ -12,7 +12,7 @@ propellor (4.7.6) UNRELEASED; urgency=medium
* Obnam module is deprecated and will warn when used.
Obnam has been retired by its author.
- -- Joey Hess <id@joeyh.name> Tue, 01 Aug 2017 15:33:49 -0400
+ -- Joey Hess <id@joeyh.name> Tue, 01 Aug 2017 17:59:07 -0400
propellor (4.7.5) unstable; urgency=medium
diff --git a/doc/news/version_4.7.1.mdwn b/doc/news/version_4.7.1.mdwn
deleted file mode 100644
index 7b8b2abc..00000000
--- a/doc/news/version_4.7.1.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-propellor 4.7.1 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * Added Mount.isMounted.
- * Grub.bootsMounted: Bugfix."""]] \ No newline at end of file
diff --git a/doc/news/version_4.7.6.mdwn b/doc/news/version_4.7.6.mdwn
new file mode 100644
index 00000000..4c8abd97
--- /dev/null
+++ b/doc/news/version_4.7.6.mdwn
@@ -0,0 +1,6 @@
+propellor 4.7.6 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * Sbuild: Add Sbuild.userConfig property.
+ Thanks, Sean Whitton
+ * Locale: Make sure that the locales package is installed when enabling
+ locales."""]] \ No newline at end of file
diff --git a/privdata/relocate b/privdata/relocate
deleted file mode 100644
index 271692d8..00000000
--- a/privdata/relocate
+++ /dev/null
@@ -1 +0,0 @@
-.joeyconfig
diff --git a/propellor.cabal b/propellor.cabal
index a6c5c0fc..cf6739de 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 4.7.5
+Version: 4.7.6
Cabal-Version: >= 1.20
License: BSD2
Maintainer: Joey Hess <id@joeyh.name>