[Pkg-voip-commits] r9454 - /README

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Tue Jan 31 11:05:09 UTC 2012


Author: tzafrir
Date: Tue Jan 31 11:05:08 2012
New Revision: 9454

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9454
Log:
README: remove section numbers. We now use asciidoc copy

We now use the asciidoc-formatted copy of this file, at
http://pkg-voip.alioth.debian.org/README.html . See instructions at the
end of the commit. No need for manual section numbering.

TODO: have this replace index.html completely?

Modified:
    README

Modified: README
URL: http://svn.debian.org/wsvn/pkg-voip/README?rev=9454&op=diff
==============================================================================
--- README (original)
+++ README Tue Jan 31 11:05:08 2012
@@ -1,8 +1,8 @@
 Debian VoIP Team
 ================
 
-1. Contacts
-------------
+Contacts
+--------
 We have two different lists. The only "human" list is the maintainers list. 
 The other has the only purpose of holding mails from SVN commits.
 
@@ -11,8 +11,8 @@
 
 IRC: #debian-voip on irc.debian.org
 
-2. Subversion repository
-------------------------
+Subversion repository
+---------------------
 You can browse it only at:
 
 http://anonscm.debian.org/viewvc/pkg-voip/
@@ -84,14 +84,13 @@
 this to your logon scripts)
 
 
-3. Using svn-buildpackage
---------------------------
-
+Using svn-buildpackage
+----------------------
 Packages with an upstream tarball will require you to set the mergeWithUpstream
 property first (from the package root) so that svn-buildpackage will look for
 the .orig.tar.gz in the ../tarballs directory.
 	
-	% svn propset mergeWithUpstream 1 debian
+  % svn propset mergeWithUpstream 1 debian
 
 Please note that this only works for packages which have only the debian/
 directory committed. Consequently, you must modify upstream sources indirectly
@@ -106,12 +105,12 @@
 
 After you have finished and committed your Debian patches via
 	
-	% svn commit [PACKAGE]
+  % svn commit [PACKAGE]
 
 as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
 your package with the following commands:
 
-	% svn-buildpackage -rfakeroot
+  % svn-buildpackage -rfakeroot
 
 You might want to add --svn-ignore-new to the flags if you do not want to
 commit before having finished your testbuild. Further, if you use debuild and
@@ -119,7 +118,7 @@
 this to svn-buildpackage.
 
 svn-buildpackage provides svn-do, which you may find useful:
-	% /usr/share/svn-buildpackage/contrib/svn-do
+  % /usr/share/svn-buildpackage/contrib/svn-do
 It executes svn-buildpackage --svn-export and enters that directory. After
 you change the tree as you like, exit the shell; your changes will be copied
 back to your working tree.
@@ -176,8 +175,8 @@
 the other manipulation like bug fowarding etc. using the "bts" commandline tool
 may come in handy.
 
-4. Tarballs and Build-area directories
---------------------------------------
+Tarballs and Build-area directories
+---------------------------------
 You need to place those dirs in the parent directory of the one from which you're 
 running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs 
 in 'pkgname'/ dir, at the same level as trunk/
@@ -194,8 +193,8 @@
 "debrelease" command from the trunk/ directory after running svn-buildpackage
 --svn-tag.
 
-5. Using svn-inject
--------------------
+Using svn-inject
+----------------
 To inject a new package into the Debian VoIP SVN archive you should use svn-inject(1)
 as follows:
 	
@@ -206,17 +205,15 @@
 package.orig.tar.gz to your tarballs directory.  The -o option is important as 
 this ensures that we 'Only keep modified files under SVN control'
 
-6. Patch management systems
----------------------------
+Patch management systems
+------------------------
 Since all of our packages use mergeWithUpstream (we only keep debian/ in the
 repository) a patch management system should be used to make changes to
-upstream files.
-Most of the packages use dpatch, except a few that use quilt. The latter is
-recommended for big patchsets, even though it could be used for small ones, if
-the maintainer prefers it.
-
-6.1. dpatch
-~~~~~~~~~~~
+upstream files. Most of the packages use '3.0 (quilt)' format. Some still
+use manual quilt or dpatch.
+
+dpatch
+~~~~~~
 Using dpatch is as easy as putting
 -------------------------------------------------
 	include /usr/share/dpatch/dpatch.make
@@ -226,8 +223,8 @@
 upon on configure and clean respectively. For clean you'll need to make sure
 unpatch is run after the regular cleanup or rerun builds will fail in clean.
 
-6.2. quilt
-~~~~~~~~~~
+quilt
+~~~~~
 Similarly, using quilt is as easy as putting
 -------------------------------------------------
 	include /usr/share/quilt/quilt.make
@@ -253,8 +250,8 @@
 -------------------------------------------------
 Consult quilt(1) for more information of what these options do.
 
-7. Versioning 
--------------
+Versioning 
+----------
 As the autobuilder and fellow developers will need to differentiate between
 versions that are uploaded into debian already and those which will be at a
 later point, do use the UNRELEASED distribution until the time you actually do
@@ -262,8 +259,8 @@
 final step if that sponsor has SVN commit rights to the pkg-voip archive.
 
 
-8. Automatic Backport hooks
----------------------------
+Automatic Backport hooks
+------------------------
 The checkout script for putting together the sources can run a backports hook
 for certain dists (like Debian sarge) which need certain adjustments to the
 source like altered Build-Depends. This hook is a plain shell script (or
@@ -274,8 +271,8 @@
 what to do.
 
 
-9. Building from debcheckout
-----------------------------
+Building from debcheckout
+-------------------------
 This section is for someone who does not normally build pkg-voip 
 packages and wants to build the latest version of a certain package 
 without all the extra setup mentioned above.
@@ -299,6 +296,16 @@
 
 -(snip)-
 
+
+This file
+---------
+This file is a asciidoc-formatted file that resides on the top-level
+directory of the pkg-voip team's subversion repository. Once you updated
+it and commited the changes, run the following to apply them:
+
+  ssh wagner.debian.org 'make -C /home/groups/pkg-voip/htdocs clean all'
+
+
 In case any of the above is unclear to you or seems outdated, please drop us
 a note to the maintainers list.
 




More information about the Pkg-voip-commits mailing list