summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 15:22:42 -0400
committerJoey Hess2014-08-19 15:22:42 -0400
commit1830f501ee7d8ca7832cbd337629b0d9225baedb (patch)
treea558a5c76929553d852877509518270374b00d1c /debian
parent527ae1dc208599bee15afd8167eeec17744a6b0b (diff)
debian upgrade handling
The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date and a newer version is available from origin.
Diffstat (limited to 'debian')
-rw-r--r--debian/README.Debian9
-rw-r--r--debian/changelog4
2 files changed, 3 insertions, 10 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index 9fa53c7b..fe187841 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,12 +11,3 @@ Note that upgrading the propellor package will not update your
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.
-
-You can `git pull upstream` in your repository to update to the
-current upstream source, as distributed in the Debian package.
-
-In older versions of propellor, the upstream remote was pointed at
-the repository on github, so you may want to change it to point
-to the repository included in the Debian package:
-
- git config remote.upstream.url /usr/src/propellor/propellor.git
diff --git a/debian/changelog b/debian/changelog
index 286c5a8c..cd1ed61d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ 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
+ 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.
* Included the config.hs symlink to config-simple.hs in the cabal and Debian
packages.