[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-626-g4179313

Aron Xu aron at debian.org
Sun Nov 1 06:23:26 UTC 2015


The following commit has been merged in the master branch:
commit 4c8f52215071c52c0c702e552f06c9665820c13e
Author: Aron Xu <aron at debian.org>
Date:   Sun Nov 1 13:39:12 2015 +0800

    Add warning about incompatibilities of the licenses

diff --git a/debian/po/cs.po b/debian/po/cs.po
index cb81892..6995d10 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux 0.6.1-1\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: 2013-07-21 09:57+0200\n"
 "Last-Translator: Michal Simunek <michal.simunek at gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -39,10 +39,11 @@ msgid ""
 "strongly advised to use a 64-bit kernel; if you do decide to proceed with "
 "using ZFS on this kernel then keep in mind that it is at your own risk."
 msgstr ""
-"Přestože je to možné, sestavování ve 32 bitovém prostředí není podporováno "
-"a může způsobit nestabilitu vedoucí k možnému poškození dat. Důrazně vám "
-"doporučujeme používat 64 bitový kernel; rozhodnete-li se pokračovat s používáním "
-"ZFS na tomto kernelu, pak mějte na paměti, že je to na vaše vlastní nebezpečí."
+"Přestože je to možné, sestavování ve 32 bitovém prostředí není podporováno a "
+"může způsobit nestabilitu vedoucí k možnému poškození dat. Důrazně vám "
+"doporučujeme používat 64 bitový kernel; rozhodnete-li se pokračovat s "
+"používáním ZFS na tomto kernelu, pak mějte na paměti, že je to na vaše "
+"vlastní nebezpečí."
 
 #. Type: boolean
 #. Description
@@ -61,3 +62,31 @@ msgstr ""
 "Pokoušíte se sestavit ZFS oproti běžícímu kernelu, u kterého se nepodařilo "
 "rozpoznat, zda-li je 32 bitový nebo 64 bitový. Pokud si nejste zcela jisti, "
 "že je běžící kernel 64 bitový, měli byste nejspíš sestavování ukončit."
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/po/da.po b/debian/po/da.po
index c483d65..3f08e51 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: 2013-07-07 06:57+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -39,11 +39,10 @@ msgid ""
 "strongly advised to use a 64-bit kernel; if you do decide to proceed with "
 "using ZFS on this kernel then keep in mind that it is at your own risk."
 msgstr ""
-"Selvom det er muligt, så er bygning af et 32-bit miljø ikke understøttet "
-"og vil sandsynligvis medføre ustabilitet, der kan føre til dataødelæggelse. "
-"Du rådes på det kraftigste til at bruge en 64-bit kerne; hvis du vælger "
-"at fortsætte med at bruge ZFS på denne kerne så husk, at det er på egen "
-"risiko."
+"Selvom det er muligt, så er bygning af et 32-bit miljø ikke understøttet og "
+"vil sandsynligvis medføre ustabilitet, der kan føre til dataødelæggelse. Du "
+"rådes på det kraftigste til at bruge en 64-bit kerne; hvis du vælger at "
+"fortsætte med at bruge ZFS på denne kerne så husk, at det er på egen risiko."
 
 #. Type: boolean
 #. Description
@@ -63,3 +62,30 @@ msgstr ""
 "som enten 32-bit eller 64-bit. Hvis du ikke er fuldstændig sikker på, at den "
 "kørende kerne er en 64-bit, så bør du stoppe bygningen."
 
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/po/de.po b/debian/po/de.po
index fd3cd79..837b4f3 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux 0.6.1-1\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: 2013-07-07 19:11+0200\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,8 +38,8 @@ msgid ""
 "strongly advised to use a 64-bit kernel; if you do decide to proceed with "
 "using ZFS on this kernel then keep in mind that it is at your own risk."
 msgstr ""
-"Dies ist zwar möglich, allerdings wird der Bau in einer 32-Bit-Umgebung nicht "
-"unterstützt und wird wahrscheinlich Instabilitäten verursachen, die "
+"Dies ist zwar möglich, allerdings wird der Bau in einer 32-Bit-Umgebung "
+"nicht unterstützt und wird wahrscheinlich Instabilitäten verursachen, die "
 "möglicherweise Daten beschädigen. Es wird Ihnen nachdrücklich empfohlen, "
 "einen 64-Bit-Kernel zu verwenden; falls Sie sich entscheiden, mit der "
 "Verwendung von ZFS unter diesem Kernel fortzufahren, denken Sie daran, dass "
@@ -59,6 +60,34 @@ msgid ""
 "running kernel is a 64-bit one, you should probably stop the build."
 msgstr ""
 "Sie versuchen, ZFS mit einem Kernel zu bauen, der weder als 32-Bit noch als "
-"64-Bit identifiziert werden konnte. Falls Sie sich nicht absolut sicher sind, "
-"dass der laufende Kernel 64-bittig ist, sollten Sie wahrscheinlich den Bau "
-"abbrechen."
+"64-Bit identifiziert werden konnte. Falls Sie sich nicht absolut sicher "
+"sind, dass der laufende Kernel 64-bittig ist, sollten Sie wahrscheinlich den "
+"Bau abbrechen."
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/po/fr.po b/debian/po/fr.po
index d55c3e4..84f6f97 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: 2013-07-05 11:36+0100\n"
 "Last-Translator: Julien Patriarca <leatherface at debian.org>\n"
 "Language-Team: FRENCH <debian-l10n-french at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,10 +41,10 @@ msgid ""
 "using ZFS on this kernel then keep in mind that it is at your own risk."
 msgstr ""
 "Même si c'est en théorie possible, compiler au sein d'un environnement "
-"32 bits n'est pas géré et peut entraîner une instabilité du système "
-"pouvant aboutir à une corruption des données. Il vous est fortement "
-"recommandé d'utiliser un noyau 64 bits ; si vous décidez d'utiliser ZFS sur "
-"ce noyau, gardez à l'esprit que c'est à vos propres risques."
+"32 bits n'est pas géré et peut entraîner une instabilité du système pouvant "
+"aboutir à une corruption des données. Il vous est fortement recommandé "
+"d'utiliser un noyau 64 bits ; si vous décidez d'utiliser ZFS sur ce noyau, "
+"gardez à l'esprit que c'est à vos propres risques."
 
 #. Type: boolean
 #. Description
@@ -62,3 +63,31 @@ msgstr ""
 "Vous êtes en train d'essayer de compiler ZFS sur un noyau qui n'a pu être "
 "identifié comme 32 bits ou 64 bits. Si vous n'êtes pas certain que le noyau "
 "actuel est un 64 bits, vous devriez arrêter la compilation."
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 7a92783..ff42d29 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: 2013-07-04 23:09+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -62,3 +62,31 @@ msgstr ""
 "32 ビットで動作しているのか 64 ビットで動作しているのか特定できないカーネルに"
 "対して ZFS をビルドしようとしています。このカーネルが 64 ビットで動作している"
 "ことに確信が持てない場合は、恐らくビルドを中止すべきです。"
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/po/pl.po b/debian/po/pl.po
index e02c513..a74e64c 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: 2013-07-13 19:48+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach at gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish at lists.debian.org>\n"
@@ -44,8 +44,8 @@ msgid ""
 msgstr ""
 "Choć jest to możliwe, to jednak budowanie w 32-bitowym środowisku jest "
 "nieobsługiwane i może powodować niestabilność prowadzącą w konsekwencji do "
-"utraty danych. Zaleca się użyć jądra 64-bitowego. Kontynuując używanie ZFS na "
-"tym jądrze robi się to na własną odpowiedzialność."
+"utraty danych. Zaleca się użyć jądra 64-bitowego. Kontynuując używanie ZFS "
+"na tym jądrze robi się to na własną odpowiedzialność."
 
 #. Type: boolean
 #. Description
@@ -65,4 +65,30 @@ msgstr ""
 "zidentyfikować jako 32-bitowe lub 64-bitowe. Jeśli nie jest się całkowicie "
 "pewnym że jest to jądro 64-bitowe powinno się przerwać tę instalację."
 
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
 
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/po/pt.po b/debian/po/pt.po
index e54300f..112d7d9 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: 2013-07-07 13:57+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -60,6 +60,33 @@ msgid ""
 msgstr ""
 "Está a tentar compilar ZFS contra um kernel em execução que não pode ser "
 "identificado como sendo de 32-bit ou de 64-bit. Se não tiver a certeza de "
-"que o kernel em execução seja de 64-bit, provavelmente deverá parar "
-"a compilação."
+"que o kernel em execução seja de 64-bit, provavelmente deverá parar a "
+"compilação."
 
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/po/ru.po b/debian/po/ru.po
index c93054c..9c40253 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux 0.6.1-1\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: 2013-07-06 21:39+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks at lists.sourceforge.net>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.4\n"
 
 #. Type: boolean
@@ -41,11 +41,10 @@ msgid ""
 "strongly advised to use a 64-bit kernel; if you do decide to proceed with "
 "using ZFS on this kernel then keep in mind that it is at your own risk."
 msgstr ""
-"Хотя это и возможно, сборка в 32-битном окружении не поддерживается "
-"и, вероятно, нестабильная работа приведёт к повреждению данных. "
-"Настоятельно рекомендуем использовать 64-битное ядро; "
-"если вы решите продолжить использовать ZFS с этим ядром, "
-"то вас предупредили."
+"Хотя это и возможно, сборка в 32-битном окружении не поддерживается и, "
+"вероятно, нестабильная работа приведёт к повреждению данных. Настоятельно "
+"рекомендуем использовать 64-битное ядро; если вы решите продолжить "
+"использовать ZFS с этим ядром, то вас предупредили."
 
 #. Type: boolean
 #. Description
@@ -61,7 +60,34 @@ msgid ""
 "identified as 32-bit or 64-bit. If you are not completely sure that the "
 "running kernel is a 64-bit one, you should probably stop the build."
 msgstr ""
-"Вы пытаетесь собрать ZFS для выполняющегося ядра с неизвестной "
-"разрядностью. Если вы абсолютно не уверены, что работающее ядро "
-"64-битное, лучше прервать сборку."
+"Вы пытаетесь собрать ZFS для выполняющегося ядра с неизвестной разрядностью. "
+"Если вы абсолютно не уверены, что работающее ядро 64-битное, лучше прервать "
+"сборку."
 
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 70f104e..1fa7da9 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: 2013-07-10 10:42+0100\n"
 "Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -63,3 +63,31 @@ msgstr ""
 "Du försöker bygga ZFS mot en kärna som varken kan identifieras som 32-bitars "
 "eller 64-bitars. Om du inte är helt säker på att du kör en 64-bitars kärna "
 "ska du avbryta bygget nu."
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index f63c498..8317333 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -55,3 +55,31 @@ msgid ""
 "identified as 32-bit or 64-bit. If you are not completely sure that the "
 "running kernel is a 64-bit one, you should probably stop the build."
 msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index efcc6b8..2b56037 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
-"POT-Creation-Date: 2013-07-04 22:09+0800\n"
+"POT-Creation-Date: 2015-11-01 14:11+0800\n"
 "PO-Revision-Date: 2013-07-04 22:45+0800\n"
 "Last-Translator: Aron <aron at debian.org>\n"
 "Language-Team: Chinese (Simplified) <debian-l10n-chinese at lists.debian.org>\n"
@@ -40,9 +40,9 @@ msgid ""
 "strongly advised to use a 64-bit kernel; if you do decide to proceed with "
 "using ZFS on this kernel then keep in mind that it is at your own risk."
 msgstr ""
-"尽管在32位系统上可能编译成功,这样做是不受支持的,并可能造成导致数据损坏"
-"的不稳定情况。我们强烈建议您使用64位内核,如果您决定继续,请牢记您将自己"
-"承担风险。"
+"尽管在32位系统上可能编译成功,这样做是不受支持的,并可能造成导致数据损坏的不"
+"稳定情况。我们强烈建议您使用64位内核,如果您决定继续,请牢记您将自己承担风"
+"险。"
 
 #. Type: boolean
 #. Description
@@ -58,5 +58,33 @@ msgid ""
 "identified as 32-bit or 64-bit. If you are not completely sure that the "
 "running kernel is a 64-bit one, you should probably stop the build."
 msgstr ""
-"无法确定您即将编译ZFS支持的内核是32位或64位。如果您不能确定当前运行的内核"
-"是64位的,那么建议您停止编译。"
+"无法确定您即将编译ZFS支持的内核是32位或64位。如果您不能确定当前运行的内核是64"
+"位的,那么建议您停止编译。"
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid "Licenses of ZFS and Linux are incompatible"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"ZFS is licensed under the Common Development and Distribution License "
+"(CDDL), and the Linux kernel is licensed under the GNU General Public "
+"License Version 2 (GPL-2). While both are free open source licenses they are "
+"restrictive licenses. The combination of them causes problems because it "
+"prevents using pieces of code exclusively available under one license with "
+"pieces of code exclusively available under the other in the same binary."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../zfs-dkms.templates:3001
+msgid ""
+"You are going to build ZFS using DKMS in which way they are not going to be "
+"built into one monolithic binary. Please be aware that distributing both of "
+"the binaries in the same media (disk images, virtual appliances, etc) may "
+"lead to infringing."
+msgstr ""
diff --git a/debian/rules b/debian/rules
index b5bf503..1f1c2dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,6 +155,7 @@ endif
 
 override_dh_auto_clean:
 	dh_auto_clean
+	debconf-updatepo
 	@if test -e META.orig; then mv META.orig META; fi
 	cp debian/control.in debian/control
 ifeq ($(BUILD_UDEB), true)
diff --git a/debian/zfs-dkms.postinst b/debian/zfs-dkms.postinst
index cb87e1c..24d50eb 100644
--- a/debian/zfs-dkms.postinst
+++ b/debian/zfs-dkms.postinst
@@ -4,6 +4,8 @@ set -e
 # Source debconf library (see dh_installdebconf(1) and #106070 #626312)
 . /usr/share/debconf/confmodule
 
+db_input low zfs-dkms/note-incompatible-licenses || true
+
 kernelbits=unknown
 if [ -r /proc/kallsyms ]; then
 	addrlen=$(head -1 /proc/kallsyms|awk '{print $1}'|wc -c)
diff --git a/debian/zfs-dkms.templates b/debian/zfs-dkms.templates
index 0527c83..475fb66 100644
--- a/debian/zfs-dkms.templates
+++ b/debian/zfs-dkms.templates
@@ -23,3 +23,17 @@ _Description: Abort building ZFS on an unknown kernel?
  are strongly advised to use a 64-bit kernel; if you do decide to
  proceed with using ZFS on this kernel then keep in mind that it is at
  your own risk.
+
+Template: zfs-dkms/note-incompatible-licenses
+Type: note
+_Description: Licenses of ZFS and Linux are incompatible
+ ZFS is licensed under the Common Development and Distribution License (CDDL),
+ and the Linux kernel is licensed under the GNU General Public License Version 2
+ (GPL-2). While both are free open source licenses they are restrictive
+ licenses. The combination of them causes problems because it prevents using
+ pieces of code exclusively available under one license with pieces of code
+ exclusively available under the other in the same binary. 
+ .
+ You are going to build ZFS using DKMS in which way they are not going to be built
+ into one monolithic binary. Please be aware that distributing both of the binaries
+ in the same media (disk images, virtual appliances, etc) may lead to infringing.

-- 
ZFS on Linux



More information about the Pkg-zfsonlinux-devel mailing list