summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 16:40:31 -0400
committerJoey Hess2014-08-19 16:40:31 -0400
commit16c01b24ceb0a67af913ada32f945ab67899be66 (patch)
tree944b8a09f37ac71509c985379e720f2497f83c3d /debian
parentc57ff0cb463f9acd1a0aa0d11a2bbaad75d361be (diff)
parent3c61c109fbba19fb5c41870333f879fdc6dc0c1a (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/README.Debian3
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index fe187841..851add5d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -10,4 +10,5 @@ Note that upgrading the propellor package will not update your
~/.propellor/ repository. This is because you may have local changes
to the source, or may need to adapt your config.hs to work with the new
version of propellor. Instead, if your ~/.propellor/ is from an older
-version of propellor, /usr/bin/propellor will warn that it's out of date.
+version of propellor, /usr/bin/propellor will warn that it's out of date,
+and tell you how to merge in the changes.
diff --git a/debian/changelog b/debian/changelog
index cd1ed61d..1a982545 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ propellor (0.8.3) UNRELEASED; urgency=medium
its origin remote. This avoids relying on the security of the github
repository when using the Debian package.
* The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date
- and a newer version is available from origin.
+ and a newer version is available, after which git merge upstream/master
+ can be run to merge it.
* Included the config.hs symlink to config-simple.hs in the cabal and Debian
packages.