--*- mode: org; fill-column: 78 -*-
+# -*- mode: org; fill-column: 78 -*-
#+STARTUP: showall
#+STARTUP: lognotedone lognotestate
#+OPTIONS: H:4 toc:2
#+OPTIONS: H:3 num:nil toc:nil \n:nil @:t ::t |:t ^:t -:t f:t *:t TeX:t LaTeX:nil skip:t d:nil tags:not-in-toc
#+LINK_HOME: http://wiki.debian.org/Teams/Policy
#+LINK_UP: http://www.debian.org/
-
-\usepackage{landscape}
-
-\setlength{\oddsidemargin}{0in} % default=0in
-\setlength{\textwidth}{9in} % default=9in
-
-\setlength{\columnsep}{0.5in} % default=10pt
-\setlength{\columnseprule}{1pt} % default=0pt (no line)
-
-\setlength{\textheight}{5.85in} % default=5.15in
-\setlength{\topmargin}{-0.15in} % default=0.20in
-\setlength{\headsep}{0.25in} % default=0.35in
-
-\setlength{\parskip}{1.2ex}
-\setlength{\parindent}{0mm}
-\pagestyle{empty}
-
-\setlength{\headheight}{0pt}
-\setlength{\headsep}{0pt}
-\setlength{\footskip}{5pt}
-\setlength{\textheight}{9.0in}
-\setlength{\textwidth}{6.5in}
-
-
+#+LATEX_HEADER: \input{README-header.tex}
* Infrastructure
+ Website:: http://www.debian.org/doc/devel-manuals#policy
+ Mailing list:: debian-policy@lists.debian.org lists
+ Source Code::
- * git clone git://git.debian.org/git/dbnpolicy/policy.git
- * Browser: http://git.debian.org/?p=dbnpolicy/policy.git
+ * git clone git://anonscm.debian.org/dbnpolicy/policy.git
+ * Browser: http://anonscm.debian.org/gitweb/?p=dbnpolicy/policy.git
+ Unix group:: dbnpolicy
+ Alioth Project:: http://alioth.debian.org/projects/dbnpolicy (exists
to manage the repository but not otherwise used)
familiar with Git, the following commands are the basic process:
#+BEGIN_SRC Sh
-git clone git://git.debian.org/git/dbnpolicy/policy.git
+git clone git://anonscm.debian.org/dbnpolicy/policy.git
git checkout -b <local-branch-name>
# edit files, but don't make changes to upgrading-checklist or debian/changelog
git checkout master
git pull
-# If there are changes in master that make the branch not apply cleanly:
- : git checkout -b temp master; git merge <local-branch-name>
-# If error, reset temp, merge master into local; else skip these three lines
- : git reset --hard HEAD;
- : git checkout <local-branch-name>;
+git checkout master
+git merge --no-commit <local-branch-name>
+git reset --hard HEAD;
+git checkout <local-branch-name>;
+
+# If there are changes in master that make the branch not apply cleanly, there
+# should have been en error during the merge step above. If there was an
+# error, merge the master branch into the local branch, fix the conflicts, and
+# commit the new version of the local branch.
: git merge master
-# get rid of the temp branch:
- : git branch -D temp
+# Edit files to remove conflict
+ : git commit -s
# Checkout the local branch, to create the patch to send to the policy
git checkout <local-branch-name>
work: shepherd proposals, propose wording, and merge changes when
consensus has been reached. The current delegates are:
-+ Russ Allbery
-+ Bill Allombert
-+ Andrew McMillan
-+ Manoj Srivastava
-+ Colin Watson (cjwatson)
++ Andreas Barth (aba)
++ Bill Allombert (ballombe)
++ Jonathan Nieder (jrnieder)
++ Russ Allbery (rra)
+
+* Task description
+
+The Debian Policy team is responsible for maintaining and coordinating
+updates to the Debian Policy Manual and all the other policy documents
+released as part of the "debian-policy" package.
-The special tasks of Policy delegates are:
+The Debian Policy Editors:
-+ Commit access to the Git repository and uploads of the debian-policy
- package itself, which makes them responsible for debian-policy as a
- package in Debian and for making final decisions about when a new
- version is released and what bits go into it.
-+ Rejecting proposals. Anyone can argue against a proposal, but only
- Policy delegates can formally reject it.
-+ Counting seconds and weighing objections to proposals to determine
- whether the proposal has sufficient support to be included.
++ Guide the work on the Debian Policy Manual and related documents as a
+ collaborative process where developers review and second or object to
+ proposals, usually on the debian-policy mailing list.
+
++ Count seconds and weight objections to proposals, to determine whether
+ they have reached sufficient consensus to be included, and accept
+ consensual proposals.
+
++ Reject or refer to the Technical Committee proposals that fail to
+ reach consensus.
+
++ Commit changes to the version control system repository used to
+ maintain the Debian Policy Manual and related documents.
+
++ Maintain the "debian-policy" package. As package maintainers, they
+ have the last word on package content, releases, bug reports, etc.
Everything else can be done by anyone, or any DD (depending on the
outcome of the discussion about seconding). We explicitly want any
participation, the better. Many other people are active on the Policy
mailing list without being project delegates.
-* Task description
-
-The Debian Policy team is responsible for maintaining and coordinating
-updates to the technical Policy manuals for the project. The primary
-output of the team is the Debian Policy Manual and the assorted
-subpolicies, released as the debian-policy Debian package and also
-published at [[http://www.debian.org/doc/]].
-
In addition to the main technical manual, the team currently also maintains:
++ [[http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/][Machine-readable debian/copyright format]]
+ [[http://www.debian.org/doc/packaging-manuals/menu-policy/][Debian Menu sub-policy]]
+ [[http://www.debian.org/doc/packaging-manuals/perl-policy/][Debian Perl Policy]]
-+ [[http://www.debian.org/doc/packaging-manuals/mime-policy/][Debian MIME support sub-policy]]
+ [[http://www.debian.org/doc/packaging-manuals/debconf_specification.html][Debconf Specification]]
+ [[http://www.debian.org/doc/packaging-manuals/virtual-package-names-list.txt][Authoritative list of virtual package names ]]
# update your local master branch
git checkout master
git pull
-# If there are changes in master that make the branch not apply cleanly:
-: git checkout -b temp master; git merge bug12345-rra
-# If error;
-: git reset --hard HEAD;
-: git checkout bug12345-rra; git branch -D temp
-: git merge master
+
+git checkout master
+git merge --no-commit bug12345-rra
+git reset --hard HEAD;
+
+# If there are changes in master that make the branch not apply cleanly, there
+# should have been en error during the merge step above. If there was an
+# error, merge the master branch into the local branch, fix the conflicts, and
+# commit the new version of the local branch.
+ : git checkout bug12345-rra
+ : git merge master
+# Edit files to remove conflict
+ : git commit -s
+
git checkout master
git merge bug12345-rra
# edit debian/changelog and upgrading-checklist.html
projects / debian / debian-policy.git / blobdiff