summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f89783d)
Reletter the process steps to not skip State C and use more
traditional foreground and background colors for Process.html and
README.html. (Closes: #584521)
<html xmlns="http://www.w3.org/1999/xhtml"
lang="en" xml:lang="en">
<head>
<html xmlns="http://www.w3.org/1999/xhtml"
lang="en" xml:lang="en">
<head>
-<div style="text-align:right;font-size:70%;white-space:nowrap;">
- <a accesskey="h" href="http://www.debian.org/"> UP </a>
- |
- <a accesskey="H" href="http://wiki.debian.org/Teams/Policy"> HOME </a>
-</div>
-
<title>Debian Policy changes process</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<meta name="generator" content="Org-mode"/>
<title>Debian Policy changes process</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2009-09-13 16:13:52 CDT"/>
+<meta name="generated" content="2010-06-04 09:41:24 PDT"/>
<meta name="author" content="Margarita Manterola, Clint Adams, Russ Allbery, and Manoj Srivastava"/>
<meta name="description" content=""/>
<meta name="keywords" content=""/>
<meta name="author" content="Margarita Manterola, Clint Adams, Russ Allbery, and Manoj Srivastava"/>
<meta name="description" content=""/>
<meta name="keywords" content=""/>
font-weight:bold; }
body {
font-weight:bold; }
body {
- color: DarkSlateGrey;
- background-color: gainsboro;
+ color: black;
+ background-color: white;
font-family: Palatino, "Palatino Linotype", "Hoefler Text", "Times New Roman", Times, Georgia, Utopia, serif;
}
.org-agenda-date { color: #87cefa; }
font-family: Palatino, "Palatino Linotype", "Hoefler Text", "Times New Roman", Times, Georgia, Utopia, serif;
}
.org-agenda-date { color: #87cefa; }
- a {
- color: inherit;
- background-color: inherit;
- font: inherit;
- text-decoration: inherit;
- }
a:hover { text-decoration: underline; }
.todo { font-weight:bold; }
.done { font-weight:bold; }
a:hover { text-decoration: underline; }
.todo { font-weight:bold; }
.done { font-weight:bold; }
</head>
<body>
<div id="content">
</head>
<body>
<div id="content">
+<div id="org-div-home-and-up" style="text-align:right;font-size:70%;white-space:nowrap;">
+ <a accesskey="h" href="http://www.debian.org/"> UP </a>
+ |
+ <a accesskey="H" href="http://wiki.debian.org/Teams/Policy"> HOME </a>
+</div>
+
<h1 class="title">Debian Policy changes process</h1>
<h1 class="title">Debian Policy changes process</h1>
-<div id="outline-container-2.1" class="outline-3">
-<h3 id="sec-2.1">State A: Issue raised </h3>
-<div class="outline-text-3" id="text-2.1">
+<div id="outline-container-2_1" class="outline-3">
+<h3 id="sec-2_1">State A: Issue raised </h3>
+<div class="outline-text-3" id="text-2_1">
-<div id="outline-container-2.2" class="outline-3">
-<h3 id="sec-2.2">State B: Discussion </h3>
-<div class="outline-text-3" id="text-2.2">
+<div id="outline-container-2_2" class="outline-3">
+<h3 id="sec-2_2">State B: Discussion </h3>
+<div class="outline-text-3" id="text-2_2">
-<div id="outline-container-2.3" class="outline-3">
-<h3 id="sec-2.3">State D: Proposal </h3>
-<div class="outline-text-3" id="text-2.3">
+<div id="outline-container-2_3" class="outline-3">
+<h3 id="sec-2_3">State C: Proposal </h3>
+<div class="outline-text-3" id="text-2_3">
-<div id="outline-container-2.4" class="outline-3">
-<h3 id="sec-2.4">State E: Wording proposed </h3>
-<div class="outline-text-3" id="text-2.4">
+<div id="outline-container-2_4" class="outline-3">
+<h3 id="sec-2_4">State D: Wording proposed </h3>
+<div class="outline-text-3" id="text-2_4">
-<div id="outline-container-2.5" class="outline-3">
-<h3 id="sec-2.5">State F: Seconded </h3>
-<div class="outline-text-3" id="text-2.5">
+<div id="outline-container-2_5" class="outline-3">
+<h3 id="sec-2_5">State E: Seconded </h3>
+<div class="outline-text-3" id="text-2_5">
-<div id="outline-container-2.6" class="outline-3">
-<h3 id="sec-2.6">State G: Accepted </h3>
-<div class="outline-text-3" id="text-2.6">
+<div id="outline-container-2_6" class="outline-3">
+<h3 id="sec-2_6">State F: Accepted </h3>
+<div class="outline-text-3" id="text-2_6">
-<div id="outline-container-2.7" class="outline-3">
-<h3 id="sec-2.7">State H: Reject </h3>
-<div class="outline-text-3" id="text-2.7">
+<div id="outline-container-2_7" class="outline-3">
+<h3 id="sec-2_7">State G: Reject </h3>
+<div class="outline-text-3" id="text-2_7">
</div>
<div id="postamble">
<p class="author"> Author: Margarita Manterola, Clint Adams, Russ Allbery, and Manoj Srivastava
</div>
<div id="postamble">
<p class="author"> Author: Margarita Manterola, Clint Adams, Russ Allbery, and Manoj Srivastava
-<a href="mailto:srivasta@debian.org"><srivasta@debian.org></a>
-<p class="date"> Date: 2009-09-13 16:13:52 CDT</p>
-<p class="creator">HTML generated by org-mode 6.30trans in emacs 23</p>
+<p class="date"> Date: 2010-06-04 09:41:24 PDT</p>
+<p class="creator">HTML generated by org-mode 6.36c in emacs 23</p>
discussion and make a final proposal for what should be changed (if
anything), moving to the proposal tag.
discussion and make a final proposal for what should be changed (if
anything), moving to the proposal tag.
A final proposal has emerged from the discussion, and there is a rough
consensus on how to proceed to resolve the issue.
A final proposal has emerged from the discussion, and there is a rough
consensus on how to proceed to resolve the issue.
proposal, in which case one may skip this step and move directly to
patch tag.
proposal, in which case one may skip this step and move directly to
patch tag.
-** State E: Wording proposed
+** State D: Wording proposed
A patch against the Policy document reflecting the consensus has been
created and is waiting for formal seconds. The standard patch tag is
A patch against the Policy document reflecting the consensus has been
created and is waiting for formal seconds. The standard patch tag is
conclusion of rough consensus from the discussion should say so in the
bug log by seconding the proposal.
conclusion of rough consensus from the discussion should say so in the
bug log by seconding the proposal.
The proposal is signed off on by N Debian Developers. To start with,
we're going with N=3, meaning that if three Debian Developers agree,
The proposal is signed off on by N Debian Developers. To start with,
we're going with N=3, meaning that if three Debian Developers agree,
applies the patch and moves the proposal to the next state once enough
seconds are reached.
applies the patch and moves the proposal to the next state once enough
seconds are reached.
Change accepted, will be in next upload. The standard pending tag is
used for this state since it matches the regular meaning of
Change accepted, will be in next upload. The standard pending tag is
used for this state since it matches the regular meaning of
next Policy release, and there's nothing left to do except for upload
a new version of Policy.
next Policy release, and there's nothing left to do except for upload
a new version of Policy.
Rejected proposals. The standard wontfix is used for this
state. Normally, bugs in this state will not remain open; instead, a
Rejected proposals. The standard wontfix is used for this
state. Normally, bugs in this state will not remain open; instead, a
Debian Policy changes process
=============================
Debian Policy changes process
=============================
-Author: Margarita Manterola, Clint Adams, Russ Allbery, and Manoj Srivastava <srivasta@debian.org>
-Date: 2009-09-13 01:17:13 CDT
+Author: Margarita Manterola, Clint Adams, Russ Allbery, and Manoj Srivastava
+Date: 2010-06-04 09:41:23 PDT
[TAG: discussion]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=discussion
[TAG: discussion]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=discussion
==================
A final proposal has emerged from the discussion, and there is a rough
==================
A final proposal has emerged from the discussion, and there is a rough
[TAG: proposal]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=proposal
[TAG: proposal]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=proposal
-State E: Wording proposed
+State D: Wording proposed
==========================
A patch against the Policy document reflecting the consensus has been
==========================
A patch against the Policy document reflecting the consensus has been
[TAG: patch]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=patch
[TAG: patch]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=patch
==================
The proposal is signed off on by N Debian Developers. To start with,
==================
The proposal is signed off on by N Debian Developers. To start with,
[TAG: seconded]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=seconded
[TAG: seconded]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=seconded
==================
Change accepted, will be in next upload. The standard pending tag is
==================
Change accepted, will be in next upload. The standard pending tag is
[TAG: pending]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=pending
[TAG: pending]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=pending
================
Rejected proposals. The standard wontfix is used for this
================
Rejected proposals. The standard wontfix is used for this
font-weight:bold; }
body {
font-weight:bold; }
body {
- color: DarkSlateGrey;
- background-color: gainsboro;
+ color: black;
+ background-color: white;
font-family: Palatino, \"Palatino Linotype\", \"Hoefler Text\", \"Times New Roman\", Times, Georgia, Utopia, serif;
}
.org-agenda-date { color: #87cefa; }
font-family: Palatino, \"Palatino Linotype\", \"Hoefler Text\", \"Times New Roman\", Times, Georgia, Utopia, serif;
}
.org-agenda-date { color: #87cefa; }
- a {
- color: inherit;
- background-color: inherit;
- font: inherit;
- text-decoration: inherit;
- }
a:hover { text-decoration: underline; }
.todo { font-weight:bold; }
.done { font-weight:bold; }
a:hover { text-decoration: underline; }
.todo { font-weight:bold; }
.done { font-weight:bold; }
<html xmlns="http://www.w3.org/1999/xhtml"
lang="en" xml:lang="en">
<head>
<html xmlns="http://www.w3.org/1999/xhtml"
lang="en" xml:lang="en">
<head>
-<div style="text-align:right;font-size:70%;white-space:nowrap;">
- <a accesskey="h" href="http://www.debian.org/"> UP </a>
- |
- <a accesskey="H" href="http://wiki.debian.org/Teams/Policy"> HOME </a>
-</div>
-
<title>Debian Policy</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<meta name="generator" content="Org-mode"/>
<title>Debian Policy</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2009-10-05 00:20:29 CDT"/>
+<meta name="generated" content="2010-06-04 09:42:57 PDT"/>
<meta name="author" content="Manoj Srivastava And Russ Allbery"/>
<meta name="description" content=""/>
<meta name="keywords" content=""/>
<meta name="author" content="Manoj Srivastava And Russ Allbery"/>
<meta name="description" content=""/>
<meta name="keywords" content=""/>
font-weight:bold; }
body {
font-weight:bold; }
body {
- color: DarkSlateGrey;
- background-color: gainsboro;
+ color: black;
+ background-color: white;
font-family: Palatino, "Palatino Linotype", "Hoefler Text", "Times New Roman", Times, Georgia, Utopia, serif;
}
.org-agenda-date { color: #87cefa; }
font-family: Palatino, "Palatino Linotype", "Hoefler Text", "Times New Roman", Times, Georgia, Utopia, serif;
}
.org-agenda-date { color: #87cefa; }
- a {
- color: inherit;
- background-color: inherit;
- font: inherit;
- text-decoration: inherit;
- }
a:hover { text-decoration: underline; }
.todo { font-weight:bold; }
.done { font-weight:bold; }
a:hover { text-decoration: underline; }
.todo { font-weight:bold; }
.done { font-weight:bold; }
</head>
<body>
<div id="content">
</head>
<body>
<div id="content">
+<div id="org-div-home-and-up" style="text-align:right;font-size:70%;white-space:nowrap;">
+ <a accesskey="h" href="http://www.debian.org/"> UP </a>
+ |
+ <a accesskey="H" href="http://wiki.debian.org/Teams/Policy"> HOME </a>
+</div>
+
<h1 class="title">Debian Policy</h1>
<h1 class="title">Debian Policy</h1>
-<div id="outline-container-1.1" class="outline-3">
-<h3 id="sec-1.1">Interacting with the team </h3>
-<div class="outline-text-3" id="text-1.1">
+<div id="outline-container-1_1" class="outline-3">
+<h3 id="sec-1_1">Interacting with the team </h3>
+<div class="outline-text-3" id="text-1_1">
<p>
<local-branch-name> is some convenient name designating your local
changes. You may want to use some common prefix like local-. You can
<p>
<local-branch-name> is some convenient name designating your local
changes. You may want to use some common prefix like local-. You can
-<div id="outline-container-4.1" class="outline-3">
-<h3 id="sec-4.1">Maintenance procedures </h3>
-<div class="outline-text-3" id="text-4.1">
+<div id="outline-container-4_1" class="outline-3">
+<h3 id="sec-4_1">Maintenance procedures </h3>
+<div class="outline-text-3" id="text-4_1">
-<div id="outline-container-4.2" class="outline-3">
-<h3 id="sec-4.2">Repository layout </h3>
-<div class="outline-text-3" id="text-4.2">
+<div id="outline-container-4_2" class="outline-3">
+<h3 id="sec-4_2">Repository layout </h3>
+<div class="outline-text-3" id="text-4_2">
-<div id="outline-container-4.3" class="outline-3">
-<h3 id="sec-4.3">Managing a bug </h3>
-<div class="outline-text-3" id="text-4.3">
+<div id="outline-container-4_3" class="outline-3">
+<h3 id="sec-4_3">Managing a bug </h3>
+<div class="outline-text-3" id="text-4_3">
<p>
For the debian/changelog entry, use the following format:
</p>
<p>
For the debian/changelog entry, use the following format:
</p>
-<div id="outline-container-4.4" class="outline-3">
-<h3 id="sec-4.4">Updating branches </h3>
-<div class="outline-text-3" id="text-4.4">
+<div id="outline-container-4_4" class="outline-3">
+<h3 id="sec-4_4">Updating branches </h3>
+<div class="outline-text-3" id="text-4_4">
<p>
assuming that you haven't packed the refs in your repository.
</p>
<p>
assuming that you haven't packed the refs in your repository.
</p>
-<div id="outline-container-4.5" class="outline-3">
-<h3 id="sec-4.5">Making a release </h3>
-<div class="outline-text-3" id="text-4.5">
+<div id="outline-container-4_5" class="outline-3">
+<h3 id="sec-4_5">Making a release </h3>
+<div class="outline-text-3" id="text-4_5">
<p>
replacing the version number with the version of the release, of course.
</p>
<p>
replacing the version number with the version of the release, of course.
</p>
-<div id="outline-container-4.6" class="outline-3">
-<h3 id="sec-4.6">Setting release goals </h3>
-<div class="outline-text-3" id="text-4.6">
+<div id="outline-container-4_6" class="outline-3">
+<h3 id="sec-4_6">Setting release goals </h3>
+<div class="outline-text-3" id="text-4_6">
</div>
<div id="postamble">
<p class="author"> Author: Manoj Srivastava And Russ Allbery
</div>
<div id="postamble">
<p class="author"> Author: Manoj Srivastava And Russ Allbery
-<a href="mailto:srivasta@debian.org"><srivasta@debian.org></a>
-<p class="date"> Date: 2009-10-05 00:20:29 CDT</p>
-<p class="creator">HTML generated by org-mode 6.31trans in emacs 23</p>
+<p class="date"> Date: 2010-06-04 09:42:57 PDT</p>
+<p class="creator">HTML generated by org-mode 6.36c in emacs 23</p>
Debian Policy
=============
Debian Policy
=============
-Author: Manoj Srivastava And Russ Allbery <srivasta@debian.org>
-Date: 2009-09-15 15:48:35 CDT
+Author: Manoj Srivastava And Russ Allbery
+Date: 2010-06-04 09:42:57 PDT
against the current Git master branch to the bug report, if you're not
familiar with Git, the following commands are the basic process:
against the current Git master branch to the bug report, if you're not
familiar with Git, the following commands are the basic process:
git clone git://git.debian.org/git/dbnpolicy/policy.git
git checkout -b <local-branch-name>
git clone git://git.debian.org/git/dbnpolicy/policy.git
git checkout -b <local-branch-name>
git checkout master
git pull
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.
- # 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>
# Checkout the local branch, to create the patch to send to the policy
git checkout <local-branch-name>
--to debian-policy@lists.debian.org \
$dir/
--to debian-policy@lists.debian.org \
$dir/
<local-branch-name> is some convenient name designating your local
changes. You may want to use some common prefix like local-. You can
use git format-patch and git send-email if you want, but usually it's
<local-branch-name> is some convenient name designating your local
changes. You may want to use some common prefix like local-. You can
use git format-patch and git send-email if you want, but usually it's
+ Delete the now-merged branch.
The Git commands used for this workflow are:
+ Delete the now-merged branch.
The Git commands used for this workflow are:
git checkout -b bug12345-rra master
# edit files
# git add files
git checkout -b bug12345-rra master
# edit files
# git add files
# update your local master branch
git checkout master
git pull
# 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 checkout master
+ git merge --no-commit bug12345-rra
- git checkout bug12345-rra; git branch -D temp
- git merge master
+
+ # 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
git checkout master
git merge bug12345-rra
# edit debian/changelog and upgrading-checklist.html
git branch -d bug12345-rra
git push origin :bug12345-rra
git branch -d bug12345-rra
git push origin :bug12345-rra
For the debian/changelog entry, use the following format:
For the debian/changelog entry, use the following format:
* <document>: <brief change description>
Wording: <author of wording>
Seconded: <seconder>
Seconded: <seconder>
Closes: <bug numbers>
* <document>: <brief change description>
Wording: <author of wording>
Seconded: <seconder>
Seconded: <seconder>
Closes: <bug numbers>
* Policy: better document version ranking and empty Debian revisions
Wording: Russ Allbery <rra@debian.org>
Seconded: Raphaël Hertzog <hertzog@debian.org>
* Policy: better document version ranking and empty Debian revisions
Wording: Russ Allbery <rra@debian.org>
Seconded: Raphaël Hertzog <hertzog@debian.org>
Seconded: Guillem Jover <guillem@debian.org>
Closes: #186700, #458910
Seconded: Guillem Jover <guillem@debian.org>
Closes: #186700, #458910
Updating branches
==================
Updating branches
==================
Policy team member, you will generally want to update your working bug
branches. The equivalent of the following commands should do that:
Policy team member, you will generally want to update your working bug
branches. The equivalent of the following commands should do that:
for i in `git show-ref --heads | awk '{print $2}'`; do
j=$(basename $i)
if [ "$j" != "master" ]; then
for i in `git show-ref --heads | awk '{print $2}'`; do
j=$(basename $i)
if [ "$j" != "master" ]; then
done
git push --all origin
done
git push --all origin
assuming that you haven't packed the refs in your repository.
Making a release
assuming that you haven't packed the refs in your repository.
Making a release
Then, tag the repository and push the final changes to Alioth:
Then, tag the repository and push the final changes to Alioth:
git tag -s v3.8.0.0
git push origin
git push --tags origin
git tag -s v3.8.0.0
git push origin
git push --tags origin
replacing the version number with the version of the release, of course.
Finally, announce the new Policy release on debian-devel-announce,
replacing the version number with the version of the release, of course.
Finally, announce the new Policy release on debian-devel-announce,
list can be trivially produced by dpkg-architecture -L (already
noted), is very long, and quickly becomes out-of-date.
* Move silly version ordering example to a footnote. (Closes: #560839)
list can be trivially produced by dpkg-architecture -L (already
noted), is very long, and quickly becomes out-of-date.
* Move silly version ordering example to a footnote. (Closes: #560839)
+ * Reletter the process steps to not skip State C and use more
+ traditional foreground and background colors for Process.html and
+ README.html. (Closes: #584521)
-- Bill Allombert <ballombe@debian.org> Mon, 31 May 2010 20:00:28 +0200
-- Bill Allombert <ballombe@debian.org> Mon, 31 May 2010 20:00:28 +0200
projects / debian / debian-policy.git / commitdiff