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

Aron Xu aron at debian.org
Sun Nov 1 02:56:27 UTC 2015


The following commit has been merged in the master branch:
commit 1bb9c3bf8ccd0c9c21de3282f8671727bd654509
Author: Aron Xu <aron at debian.org>
Date:   Sun Nov 1 10:58:50 2015 +0800

    Move the package to contrib

diff --git a/debian/control b/debian/control
index 59477d0..6b57290 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: zfs-linux
-Section: kernel
+Section: contrib/kernel
 Priority: optional
 Maintainer: Debian ZFS on Linux maintainers <pkg-zfsonlinux-devel at lists.alioth.debian.org>
 Uploaders: Aron Xu <aron at debian.org>,
@@ -22,7 +22,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/zfs.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
 
 Package: libnvpair1linux
-Section: libs
+Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Solaris name-value library for Linux
@@ -31,7 +31,7 @@ Description: Solaris name-value library for Linux
  kernel and userland, and possibly saving onto disk files.
 
 Package: libuutil1linux
-Section: libs
+Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Solaris userland utility library for Linux
@@ -46,7 +46,7 @@ Description: Solaris userland utility library for Linux
   * libshare: NFS, SMB, and iSCSI service integration for ZFS.
 
 Package: libzfslinux-dev
-Section: libdevel
+Section: contrib/libdevel
 Architecture: linux-any
 Depends: libzfs2linux (= ${binary:Version}), ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
@@ -58,7 +58,7 @@ Description: Native ZFS filesystem development files for Linux
  and libzfs2.
 
 Package: libzfs2linux
-Section: libs
+Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Native ZFS filesystem library for Linux
@@ -69,7 +69,7 @@ Description: Native ZFS filesystem library for Linux
  The ZFS library provides support for managing ZFS filesystems.
 
 Package: libzpool1linux
-Section: libs
+Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Native ZFS pool library for Linux
@@ -106,7 +106,7 @@ Description: Native ZFS root filesystem capabilities for Linux
  for the initramfs-tools infrastructure.
 
 Package: zfsutils-linux
-Section: admin
+Section: contrib/admin
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: lsb-base, zfs-modules | zfs-dkms
@@ -123,7 +123,7 @@ Description: command-line tools to manage ZFS filesystems
  ZFS filesystems.
 
 Package: zfs-dbg
-Section: debug
+Section: contrib/debug
 Priority: extra
 Architecture: linux-any
 Depends: libnvpair1linux (= ${binary:Version}),
diff --git a/debian/control.in b/debian/control.in
index 59477d0..6b57290 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,5 +1,5 @@
 Source: zfs-linux
-Section: kernel
+Section: contrib/kernel
 Priority: optional
 Maintainer: Debian ZFS on Linux maintainers <pkg-zfsonlinux-devel at lists.alioth.debian.org>
 Uploaders: Aron Xu <aron at debian.org>,
@@ -22,7 +22,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/zfs.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
 
 Package: libnvpair1linux
-Section: libs
+Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Solaris name-value library for Linux
@@ -31,7 +31,7 @@ Description: Solaris name-value library for Linux
  kernel and userland, and possibly saving onto disk files.
 
 Package: libuutil1linux
-Section: libs
+Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Solaris userland utility library for Linux
@@ -46,7 +46,7 @@ Description: Solaris userland utility library for Linux
   * libshare: NFS, SMB, and iSCSI service integration for ZFS.
 
 Package: libzfslinux-dev
-Section: libdevel
+Section: contrib/libdevel
 Architecture: linux-any
 Depends: libzfs2linux (= ${binary:Version}), ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
@@ -58,7 +58,7 @@ Description: Native ZFS filesystem development files for Linux
  and libzfs2.
 
 Package: libzfs2linux
-Section: libs
+Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Native ZFS filesystem library for Linux
@@ -69,7 +69,7 @@ Description: Native ZFS filesystem library for Linux
  The ZFS library provides support for managing ZFS filesystems.
 
 Package: libzpool1linux
-Section: libs
+Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Native ZFS pool library for Linux
@@ -106,7 +106,7 @@ Description: Native ZFS root filesystem capabilities for Linux
  for the initramfs-tools infrastructure.
 
 Package: zfsutils-linux
-Section: admin
+Section: contrib/admin
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: lsb-base, zfs-modules | zfs-dkms
@@ -123,7 +123,7 @@ Description: command-line tools to manage ZFS filesystems
  ZFS filesystems.
 
 Package: zfs-dbg
-Section: debug
+Section: contrib/debug
 Priority: extra
 Architecture: linux-any
 Depends: libnvpair1linux (= ${binary:Version}),
diff --git a/debian/control.modules.in b/debian/control.modules.in
index 2f4d015..92de81f 100644
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -1,5 +1,5 @@
 Source: zfs-linux
-Section: kernel
+Section: contrib/kernel
 Priority: extra
 Maintainer: Debian ZFS on Linux maintainers <pkg-zfsonlinux-devel at lists.alioth.debian.org>
 Build-Depends: autotools-dev,
@@ -37,7 +37,7 @@ Description: Native ZFS filesystem kernel modules for Linux (kernel _KVERS_)
 
 Package: zfs-modules-_KVERS_-di
 Package-Type: udeb
-Section: debian-installer
+Section: contrib/debian-installer
 Architecture: _ARCH_
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: zfs-modules, zfs-modules-_KVERS_-udeb
diff --git a/debian/control.udeb.in b/debian/control.udeb.in
index 83ce19d..7c8ed68 100644
--- a/debian/control.udeb.in
+++ b/debian/control.udeb.in
@@ -1,7 +1,7 @@
 
 Package: libnvpair1-udeb
 Package-Type: udeb
-Section: debian-installer
+Section: contrib/debian-installer
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Solaris name-value library for Linux (debian-installer)
@@ -13,7 +13,7 @@ Description: Solaris name-value library for Linux (debian-installer)
 
 Package: libuutil1-udeb
 Package-Type: udeb
-Section: debian-installer
+Section: contrib/debian-installer
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Solaris userland utility library for Linux (debian-installer)
@@ -31,7 +31,7 @@ Description: Solaris userland utility library for Linux (debian-installer)
 
 Package: libzfs1-udeb
 Package-Type: udeb
-Section: debian-installer
+Section: contrib/debian-installer
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: OpenSolaris ZFS library (debian-installer)
@@ -44,7 +44,7 @@ Description: OpenSolaris ZFS library (debian-installer)
 
 Package: libzpool1-udeb
 Package-Type: udeb
-Section: debian-installer
+Section: contrib/debian-installer
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Native ZFS pool library for Linux (debian-installer)
@@ -58,7 +58,7 @@ Description: Native ZFS pool library for Linux (debian-installer)
 
 Package: zfsutils-udeb
 Package-Type: udeb
-Section: debian-installer
+Section: contrib/debian-installer
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libuutil1-udeb (= ${binary:Version}), libnvpair1-udeb (= ${binary:Version}),

-- 
ZFS on Linux



More information about the Pkg-zfsonlinux-devel mailing list