diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 16:40:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 16:40:04 -0400 |
| commit | 3c61c109fbba19fb5c41870333f879fdc6dc0c1a (patch) | |
| tree | 2bd71cd14a232ad9b83c8bb307fadf30c2b750b4 /debian | |
| parent | e0bbb776bfff6c320d8d717fd351b41720a8112c (diff) | |
ugly workaround for lack of history in repo distributed with debian package
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/README.Debian | 3 | ||||
| -rw-r--r-- | debian/changelog | 3 |
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. |