Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package debian-history It's just a documentation and translation update, with a little bit of housekeeping. The short debdiff excludes the PO files and the Japanese SGML one (that has been removed in favor of a PO-handled translation). Thanks in advance, Regards David unblock debian-history/2.17 -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.0-3-amd64 (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diffstat for debian-history-2.16 debian-history-2.17 Makefile | 2 - debian/changelog | 24 ++++++++++++++++++ debian/control | 2 - debian/copyright | 4 +-- debian/source/options | 1 project-history.sgml | 66 ++++++++++++++++++++++++-------------------------- 6 files changed, 61 insertions(+), 38 deletions(-) diff -Nru --exclude 'project-history.*.po' --exclude project-history.ja.sgml debian-history-2.16/debian/changelog debian-history-2.17/debian/changelog --- debian-history-2.16/debian/changelog 2011-12-30 13:00:21.000000000 -0400 +++ debian-history-2.17/debian/changelog 2012-08-10 12:49:30.000000000 -0400 @@ -1,3 +1,27 @@ +debian-history (2.17) unstable; urgency=low + + * Team upload + + [ Javier Fernandez-Sanguino ] + * Review the Squeeze introduction based on comments in the debian-doc + mailing list (mainly coming from Justin B Rye). + * Review the use of 'in the movie' throughout the document. + + [ Translation updates ] + * French, Steve Petruzzello, closes: #669674 + * German, Chris Leick, closes: #684087 + * Japanese, YOSHINO Yoshihito, closes: #684328 + + [ David Prévot ] + * Fix typos spotted by Sergey Alyoshin and Chris Leick + * Makefile: Keep previous msgids of translated messages + * Remove inaccurate part about skipping Squeeze upgrade + * debian/control: Bump standards version (no change needed) + * debian/copyright: Point to the GPL-2 file + * debian/source/options: Switch to xz compression for source + + -- David Prévot <taffit@debian.org> Fri, 10 Aug 2012 12:49:14 -0400 + debian-history (2.16) unstable; urgency=low [ Bdale Garbee ] diff -Nru --exclude 'project-history.*.po' --exclude project-history.ja.sgml debian-history-2.16/debian/control debian-history-2.17/debian/control --- debian-history-2.16/debian/control 2011-12-30 13:03:20.000000000 -0400 +++ debian-history-2.17/debian/control 2012-08-10 12:12:35.000000000 -0400 @@ -5,7 +5,7 @@ Uploaders: Osamu Aoki <osamu@debian.org>, Javier Fernandez-Sanguino <jfs@debian.org> Build-Depends: debhelper (>= 7.0.50~) Build-Depends-Indep: debiandoc-sgml (>= 1.2.8), po4a, texlive, texlive-lang-all, texlive-latex-extra, latex-cjk-all, ghostscript, lmodern -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.debian.org/doc/misc-manuals#history Vcs-Svn: svn://svn.debian.org/svn/ddp/manuals/trunk/project-history Vcs-Browser: http://svn.debian.org/viewsvn/ddp/manuals/trunk/project-history/ diff -Nru --exclude 'project-history.*.po' --exclude project-history.ja.sgml debian-history-2.16/debian/copyright debian-history-2.17/debian/copyright --- debian-history-2.16/debian/copyright 2011-06-24 15:51:20.000000000 -0400 +++ debian-history-2.17/debian/copyright 2012-08-10 12:29:18.000000000 -0400 @@ -12,5 +12,5 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - On Debian systems, the full text of the GPL can be found in the file - /usr/share/common-licenses/GPL. + On Debian systems, the full text of the GPL-2 can be found in the file + /usr/share/common-licenses/GPL-2. diff -Nru --exclude 'project-history.*.po' --exclude project-history.ja.sgml debian-history-2.16/debian/source/options debian-history-2.17/debian/source/options --- debian-history-2.16/debian/source/options 1969-12-31 20:00:00.000000000 -0400 +++ debian-history-2.17/debian/source/options 2012-08-10 12:46:08.000000000 -0400 @@ -0,0 +1 @@ +compression = "xz" diff -Nru --exclude 'project-history.*.po' --exclude project-history.ja.sgml debian-history-2.16/Makefile debian-history-2.17/Makefile --- debian-history-2.16/Makefile 2011-06-24 16:07:22.000000000 -0400 +++ debian-history-2.17/Makefile 2012-08-08 19:26:37.000000000 -0400 @@ -24,7 +24,7 @@ # Update PO files after each change of $(MANUAL).sgml to avoid possible build errors $(po-sources): $(MANUAL).%.po: $(MANUAL).sgml $(MANUAL).pot - msgmerge --width=76 $@ $(MANUAL).pot -o $@.new && mv $@.new $@ + msgmerge --previous --width=76 $@ $(MANUAL).pot -o $@.new && mv $@.new $@ $(MANUAL).%.sgml: $(MANUAL).%.po $(MANUAL).sgml po4a-translate -k 70 -M UTF-8 -f sgml -m $(MANUAL).sgml -p $(MANUAL).$*.po -l $(MANUAL).$*.sgml diff -Nru --exclude 'project-history.*.po' --exclude project-history.ja.sgml debian-history-2.16/project-history.sgml debian-history-2.17/project-history.sgml --- debian-history-2.16/project-history.sgml 2011-12-30 12:57:06.000000000 -0400 +++ debian-history-2.17/project-history.sgml 2012-08-10 12:28:24.000000000 -0400 @@ -31,7 +31,7 @@ --> -<version>2.15 (last revised 24th June 2011)</version> +<version>2.17 (last revised 10th August 2012)</version> <abstract> This document describes the history and goals of the Debian project. @@ -140,7 +140,7 @@ <sect>Pronouncing Debian <p> -The official pronounciation of Debian is 'deb ee n'. The name comes +The official pronunciation of Debian is 'deb ee n'. The name comes from the names of the creator of Debian, Ian Murdock, and his wife, Debra. @@ -241,15 +241,15 @@ <p> Debian 1.1 <em>Buzz</em> (June 17th, 1996): This was the first Debian release with a code name. It was taken, like all others so far, from -a character in the movie <em>Toy Story</em>... in this case, Buzz -Lightyear. By this time, Bruce Perens had taken over leadership of +a character in one of the <em>Toy Story</em> movies... in this case, Buzz +Lightyear. By this time, Bruce Perens had taken over leadership of the Project from Ian Murdock, and Bruce was working at Pixar, the -company that produced the movie. This release was fully ELF, used +company that produced the movies. This release was fully ELF, used Linux kernel 2.0, and contained 474 packages. <p> Debian 1.2 <em>Rex</em> (December 12th, 1996): Named for the plastic dinosaur -in the movie. This release consisted of 848 packages maintained by +in the <em>Toy Story</em> movies. This release consisted of 848 packages maintained by 120 developers <p> @@ -257,7 +257,7 @@ This release consisted of 974 packages maintained by 200 developers. <p> -Debian 2.0 <em>Hamm</em> (July 24th, 1998): Named for the piggy-bank in the movie. +Debian 2.0 <em>Hamm</em> (July 24th, 1998): Named for the piggy-bank in the <em>Toy Story</em> movies. This was the first multi-architecture release of Debian, adding support for the Motorola 68000 series architectures. With Ian Jackson as Project Leader, this release made the transition to libc6, and consisted of over 1500 packages @@ -278,7 +278,8 @@ <p> Debian 2.2 <em>Potato</em> (15 August 2000): Named for "Mr Potato Head" in -the movie. This release added support for the +the <em>Toy Story</em> movies. +This release added support for the <url id="http://www.debian.org/ports/powerpc/" name="PowerPC"> and <url id="http://www.debian.org/ports/arm/" name="ARM"> @@ -290,7 +291,7 @@ packages in the release notes, also the number of DD could be revised --> <p> Debian 3.0 <em>Woody</em> (19 July 2002): Named for the main character -in the movie: "Woody" the cowboy. +the <em>Toy Story</em> movies: "Woody" the cowboy. Even more architectures were added in this release: <url id="http://www.debian.org/ports/ia64/" name="IA-64">, <url id="http://www.debian.org/ports/hppa/" name="HP PA-RISC">, @@ -321,7 +322,7 @@ binary packages and 14 binary CDs in the official set. <p>Debian 4.0 <em>Etch</em> (8 April 2007): named for the sketch toy in -the movie. One architecture was added in this release: <url +the movie. One architecture was added in this release: <url id="http://www.debian.org/ports/amd64/" name="AMD64">, and official support for <url id="http://www.debian.org/ports/m68k/" name="m68k"> was dropped. This release continued using the <em>debian-installer</em>, but featuring @@ -340,7 +341,7 @@ with alternate desktop environments different to the default one. <p>Debian 5.0 <em>Lenny</em> (February 2009): named for the wind up -binoculars in the movie. One architecture was added in this release: <url +binoculars in the <em>Toy Story</em> movies. One architecture was added in this release: <url id="http://wiki.debian.org/ArmEabiPort" name="ARM EABI"> (or <em>armel</em>), providing support for newer ARM processors and deprecating the old ARM port (<em>arm</em>). @@ -362,23 +363,26 @@ <p>Debian 6.0 <em>Squeeze</em> (February 2011): named for the green three-eyed -aliens in the movie. +aliens. -<p>The release was frozen in August 6, 2010, with many of the Debian +<p>The release was frozen on August 6, 2010, with many of the Debian developers gathered at the 10th Debconf at New York City. -<p>Changes include the new <url id="http://www.debian.org/ports/kfreebsd-gnu/" -name="FreeBSD port">, providing a new kernel: KfreeBSD which was made available -for two architectures (i386 and amd64) including the Kernel and userland -tools as well as common server software but not advanced desktop features yet. -This was made available as a "technology preview". This was the first time a -Linux distribution has been extended to also allow use of a non-Linux kernel. - -<p>One arquitecture (alpha) was dropped. - +<p>While two architectures (alpha and hppa) were dropped, two +architectures of the +new <url id="http://www.debian.org/ports/kfreebsd-gnu/" +name="FreeBSD port"> (kfreebsd-i386 and kfreebsd-amd64) were made +available as <em>technology preview</em>, including the kernel and userland +tools as well as common server software (though not advanced desktop features +yet). This was the first time a Linux distribution has been extended to also +allow use of a non-Linux kernel. + +<!-- TODO: Review: +"startpar was available as an option in Lenny, and the move to dash as system +shell deserves some of the credit for faster boot times" +--> <p>The new release introduced a dependency based boot sequence, which allowed for parallel init script processing, speeding system startup. -Many old libraries were removed such as GTK 1.1 <!-- <p>Debian 7.0 <em>Wheezy</em> (MMM 2012): named for the rubber toy penguin with @@ -837,7 +841,7 @@ included the port for newer ARM processors. As with the previous release, support for the m68k architecture was still available in <em>unstable</em>. There were around 23,000 binary packages (built from over 12,000 source -packages) maintained by more than more than one thousand and ten Debian +packages) maintained by more than one thousand and ten Debian developers. <!-- NOTE: Developer count based on leader's vote in March --> @@ -902,7 +906,7 @@ --> <sect>The 6.x Releases -<p>Debian 6.0 <em>squeeze</em>) was released February 6th, 2011. +<p>Debian 6.0 (<em>squeeze</em>) was released February 6th, 2011. <p> After the project decided, the 29th of July 2009, to <url @@ -925,19 +929,13 @@ Debconf meeting in New York. <p> -To accommodate the needs of larger organisations and other users with a long -upgrade process, the Debian project commited to provide the possibility to skip -the upcoming release and do a skip-upgrade straight from Debian GNU/Linux 5.0 -("Lenny") to Debian GNU/Linux 7.0 (Wheezy). - -<p> New features include: <list> <item> Linux Kernel 2.6.32, now completely free and without problematic firmware files. <item> libc: eglibc 2.11 -<item> Gnome 2.30.0 with some pieces of 2.32 +<item> GNOME 2.30.0 with some pieces of 2.32 <item> KDE 4.4.5 <item> X.org 7.5 <item> Xfce 4.6 @@ -1133,8 +1131,8 @@ <p> The Debian Project continues to work on the <em>unstable</em> distribution (codenamed <em>sid</em>, after the evil and "unstable" -kid next door from the movie Toy Story who should never be let out -into the world) Sid is the permanent name for the unstable +kid next door from the <em>Toy Story 1</em> who should never be let out +into the world). Sid is the permanent name for the unstable distribution and is always 'Still In Development'. Most new or updated packages are uploaded into this distribution.
Attachment:
deb.diff.xz
Description: application/xz