From 7d59dee4690297154f6924a04949413ddea8a17b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Aug 2014 15:02:12 -0400 Subject: local repo fully working now --- debian/README.Debian | 18 ++++++++++++------ debian/lintian-overrides | 2 -- 2 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 debian/lintian-overrides (limited to 'debian') diff --git a/debian/README.Debian b/debian/README.Debian index 73fea47d..9fa53c7b 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -7,10 +7,16 @@ 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. +~/.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. -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/ +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/lintian-overrides b/debian/lintian-overrides deleted file mode 100644 index a5ccccae..00000000 --- a/debian/lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# These files are used in a git repository that propellor sets up. -propellor: package-contains-vcs-control-file usr/src/propellor/.gitignore -- cgit v1.3-2-g0d8e