[debian-edu-commits] [SCM] Debian package debian-edu-doc branch, master, updated. 1.4_20120925_6.0.6-55-gf9fa3b8

Sat Feb 16 03:06:24 UTC 2013

The following commit has been merged in the master branch:
commit 541d3c8735b5689db7036f230fe55dd9baaa36d6
Author: David Prévot <taffit at debian.org>
Date:   Fri Feb 8 18:34:25 2013 -0400

    Update internal doc to the new Git repository

diff --git a/debian/README.source b/debian/README.source
index 730aec8..0fd01af 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,16 +1,16 @@
 Building an updated version of the package
 ------------------------------------------
 
-To update the release-manual and the itil document from their sources in the 
-wiki, you need an internet connection and the subversion, libxml2-utils and 
+To update the manuals from their source in the 
+wiki, you need an Internet connection and the git, libxml2-utils and 
 po4a packages installed.
-(For building it, you need its build-depends installed. Translators please see
-the README.release-manual-translations.)
+(To build it, you need its build-depends installed. Translators please see
+README.$name-manual-translations.)
 
-Run "./debian/rules get-orig-source" to update the source to prepare building
+Run "make get-orig-source" to update the source to prepare building
 and before building and uploading it to the archive.
 
 Then just use "debuild" to build the package.
 
 
--- Holger Levsen, holger at debian.org, last updated: 2009-19-07
+-- Holger Levsen, holger at debian.org, last updated: 2013-02-08
diff --git a/debian/changelog b/debian/changelog
index 06ed139..56b6780 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ debian-edu-doc (1.4~20121218~6.0.6+r1) UNRELEASED; urgency=low
   * Update manuals and images from the wiki.
   * Update debian/copyright.
   * README: mention the Danish translation among the complete ones.
+  * Update internal doc to the new Git repository, thanks to Wolfgang Schweer
+    for the review and extra comments.
 
   [ Updated squeeze manual translations ]
   * German (Wolfgang Schweer).
diff --git a/debian/control b/debian/control
index c7fecd0..94fdf37 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Uploaders: Holger Levsen <holger at debian.org>,
  David Prévot <taffit at debian.org>
 Standards-Version: 3.9.3
 Homepage: http://wiki.debian.org/DebianEdu/Documentation/Squeeze
-Vcs-Svn: svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc/
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-edu/trunk/src/debian-edu-doc/
+Vcs-Git: git://anonscm.debian.org/debian-edu/debian-edu-doc.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-edu/debian-edu-doc.git;a=summary
 
 Package: debian-edu-doc-en
 Depends: ${misc:Depends}
diff --git a/debian/copyright.packaging b/debian/copyright.packaging
index 1965d96..377cd51 100644
--- a/debian/copyright.packaging
+++ b/debian/copyright.packaging
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: debian-edu-doc
-Upstream-Source: svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc
+Upstream-Source: git://anonscm.debian.org/debian-edu/debian-edu-doc.git
 
 Files: documentation/rosegarden/images/*
 Copyright: 2008 Alf Tonny Bätz <alfton at gmail.com> 
diff --git a/documentation/common/README.common-translations b/documentation/common/README.common-translations
index 3ade20c..f2ef446 100644
--- a/documentation/common/README.common-translations
+++ b/documentation/common/README.common-translations
@@ -31,9 +31,10 @@ How to start a translation
 Simply copy the POT file as a PO file:
 
 $ cp ##NAME##.pot ##NAME##.da.po	# create a new Danish PO file
-$ svn add ##NAME##.da.po				# add it to Subversion
+$ git add ##NAME##.da.po				# add it to the VCS
 $ vi ##NAME##.da.po					# better use Lokalize for this :)
-$ svn ci ##NAME##.da.po				# commit the new translation for the first time
+$ git commit ##NAME##.da.po				# commit the new translation for the first time
+$ git push								# update the remote repository
 
 
 
@@ -43,12 +44,13 @@ How to update the translations
 Update the translations every time before you start translating some new 
 strings:
 
-$ svn up					# update from Subversion, maybe someone else translated
+$ git pull					# update from the VCS, maybe someone else translated
 						# something or the English source was updated
 $ vi ##NAME##.da.po		# again, better use Lokalize 
 $ LINGUA=da make				# check the build and rewrap the PO file
-$ svn diff ##NAME##.da.po	# check the differences form the previous file
-$ svn ci ##NAME##.da.po	# commit your changes
+$ git diff ##NAME##.da.po	# check the differences from the previous file
+$ git commit ##NAME##.da.po	# commit changes to your local repository
+$ git push					# update the remote repository
 
 
 
@@ -83,7 +85,7 @@ TODO: filter out the fileref Attribute from the PO files
 Don't translate URLs - be careful: some wiki-URLs might be harder to notice 
 they are URLs.
 
-To "translate" images, add them to Subversion into the images/$CC/ directory, where 
+To "translate" images, add them to the VCS into the images/$CC/ directory, where 
 $CC is your language. They will be picked up automatically. 
 
 If you spot errors in the English version or see how it could be improved, 
@@ -92,10 +94,10 @@ please do contribute to the English version too. Just edit the wiki at
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
-If you cannot commit your work to Subversion directly, please file a bug against the
+If you cannot commit your work to the VCS directly, please file a bug against the
 debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc and attach 
 the PO file to the bugreport. Instructions how to submit bugs are available
 at http://bugs.debian.org
 
 
--- Holger Levsen, holger at debian.org, last updated: 2012-02-27
+-- Holger Levsen, holger at debian.org, last updated: 2013-02-08

-- 
Debian package debian-edu-doc

