[Python-modules-commits] [python-modules] 01/01: * GOML * Add a super dumb Makefile for lawn curmudgeons.
Barry Warsaw
barry at moszumanska.debian.org
Mon Nov 2 22:44:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch git-policy
in repository python-modules.
commit 4538919ae628ed954e2b69395f01f0d793f7a1c4
Author: Barry Warsaw <barry at python.org>
Date: Mon Nov 2 17:43:13 2015 -0500
* GOML
* Add a super dumb Makefile for lawn curmudgeons.
---
Makefile | 7 +++++++
policy.rst | 18 +++++++++---------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..135709f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,7 @@
+%.html: %.rst
+ rst2html $< > $@
+
+all: policy.html
+
+install: all
+ scp policy.* alioth:/srv/alioth.debian.org/chroot/home/groups/python-modules/htdocs/
diff --git a/policy.rst b/policy.rst
index 92d8dc5..cb73f00 100644
--- a/policy.rst
+++ b/policy.rst
@@ -25,7 +25,7 @@ Joining the team
================
The team is open to any Python-related package maintainer. To be added to
-the team, please send your request to debian-python at lists.debian.org. Include
+the team, please send your request to debian-python at lists.debian.org. Include
the following in your request:
* Why you want to join the team: e.g. maintain your current packages within
@@ -90,10 +90,10 @@ DPMT git repos are **source-full**, meaning they contain both the upstream
source and the ``debian/`` directory.
DPMT requires a pristine-tar branch, and only upstream tarballs can be used to
-advance the upstream branch. Complete upstream git history should be avoided
+advance the upstream branch. Complete upstream git history should be avoided
in the upstream branch.
-Deviations from this policy are strongly discouraged. When you must (not want
+Deviations from this policy are strongly discouraged. When you must (not want
to) deviate, you MUST include a ``debian/README.source`` file explaining the
rationale for the deviation and the details of working with the package's git
repo.
@@ -102,16 +102,16 @@ repo.
Tools
-----
-Do *not* create ``quilt`` patches directly. Instead, use ``git-dpm
+Do *not* create ``quilt`` patches directly. Instead, use ``git-dpm
checkout-patched`` to enter a patch branch, edit the files, commit them, and
then use ``git-dpm update-patches`` to switch back to the master branch, with
-the commits turned into patches. Use the pseudo header ``Patch-Name`` in the
+the commits turned into patches. Use the pseudo header ``Patch-Name`` in the
commit message to control what the patch file will be named, e.g.::
Patch-Name: fix-the-foo.patch
Use ``git-dpm tag`` to tag the repository when you upload a new release of the
-package. See below for the required tag format.
+package. See below for the required tag format.
Branch names
@@ -119,15 +119,15 @@ Branch names
Currently, we require the following branch names in the git repo:
-* master - The Debianized upstream source directory. This contains both the
+* master - The Debianized upstream source directory. This contains both the
upstream source and a ``debian/`` packaging directory.
* pristine-tar - Contains the standard ``pristine-tar`` deltas.
-* upstream - The un-Debianized upstream source. This is what you get when you
+* upstream - The un-Debianized upstream source. This is what you get when you
unpack the upstream tarball.
In some cases you may need to have additional branches, such as if you have
deltas for downstream distributions (e.g. Ubuntu) or need to maintain multiple
-versions for security releases in previous versions of Debian. In those
+versions for security releases in previous versions of Debian. In those
cases, follow the `DEP-14 <http://dep.debian.net/deps/dep14/>`__ guidelines,
and document them in ``debian/README.source``.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/tools/python-modules.git
More information about the Python-modules-commits
mailing list