[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 02e6f41efbea8858e6ef6b999fcfce7685d0b2ae

Antti-Juhani Kaijanaho ajk at debian.org
Sat Oct 27 14:52:09 UTC 2007


The branch, master has been updated
       via  02e6f41efbea8858e6ef6b999fcfce7685d0b2ae (commit)
       via  f06386c6ab7a1d868f04e5d5d844d54478608955 (commit)
      from  87049c13f581dd293257bb4462b89b70a059607f (commit)


- Shortlog ------------------------------------------------------------
02e6f41 Add a .gitignore file
f06386c Switch to Git and define best practices for push access

Summary of changes:
 .gitignore       |   17 +++++++++++++++
 debian/README    |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 debian/changelog |    4 +-
 debian/control   |    3 +-
 4 files changed, 77 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 02e6f41efbea8858e6ef6b999fcfce7685d0b2ae
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Sat Oct 27 17:45:16 2007 +0300

    Add a .gitignore file
    
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..162cb68
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+*~
+*.bak
+*.d
+*.o
+*.mo
+*.a
+man/grep-dctrl.1
+po/dctrl-tools.pot
+grep-dctrl
+join-dctrl
+tbl-dctrl
+sort-dctrl
+sync-available
+debian/files
+debian/stamp
+debian/substvars
+debian/tmp

commit f06386c6ab7a1d868f04e5d5d844d54478608955
Author: Antti-Juhani Kaijanaho <antti-juhani at kaijanaho.fi>
Date:   Sat Oct 27 17:06:39 2007 +0300

    Switch to Git and define best practices for push access
    
    The best practices include the new recommendation of doing Linux-style
    signoffs that assert the Developer's Cerificate of Origin by implied
    reference.
    
    The DCO is committed separately on its own (detached) branch so that
    we don't contaminate the package with its CC-by-sa/2.5 license.  I believe
    that the DCO is merely aggregated with dctrl-tools in Git, and that this
    does not make dctrl-tools derivative of the DCO.
    
    Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani at kaijanaho.fi>

diff --git a/debian/README b/debian/README
index be32b67..7e1aaf7 100644
--- a/debian/README
+++ b/debian/README
@@ -1,3 +1,4 @@
+                             Mailing list
 
 Developers and users interested in the future of dctrl-tools
 (grep-dctrl and friends) are encouraged to subscribe to the
@@ -6,7 +7,59 @@ dctrl-tools-devel mailing list at
 Early versions are available in the experimental distribution of
 Debian.
 
-Source is managed under darcs; if you want to contribute, please read
-  http://people.debian.org/~ajk/dctrl-tools-darcs.html
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 17 Jul 2004 04:31:34 +0300
+                          Source management
+
+Source is managed with git under collab-maint/dctrl-tools.git.  If you
+are a Debian developer or have collab-maint guest privileges, you can
+do
+  git clone ssh://USERNAME@git.debian.org/git/collab-maint/dctrl-tools.git
+For anonymous checkouts, use
+  git clone http://git.debian.org/git/collab-maint/dctrl-tools.git
+
+Anybody may submit proposed changes as git-format-patch(1) mails to
+the mailing list.
+
+Rules of conduct for people with push access to the repository:
+
+  - Commits should be signed off by the submitter and anybody who
+    contributed copyrightable stuff to that commit; a line of the form
+
+      Signed-off-by: Contributor's Name <contributors at email.example>
+
+    in the commit message signifies that the contributor identified on
+    that line asserts the Developer's Certificate of Origin 1.1 for
+    that particular contribution.
+
+    The authoritative version of the Developer's Certificate of Origin
+    for this project is in the Git blob
+    c930ac94c745efafe5a6fb4bbe12def76b3af994; Antti-Juhani Kaijanaho
+    believes that it is identical to the document of the same name
+    used in Linux and other projects.  That blob can be accessed in a
+    Git repository that contains it by the command git-cat-file blob
+    c930ac94c745efafe5a6fb4bbe12def76b3af994
+
+  - The maintainer reserves the right to veto changes; it is good form
+    to discuss nontrivial changes on the mailing list (see above) before
+    pushing so no reverts have to be made.
+
+  - Simple bugfixes and translation updates may be pushed by anybody
+    at any time.
+
+  - Anything committed or merged to master (and any release
+    maintenance branches) must compile and pass the test suite at
+    least on the committer or merger's development machine; use topic
+    branches for instable development.
+
+  - Include an update of debian/changelog in your commits.  One-line
+    summary of the commit is sufficient, as you can elaborate in the
+    commit log and in comments you might add to the source.
+    
+  - Make sure that the distribution in debian/changelog is UNRELEASED
+    unless the commit is about preparing a release; the top line in
+    debian/changelog should look like
+
+      dctrl-tools (2.12) UNRELEASED; urgency=low
+
+    (where 2.12 is the expected version number of the next release,
+    and "low" may be replaced by any other valid urgency value).
diff --git a/debian/changelog b/debian/changelog
index f09195c..edb043f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 dctrl-tools (2.12) UNRELEASED; urgency=low
 
-  * 
+  * Switched to git for source control.
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sun, 05 Aug 2007 21:30:57 +0300
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Sat, 27 Oct 2007 16:53:22 +0300
 
 dctrl-tools (2.11) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b88479b..14ad064 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Antti-Juhani Kaijanaho <ajk at debian.org>
 Standards-Version: 3.7.2
 Build-Depends: gettext (>= 0.11-0), gcc (>= 3.0)
-XS-Vcs-Darcs: http://antti-juhani.kaijanaho.fi/darcs/dctrl-tools/
+XS-Vcs-Git: http://git.debian.org/git/collab-maint/dctrl-tools.git
+XS-Vcs-Browser: http://git.debian.org/?p=collab-maint/dctrl-tools.git;a=summary
 
 Package: dctrl-tools
 Architecture: any

-- 
Debian control file query tools



More information about the Dctrl-tools-devel mailing list