From d9e88d6a698386cbc5f07ce187dd5977d5d13300 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 3 Jun 2012 15:55:11 +0000 Subject: [PATCH] Rename linux-2.6 to linux svn path=/dists/sid/linux/; revision=19065 --- debian/README.Debian | 8 ++++---- debian/README.source | 10 +++++----- debian/changelog | 8 ++++++-- debian/patches/debian/dfsg/files-1 | 2 +- debian/po/ca.po | 6 +++--- debian/po/cs.po | 6 +++--- debian/po/da.po | 6 +++--- debian/po/de.po | 6 +++--- debian/po/es.po | 6 +++--- debian/po/et.po | 10 +++++----- debian/po/fr.po | 4 ++-- debian/po/it.po | 2 +- debian/po/ja.po | 4 ++-- debian/po/nl.po | 8 ++++---- debian/po/pl.po | 6 +++--- debian/po/pt.po | 6 +++--- debian/po/pt_BR.po | 8 ++++---- debian/po/ru.po | 6 +++--- debian/po/sk.po | 8 ++++---- debian/po/sv.po | 8 ++++---- debian/po/templates.pot | 2 +- debian/po/tr.po | 6 +++--- debian/po/vi.po | 2 +- debian/templates/control.source.in | 4 ++-- debian/templates/image.plain.bug/control | 2 +- 25 files changed, 74 insertions(+), 70 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 99a8b287b..910632994 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,17 +1,17 @@ -linux-2.6 for DEBIAN ------------------------- +Linux kernel for Debian +----------------------- Patches ------- Debian applies small changes to the kernel source. These are split up into separated patches addressing individual problems. Each of the patch files contains a description and mentions the author. The patches can be found -at http://svn.debian.org/wsvn/kernel/dists/trunk/linux-2.6/debian/patches/. +at http://svn.debian.org/wsvn/kernel/dists/trunk/linux/debian/patches/. Config Files ------------ The .config files used to build the various linux-image files are dynamically -generated during the linux-2.6 package build. See the source package for +generated during the linux package build. See the source package for details. Each linux-image-* package provides the complete .config file that was used to generate it. This file is installed in /boot. diff --git a/debian/README.source b/debian/README.source index d7246ed37..896a91e49 100644 --- a/debian/README.source +++ b/debian/README.source @@ -3,18 +3,18 @@ Updating the upstream source 1) You can use either: a) a git repository of the kernel source - b) a kernel tarball from kernel.org (e.g. linux-2.6.25.tar.bz2) - and, optionally, a patch (e.g. patch-2.6.26-rc3.bz2). + b) a kernel tarball from kernel.org (e.g. linux-3.4.tar.bz2) + and, optionally, a patch (e.g. patch-3.5-rc1.bz2). 2) Run ./debian/bin/genorig.py or ./debian/bin/genorig.py [patch] - This will produce ../orig/linux-2.6_.orig.tar.gz - (e.g. linux-2.6_2.6.26~rc3.orig.tar.gz). + This will produce ../orig/linux_.orig.tar.gz + (e.g. linux_3.5~rc1.orig.tar.gz). (genorig.py requires the python and unifdef packages to be installed) -3) Unpack linux-2.6-.orig.tar.gz, cd into the new directory, +3) Unpack linux_.orig.tar.gz, cd into the new directory, and do a 'svn export' to get the debian/ subdirectory. Alternatively unpack using "make -f debian/rules orig". diff --git a/debian/changelog b/debian/changelog index 39610cb90..2ac6e59ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ -linux-2.6 (3.2.19.dfsg.1-1) UNRELEASED; urgency=low +linux (3.2.19-2) UNRELEASED; urgency=low - * linux-image: Change package name for bugs to 'src:linux-2.6' (Closes: #644198) + * The "Not Quite So Many Different Version Numbers" release + + [ Ben Hutchings ] + * Rename source package to 'linux' (Closes: #636010) + * linux-image: Change package name for bugs to 'src:linux' (Closes: #644198) * DFSG: video: Remove nvidiafb and rivafb, which include apparently obfuscated code (Closes: #383481). The nouveau driver supports all the same hardware, aside from RIVA 128 (NV3). diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index 2b0e90ff9..4ee843058 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -1,7 +1,7 @@ rm Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt # Some of this is DFSG-free, but it has been moved to firmware-free so -# we don't need it in linux-2.6 as well. +# we don't need it in linux as well. rm firmware rm arch/powerpc/sysdev/micropatch.c diff --git a/debian/po/ca.po b/debian/po/ca.po index 38469ec3f..dd82e273b 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -1,12 +1,12 @@ -# Catalan translation of linux-2.6 debconf templates. +# Catalan translation of linux debconf templates. # Copyright © 2010 Software in the Public Interest, Inc. -# This file is distributed under the same license as linux-2.6's packaging. +# This file is distributed under the same license as linux's packaging. # Jordi Mallach , 2010. # msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-24\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-10-25 00:24+0200\n" "Last-Translator: Jordi Mallach \n" diff --git a/debian/po/cs.po b/debian/po/cs.po index 98bc7c9a3..69c3e4ab3 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -1,12 +1,12 @@ -# Czech PO debconf template translation of linux-2.6. +# Czech PO debconf template translation of linux. # Copyright (C) 2010 Michal Simunek -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Michal Simunek , 2010. # msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-18\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2010-07-25 10:32+0200\n" "PO-Revision-Date: 2010-07-26 18:02+0200\n" "Last-Translator: Michal Simunek \n" diff --git a/debian/po/da.po b/debian/po/da.po index 03f0dda89..c1a08309b 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -1,11 +1,11 @@ -# Danish translation linux-2.6. +# Danish translation linux. # Copyright (C) 2011 Joe Hansen. -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Joe Hansen , 2010, 2011. # msgid "" msgstr "" -"Project-Id-Version: linux-2.6\n" +"Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-09 10:31+0200\n" "PO-Revision-Date: 2011-07-03 05:26+0100\n" diff --git a/debian/po/de.po b/debian/po/de.po index 5d689cdf2..de89b5483 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,12 +1,12 @@ -# Translation of linux-2.6 templates to german. +# Translation of linux templates to german. # Copyright (C) 2010 Holger Wansing. -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Holger Wansing , 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.0.0-3\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2011-09-13 20:41+0200\n" "Last-Translator: Holger Wansing \n" diff --git a/debian/po/es.po b/debian/po/es.po index b61ec98d8..c16a7268b 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -1,5 +1,5 @@ -# linux-2.6 po-debconf translation to Spanish -# This file is distributed under the same license as the linux-2.6 package. +# linux po-debconf translation to Spanish +# This file is distributed under the same license as the linux package. # # Changes: # - Initial translation @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32+5\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2011-07-16 17:59+0200\n" "Last-Translator: Omar Campagne \n" diff --git a/debian/po/et.po b/debian/po/et.po index 4f32692ed..4aa29f513 100644 --- a/debian/po/et.po +++ b/debian/po/et.po @@ -1,14 +1,14 @@ -# linux-2.6 debconf estonian translation -# linux-2.6 debconf eesti keele tõlge +# linux debconf estonian translation +# linux debconf eesti keele tõlge # Copyright (C) 2010 Debian GNU/Linux -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # # mihkel , 2010. # msgid "" msgstr "" -"Project-Id-Version: linux-2.6 2.6.32-11\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Project-Id-Version: linux 2.6.32-11\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2010-07-16 15:55+0100\n" "PO-Revision-Date: 2010-04-24 14:20+0300\n" "Last-Translator: mihkel \n" diff --git a/debian/po/fr.po b/debian/po/fr.po index fef77fdef..f85d72667 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -1,6 +1,6 @@ -# Translation of linux-2.6 debconf templates to French +# Translation of linux debconf templates to French # Copyright (C) 2010, 2011 Debian French l10n team -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # # David Prévot , 2010, 2011. msgid "" diff --git a/debian/po/it.po b/debian/po/it.po index 44978e5f9..0d0668c36 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,4 +1,4 @@ -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Collaboratively translated during an online sprint, thanks to all contributors! # Luca Bruno , 2010. # diff --git a/debian/po/ja.po b/debian/po/ja.po index 274ad7582..683eed3ab 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -1,12 +1,12 @@ # Copyright (C) 2010 Kenshi Muto # Copyright (C) 2010 Nobuhiro Iwamatsu -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Kenshi Muto , 2010. # Nobuhiro Iwamatsu , 2010. msgid "" msgstr "" -"Project-Id-Version: linux-2.6\n" +"Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-10-21 10:37+0200\n" "PO-Revision-Date: 2010-10-31 06:32+0900\n" diff --git a/debian/po/nl.po b/debian/po/nl.po index 134d05047..439ccb294 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -1,12 +1,12 @@ -# Dutch translation of linux-2.6 po-debconf templates. +# Dutch translation of linux po-debconf templates. # Copyright (C) 2011 Willem Kuyn -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Willem Kuyn , 2011. # msgid "" msgstr "" -"Project-Id-Version: linux-2.6\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Project-Id-Version: linux\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2012-02-04 12:27+0100\n" "Last-Translator: willem kuyn \n" diff --git a/debian/po/pl.po b/debian/po/pl.po index 27facb900..7f909ef66 100644 --- a/debian/po/pl.po +++ b/debian/po/pl.po @@ -1,12 +1,12 @@ -# Translation of linux-2.6 debconf templates to Polish. +# Translation of linux debconf templates to Polish. # Copyright (C) 2011 Michał Kułach -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # # Michał Kułach , 2012. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2012-02-05 18:38+0100\n" "Last-Translator: Michał Kułach \n" diff --git a/debian/po/pt.po b/debian/po/pt.po index 523684dd3..a0df5f345 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -1,11 +1,11 @@ -# Translation of linux-2.6 debconf messages to Portuguese +# Translation of linux debconf messages to Portuguese # Copyright (C) 2010 Américo Monteiro -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # # Américo Monteiro , 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: linux-2.6 2.6.39.1\n" +"Project-Id-Version: linux 2.6.39.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-05-21 10:31+0200\n" "PO-Revision-Date: 2011-05-22 23:53+0100\n" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index fee336737..207999b3a 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -1,12 +1,12 @@ -# linux-2.6 Brazilian Portuguese debconf template translation. +# linux Brazilian Portuguese debconf template translation. # Copyright (C) 2010 Flamarion Jorge -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Flamarion Jorge , 2010. # msgid "" msgstr "" -"Project-Id-Version: linux-2.6\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Project-Id-Version: linux\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2010-09-19 10:42+0200\n" "PO-Revision-Date: 2010-10-02 12:29-0300\n" "Last-Translator: Flamarion Jorge \n" diff --git a/debian/po/ru.po b/debian/po/ru.po index 230853030..892d0b171 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -1,12 +1,12 @@ -# translation of linux-2.6 debconf templates to Russian +# translation of linux debconf templates to Russian # Copyright (C) 2010, 2011 Yuri Kozlov -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # # Yuri Kozlov , 2010, 2011. msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.1.6-1\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2011-12-30 18:35+0400\n" "Last-Translator: Yuri Kozlov \n" diff --git a/debian/po/sk.po b/debian/po/sk.po index bd863edf8..70f87989a 100644 --- a/debian/po/sk.po +++ b/debian/po/sk.po @@ -1,13 +1,13 @@ -# Slovak translations for linux-2.6 package -# Slovenské preklady pre balík linux-2.6. +# Slovak translations for linux package +# Slovenské preklady pre balík linux. # Copyright (C) 2011 Slavko -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Slavko , 2011. # msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-29\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-06-09 10:31+0200\n" "PO-Revision-Date: 2011-07-10 09:19+0200\n" "Last-Translator: Slavko \n" diff --git a/debian/po/sv.po b/debian/po/sv.po index 95a40547b..663c8e27b 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -1,12 +1,12 @@ -# Translation of linux-2.6 debconf template to Swedish +# Translation of linux debconf template to Swedish # Copyright (C) 2010 Martin Bagge -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # # Martin Bagge , 2010 msgid "" msgstr "" -"Project-Id-Version: linux-2.6\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Project-Id-Version: linux\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-05-21 10:31+0200\n" "PO-Revision-Date: 2011-06-02 14:52+0100\n" "Last-Translator: Martin Bagge / brother \n" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 4836b3d30..f30984077 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" diff --git a/debian/po/tr.po b/debian/po/tr.po index 4e847e322..a049c68e1 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -1,12 +1,12 @@ -# Turkish translation of linux-2.6 debconf template. +# Turkish translation of linux debconf template. # Copyright (C) 2012 Mert Dirik -# This file is distributed under the same license as the linux-2.6 package. +# This file is distributed under the same license as the linux package. # Mert Dirik , 2012. # msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.2.4-1\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2011-07-04 04:24+0100\n" "PO-Revision-Date: 2012-02-12 22:36+0200\n" "Last-Translator: Mert Dirik \n" diff --git a/debian/po/vi.po b/debian/po/vi.po index 350eb6d14..a1b920db8 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-26\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" +"Report-Msgid-Bugs-To: linux@packages.debian.org\n" "POT-Creation-Date: 2010-10-21 10:37+0200\n" "PO-Revision-Date: 2010-10-27 15:21+1030\n" "Last-Translator: Clytie Siddall \n" diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index 856320577..d854fcbef 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -5,5 +5,5 @@ Uploaders: Bastian Blank , Frederik Schüler , Standards-Version: 3.9.2 Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.83) Build-Depends-Indep: bzip2, xmlto -Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-2.6/ -Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-2.6/ +Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux/ +Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/ diff --git a/debian/templates/image.plain.bug/control b/debian/templates/image.plain.bug/control index f3c94d887..5468d73ab 100644 --- a/debian/templates/image.plain.bug/control +++ b/debian/templates/image.plain.bug/control @@ -1,2 +1,2 @@ -Submit-As: src:linux-2.6 +Submit-As: src:linux Package-Status: firmware-atheros firmware-bnx2 firmware-bnx2x firmware-brcm80211 firmware-intelwimax firmware-ipw2x00 firmware-ivtv firmware-iwlwifi firmware-libertas firmware-linux firmware-linux-nonfree firmware-myricom firmware-netxen firmware-qlogic firmware-ralink firmware-realtek xen-hypervisor