[Pkg-jed-commit] [SCM] www branch, master, updated. 49bac2bb7e8e058a4c5836c03865d5571678eb40
Rafael Laboissiere
rafael at debian.org
Sun Apr 26 14:26:58 UTC 2009
The following commit has been merged in the master branch:
commit e58f1b41c4deff0b6c5d5423e8f7a0186d81f535
Author: Rafael Laboissiere <rafael at debian.org>
Date: Sun Apr 26 15:47:56 2009 +0200
Do not use certain UTF-8 characters, otherwise py.rest fails
diff --git a/DJG-Guidelines.txt b/DJG-Guidelines.txt
index 9f64953..e58e783 100644
--- a/DJG-Guidelines.txt
+++ b/DJG-Guidelines.txt
@@ -191,8 +191,8 @@ this::
4. GIT repository
-----------------
-In the GIT repositories we track in the branch “upstream” the upstream
-source and in the branch “master” we track the package development. For
+In the GIT repositories we track in the branch "upstream" the upstream
+source and in the branch "master" we track the package development. For
this we merge in the upstream branch on a regular basis.
+---o---D---o---o---o---E---+---o---o---F master
@@ -208,8 +208,8 @@ or start hacking the source.
Patches to the upstream source must still be dpatches (or anything
similar) to make the Debian source package as much as useful. With
dpatches it's easy to see which changes belong together and it's easy to
-disable some changes. The command “git diff --stat upstream..master” must
-only list files in the subdirectory “debian.”
+disable some changes. The command "git diff --stat upstream..master" must
+only list files in the subdirectory "debian."
4.1 One Debian release cycle
----------------------------
@@ -276,7 +276,7 @@ index f1ccf3b..1f95cae 100644
+ -- Jörg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
+
slrn (0.9.9~pre99-1) unstable; urgency=high
-
+
* This packages is based on the svn snapshot from
Now, you should start a new branch for the changes you want to do. Name
@@ -292,7 +292,7 @@ this, e.g. update the dpatches.
After you brought the package in shape, you should start making other
changes. But keep the following commit policy in mind:
-· The package must build after every commit—except of the first few
+· The package must build after every commit---except of the first few
commits of a new cycle needed to bring the package in shape.
· Every commit should change only one thing. Don't so summary commits.
@@ -300,8 +300,8 @@ changes. But keep the following commit policy in mind:
· Do all changes needed for a change, e.g. update the debian/changelog,
if necessary, update debian/patches/00list and so on. Ask yourself the
- question: “If my change gets reverted, is it enough to revert this
- patch?”
+ question: "If my change gets reverted, is it enough to revert this
+ patch?"
· Describe in the commit message, what you want to do and why you want to
do it. You have much more space in the commit message than in the
@@ -336,7 +336,7 @@ The history shouldn't look like this:
· improve spelling of funny stuff
GIT gives you the tools to fix the history of your branch
-“work-$YOUR_SIGN.” Don't do this in the branch “master!”
+"work-$YOUR_SIGN." Don't do this in the branch "master!"
You can change the last commit with the option --amend [1] or you can use
rebase [2] to make changes like joining, reordering, removing and editing
@@ -387,20 +387,20 @@ index 591c5c4..d4e5168 100644
@@ -1,4 +1,4 @@
-slrn (0.9.9~pre102-1) UNRELEASED; urgency=low
+slrn (0.9.9~pre102-1) unstable; urgency=low
-
+
* This packages is based on the svn snapshot from
https://slrn.svn.sourceforge.net/svnroot/slrn/trunk
@@ -40,7 +40,9 @@ slrn (0.9.9~pre102-1) UNRELEASED; urgency=low
* Dropped the dpatch 206_branding, because I don't see what's the value
of this patch except for fun.
-
+
- -- Jörg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
+ * Upload sponsored by Norbert Tretkowski
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Sat, 26 Apr 2008 16:19:22 +0200
-
+
slrn (0.9.9~pre99-1) unstable; urgency=high
-
+
(`view history`_)
(`view source`_)
--
www
More information about the Pkg-jed-commit
mailing list