r45 - in /web/deps: ./ dep4.mdwn dep5.mdwn
vorlon at users.alioth.debian.org
vorlon at users.alioth.debian.org
Thu Apr 2 04:41:58 UTC 2009
Author: vorlon
Date: Thu Apr 2 04:41:58 2009
New Revision: 45
URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=45
Log:
merge the out-of-sync changes from svn back into bzr
Modified:
web/deps/ (props changed)
web/deps/dep4.mdwn
web/deps/dep5.mdwn
Propchange: web/deps/
------------------------------------------------------------------------------
--- bzr:ancestry:v4 (added)
+++ bzr:ancestry:v4 Thu Apr 2 04:41:58 2009
@@ -1,0 +1,1 @@
+svn-v4:31fa8809-74ff-43ad-b926-e2fb09161165:web/deps:39
Propchange: web/deps/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Thu Apr 2 04:41:58 2009
@@ -1,1 +1,2 @@
+dep4.mdwn 16 at 31fa8809-74ff-43ad-b926-e2fb09161165:web%2Fdeps%2Fdep4.mdwn
dep5.mdwn 18 at 31fa8809-74ff-43ad-b926-e2fb09161165:web%2Fdeps%2Fdep5.mdwn
Propchange: web/deps/
------------------------------------------------------------------------------
--- bzr:revision-id:v4 (original)
+++ bzr:revision-id:v4 Thu Apr 2 04:41:58 2009
@@ -4,3 +4,4 @@
16 plessy at debian.org-20090326143300-a1rwc4h5xcd8zfay
17 plessy at debian.org-20090329141920-j7hzc4er9rsgxqy7
18 plessy at debian.org-20090401141238-3n99f8wo5o7rix5p
+19 vorlon at debian.org-20090402044030-ws7vkxv4j7pdgpp2
Propchange: web/deps/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Thu Apr 2 04:41:58 2009
@@ -1,4 +1,4 @@
-timestamp: 2009-04-01 23:12:38.950999975 +0900
-committer: Charles Plessy <plessy at debian.org>
+timestamp: 2009-04-01 21:40:30.637000084 -0700
+committer: Steve Langasek <vorlon at debian.org>
properties:
- branch-nick: dep5-bzr
+ branch-nick: trunk
Propchange: web/deps/
------------------------------------------------------------------------------
--- bzr:text-parents (added)
+++ bzr:text-parents Thu Apr 2 04:41:58 2009
@@ -1,0 +1,2 @@
+dep4.mdwn svn-v4:31fa8809-74ff-43ad-b926-e2fb09161165:web/deps:16
+dep5.mdwn plessy at debian.org-20090401141238-3n99f8wo5o7rix5p svn-v4:31fa8809-74ff-43ad-b926-e2fb09161165:web/deps:39
Propchange: web/deps/
------------------------------------------------------------------------------
--- bzr:text-revisions (added)
+++ bzr:text-revisions Thu Apr 2 04:41:58 2009
@@ -1,0 +1,1 @@
+dep4.mdwn svn-v4:31fa8809-74ff-43ad-b926-e2fb09161165:web/deps:29
Propchange: web/deps/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Thu Apr 2 04:41:58 2009
@@ -1,0 +1,1 @@
+31fa8809-74ff-43ad-b926-e2fb09161165:/web/deps:39
Propchange: web/deps/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 2 04:41:58 2009
@@ -1,0 +1,1 @@
+/web/deps:29-35,38-39
Modified: web/deps/dep4.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep4.mdwn?rev=45&op=diff
==============================================================================
--- web/deps/dep4.mdwn (original)
+++ web/deps/dep4.mdwn Thu Apr 2 04:41:58 2009
@@ -12,18 +12,28 @@
progress. Online version: http://people.debian.org /~codehelp/tdeb
Source SGML: /~codehelp/tdeb/Draft.sgml
+[[!toc levels=2]]
+
+---
+
# TDeb Specification
+
---
This is where the Draft TDeb Specification, created at the ftp-master/i18n
meeting in Extremadura, will be developed and improved.
+---
+
## Motivation
+
---
1. Updates to translations should not require source NMU's.
-2. Translation data should not be distributed in architecture-dependent packages.
-3. Translators should have a common interface for getting updates into Debian (possibly with automated TDeb generation after i18n team review).
+2. Translation data should not be distributed in architecture-dependent
+packages.
+3. Translators should have a common interface for getting updates into
+Debian (possibly with automated TDeb generation after i18n team review).
## Version 0.0.2
@@ -36,14 +46,15 @@
* Frank Lichtenheld <email>djpig at debian.org</email>,
* partially based on dpkg man pages, © by the original authors.
-This document is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-For more details, on Debian GNU/Linux systems, see the file
-/usr/share/common-licenses/GPL for the full license.
-</copyright>
+ This document is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ For more details, on Debian GNU/Linux systems, see the file
+ /usr/share/common-licenses/GPL-2 for the full license.
+
+---
# Format of binary translation packages (tdeb)
@@ -91,46 +102,53 @@
with something other than underscores, or will (more likely) cause the
major version number to be increased.
+---
+
# Source format
## +t1.diff.gz
TDebs will use a source format for translation updates that will not
-cause any changes in the package binaries. The foo_1.2.3-4+t1.diff.gz will be
-created for changes made by translators and tools will need to apply the
-translation diff after applying the .diff.gz prepared (and signed) by the
-Debian maintainer.
-
-The +t[0-9] update will need to be built from the source package but only details
-changes in the translated content. No changes will be allowed in the package
-binaries or untranslated content.
-
-Translation updates are source-package based and translation updates are denoted
-by the +t[0-9] suffix where 0 is assumed to be the original upload by the
-Debian maintainer.
+cause any changes in the package binaries. The foo_1.2.3-4+t1.diff.gz
+will be created for changes made by translators and tools will need to
+apply the translation diff after applying the .diff.gz prepared
+(and signed) by the Debian maintainer.
+
+The +t[0-9] update will need to be built from the source package but
+only details changes in the translated content. No changes will be
+allowed in the package binaries or untranslated content.
+
+Translation updates are source-package based and translation updates
+are denoted by the +t[0-9] suffix where 0 is assumed to be the original
+upload by the Debian maintainer.
e.g. for a non-native package foo:
-> source version 1.2.3-4,
-> the first TDeb update would be foo_1.2.3-4+t1
-> the changes from -4 to -4+t1 will be in foo_1.2.3-4+t1.diff.gz
-
-BinNMU versions are not affected as it is
-source based.
+
+ source version 1.2.3-4,
+ the first TDeb update would be foo_1.2.3-4+t1
+ the changes from -4 to -4+t1 will be in foo_1.2.3-4+t1.diff.gz
+
+BinNMU versions are not affected as it is source based.
The +t1.diff.gz needs dpkg support which is being implemented:
New translations and translation fixes are currently tracked in the BTS.
-Tdeb uploads shall be able to close those bugs. Using a changelog might be the easiest way.
-During the transition, those bugs will remain. After the transition, those bugs
-will go away so there should be no need for a closure method. We'll need to
-rely on i18n.debian.org for translation tracking after Squeeze.
+Tdeb uploads shall be able to close those bugs. Using a changelog might
+be the easiest way.
+
+During the transition, those bugs will remain. After the transition,
+those bugs will go away so there should be no need for a closure method.
+We'll need to rely on i18n.debian.org for translation tracking after
+Squeeze.
+
+---
# TDeb contents
## What goes into a TDeb?
-(With the exception of debconf templates, untranslated content remains in the
-original package).
+(With the exception of debconf templates, untranslated content remains
+in the original package).
* Translations from upstream -/usr/share/locale/*/LC_MESSAGES/*.mo
* Other localisation files from upstream - /usr/share/locale/*/LC_*/*
@@ -139,7 +157,7 @@
* Translated manpages
* Translated info documents (if supported by info)
-* Translated documentation<item>With provisos that packages with
+* Translated documentation. With provisos that packages with
large amounts of translated documentation and debconf templates
would create two tdebs, one minimal tdeb for debconf and one for
the rest.
@@ -193,30 +211,37 @@
will be included into the TDeb.
Packages will no longer be able to have unactivated or unused translations.
-(This is a debhelper / other packaging tool implementation problem, not a dpkg one)
+(This is a debhelper / other packaging tool implementation problem, not
+a dpkg one)
As a result of this requirement, the debhelper tdeb tool (dh_gentdeb)
-handles finding the translations, preparing the binary translation files and moving the
-translations to suitable directories within the package build.
-
-##TDebs and binary packages
-
-The filesystem contents of TDebs and their associated binary packages must be
-mutually exclusive, so that dpkg doesn't need any special replace handling.
-We will still need some Replaces for the transition, but that can be
-handled like any other Replaces.
+handles finding the translations, preparing the binary translation
+files and moving the translations to suitable directories within the
+package build.
+
+## TDebs and binary packages
+
+The filesystem contents of TDebs and their associated binary packages
+must be mutually exclusive, so that dpkg doesn't need any special
+replace handling. We will still need some Replaces for the transition,
+but that can be handled like any other Replaces.
## Migrating packages to TDeb support
+
Maintainers will need to make a variety of changes to support TDebs:
* Replaces Add the recommended $src-tdeb package name with
Replaces: $binaries (<< $srcversion)
where $srcversion is a fixed string for the version prior to TDebs
-> e.g. Replaces: apt (<< 0.7.19), apt-utils (<< 0.7.19)
+
+ e.g. Replaces: apt (<< 0.7.19), apt-utils (<< 0.7.19)
+
* Remove translated content from all *.install files in debian/
* Remove any lines in debian/rules that handle translated content
* Ensure that dh_gentdeb is called in debian/rules (CDBS will be
patched to implement this support automatically).
+
+---
# Resolution of corner cases
@@ -231,10 +256,11 @@
translations, it <strong>must</strong> have a tdeb named after the
source package (suffixed with -tdeb) and all
debconf templates must be placed in it. Such a package should place all
-architecture independent documentation (even in the native language) into a tdeb.
-If a package contains documentation which is not always required (for
-example API documentation or user documentation), the source package
-may provide additional ${source}-${foo}-tdeb_$version_all.tdeb files.
+architecture independent documentation (even in the native language)
+into a tdeb. If a package contains documentation which is not always
+required (for example API documentation or user documentation), the
+source package may provide additional
+${source}-${foo}-tdeb_$version_all.tdeb files.
If tdebs are revised by the translation teams, the suffix +t[0-9]+
must be used and all tdebs for the source package must be revised
@@ -248,8 +274,10 @@
with -tdeb appended.
In the case of Translation-Version: 1 or higher, the tdeb name is
-${source}-tdeb_$version+t[0-9]+_all.tdeb. Additional tdebs are referenced in the
-Packages file in the following way: Additional-Translations: ${source}-api-tdeb, ${source}-user-tdeb
+${source}-tdeb_$version+t[0-9]+_all.tdeb. Additional tdebs are
+referenced in the Packages file in the following way:
+Additional-Translations: ${source}-api-tdeb, ${source}-user-tdeb
+
In cases where a base tdeb is present, package managers *must* call
dpkg with the tdeb and the deb in the same invocation in order to ensure that
all debconf templates can be extracted before the config script is run.
@@ -282,12 +310,14 @@
## PO translations
-* No source changes - The Tdeb packages should not add messages not related to a message of the
-original source package. How to check this? If there is a POT file, then it is
-possible to do the comparison with the gettext msg* tools. POT file will not be
-in the tdeb, only in the main source package. When a PO file is modified,
-lintian can get the POT file of the same directory from the source package.
-* msgfmt warnings - Modification of upstream PO files should be avoided. A warning could be produced.
+* No source changes - The Tdeb packages should not add messages not
+related to a message of the original source package. How to check this?
+If there is a POT file, then it is possible to do the comparison with
+the gettext msg* tools. POT file will not be in the tdeb, only in the
+main source package. When a PO file is modified, lintian can get the
+POT file of the same directory from the source package.
+* msgfmt warnings - Modification of upstream PO files should be avoided.
+A warning could be produced.
* File naming rules
* Location of PO files in the source package (+t1.diff.gz)
* Location of mo files in the binary packages (tdeb)
@@ -300,8 +330,8 @@
Rather than allow repeat uploads of the same change in multiple
languages, coordinate builds of tdebs to make a single upload with as
-many changes as possible at one time. Translation-Maintainers: in debian/control
-and Localisation Assistants.
+many changes as possible at one time. Translation-Maintainers: in
+debian/control and Localisation Assistants.
# TDeb implementation
@@ -353,7 +383,7 @@
for specific locale roots).
* dpkg-source building support - (partially implemented in git)
* debhelper support for both tdebs explicitly, and also marking files into
- classes in general (partially implemented via dh_gentdeb in git)
+classes in general (partially implemented via dh_gentdeb in git)
* provide a patch to cdbs for running dh_gentdeb in the right place.
(Done - only remains for the patch to be filed and applied, after Lenny).
* apt/aptitude support for pulling in and removing tdebs
@@ -366,10 +396,12 @@
desktop.)
We do need the toolchain changes in squeeze so we can enable use
- of it in squeeze+1.
+of it in squeeze+1.
# Changes
-----
2009-03-08 - [Neil Williams]
* Convert to DEP.
+2009-03-19 - [Neil Williams]
+* Add a table of contents via ikiwiki
Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=45&op=diff
==============================================================================
--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Thu Apr 2 04:41:58 2009
@@ -23,13 +23,13 @@
This document proposes a simple format for summarising license terms and
copyrights, in original upstream programs and in their packaged version. This
tool will make the task easier for users to select a program according to their
-licensing preferences, and for the developpers of software distributions to
+licensing preferences, and for the developers of software distributions to
ensure that only compatible works are combined.
# Rationale
-The diversity of free software licenses means that developpers, users and
+The diversity of free software licenses means that developers, users and
distributors needs to care not only about the freeness of a given work, but
also its license's compatibility with the other works it uses.
@@ -51,7 +51,7 @@
Lastly, a user might want to have a way to avoid software with certain licenses
that do not fit their work procedures or their philosophy, even if the licenses
-are recoginsed by many as free. For example, the Affero GPL.
+are recognised by many as free. For example, the Affero GPL.
# Compatibility and Human-Readability
@@ -101,7 +101,7 @@
more stanzas.
* **`Files`**
- * Required. However, the first **`Files`** field can be ommited and its value will be assumed to be '*'.
+ * Required. However, the first **`Files`** field can be omitted and its value will be assumed to be '*'.
* List of patterns indicating files having the same licence and sharing copyright holders. See "File patterns" below
* **`Copyright`**
@@ -125,7 +125,7 @@
[LICENSE TEXT]
### Standalone License Section
-Where a set of files are dual (tri, etc) licensed, or when the same licence occurs multiple times, you can use a single line **`License`** field and standlone **`License`** fields to expand the license short names.
+Where a set of files are dual (tri, etc) licensed, or when the same licence occurs multiple times, you can use a single line **`License`** field and standalone **`License`** fields to expand the license short names.
Example 1 (tri-licensed files).
@@ -152,7 +152,7 @@
License: MPL-1.1
Files: src/js/fdlibm/*
- Copyright: 1993, J-Random Comporation
+ Copyright: 1993, J-Random Corporation
License: MPL-1.1
License: MPL-1.1
@@ -194,7 +194,7 @@
find . -path "*/Makefile.am" -o -name "*.py"
It is quite common for a work to have files with copyright held by
-different parties and received under different licenses. To accomodate
+different parties and received under different licenses. To accommodate
this, **multiple stanzas are allowed with different `Files`
declarations**.
@@ -413,7 +413,7 @@
distribution license. In addition, it requires that copyrights must be
extractable by mechanical means. This proposal for machine-readable copyright
and license summary files has been crafted for Debian's use, but it is our hope
-that other software distributions, as well as upstream developpers will adopt
+that other software distributions, as well as upstream developers will adopt
it, so that review efforts can be easily reproduced and shared.
The copyright of the Debian packaging and the history of package maintainers is
More information about the dep-commits
mailing list