summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 14:34:16 -0400
committerJoey Hess2014-08-19 14:34:16 -0400
commitebeb3cb8fa8f81cac2c3b9eea3d5216c0f3b852f (patch)
tree1342a480ce0376c49e70568994adf452026126fe /debian
parent8bea99ea0ec7f46994f372b3e4c7c2b9624bd7d8 (diff)
parente6f13a9af9c4253a1f41c3949ee78ddcc4e7f8a4 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/README.Debian9
-rw-r--r--debian/changelog11
-rw-r--r--debian/control1
3 files changed, 21 insertions, 0 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index e32a0ee3..73fea47d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,3 +5,12 @@ of the source code.
/usr/bin/propellor is a wrapper which will set up a propellor git
repository in ~/.propellor/, and run ~/.propellor/propellor if it exists.
Edit ~/.propellor/config.hs to configure it.
+
+Note that upgrading the propellor package will not update your
+~/.propellor/ repository. You can `git pull upstream` in your repository to
+update to the current upstream source, as distributed in the Debian
+package.
+
+Older versions of propellor set the upstream remote to
+point to a repository on github, so if you used one of them, you may want
+to change it to point to the new location, /usr/src/propellor/
diff --git a/debian/changelog b/debian/changelog
index 29dec10c..286c5a8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+propellor (0.8.3) UNRELEASED; urgency=medium
+
+ * The Debian package now includes a single-revision git repository in
+ /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as
+ its "upstream" remote. This avoids relying on the security of the github
+ repository when using the Debian package.
+ * Included the config.hs symlink to config-simple.hs in the cabal and Debian
+ packages.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 19 Aug 2014 14:16:32 -0400
+
propellor (0.8.2) unstable; urgency=medium
* Fix bug in File.containsLines that caused lines that were already in the
diff --git a/debian/control b/debian/control
index a4dc2466..2d113cdf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: admin
Priority: optional
Build-Depends:
debhelper (>= 9),
+ git,
ghc (>= 7.4),
cabal-install,
libghc-async-dev,