From 477dd8ce890fe85f4e7b01a67517d0076dc2d9cc Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Mon, 14 May 2018 09:45:18 +0100
Subject: Update packaging for 4.16.1

* Drop transitional btrfs-tools package.
* Drop cross.patch, similar change done upstream.
---
 debian/changelog           |  5 +++++
 debian/control             |  7 -------
 debian/patches/cross.patch | 30 ------------------------------
 debian/patches/series      |  1 -
 4 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 debian/patches/cross.patch
 delete mode 100644 debian/patches/series

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index f7546403..87c0f3af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 btrfs-progs (4.16.1-1) unstable; urgency=medium
 
   * New upstream release.
+  * Drop transitional btrfs-tools package.
+  * Drop cross.patch, similar change done upstream.
+  * Package without libbtrfsutils, or python bindings for now, as these
+    appear to be statically linked only. Clarification is sought from
+    linux-btrfs mailing list if these should be publically exposed or not.
 
  -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 08 May 2018 14:17:03 -0700
 
diff --git a/debian/control b/debian/control
index 1114127f..c7005158 100644
--- a/debian/control
+++ b/debian/control
@@ -35,13 +35,6 @@ Description: Checksumming Copy on Write Filesystem utilities
  This package contains utilities (mkfs, fsck) used to work with btrfs
  and an utility (btrfs-convert) to make a btrfs filesystem from an ext3.
 
-Package: btrfs-tools
-Section: oldlibs
-Architecture: linux-any
-Depends: btrfs-progs, ${misc:Depends}, ${shlibs:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
 Package: btrfs-progs-udeb
 Package-Type: udeb
 Section: debian-installer
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
deleted file mode 100644
index e3242426..00000000
--- a/debian/patches/cross.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Helmut Grohne <helmut@subdivi.de>
-Subject: use PKG_PROG_PKG_CONFIG correctly
-
-Using $PKG_CONFIG allows PKG_PROG_PKG_CONFIG to add $ac_tool_prefix which is
-crucial for cross compilation.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -55,8 +55,8 @@
- dnl Calls pkg-config --static
- dnl
- AC_DEFUN([PKG_STATIC], [
--  if AC_RUN_LOG([pkg-config --exists --print-errors "$2"]); then
--    $1=`pkg-config --libs --static "$2"`
-+  if AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$2"]); then
-+    $1=`$PKG_CONFIG --libs --static "$2"`
-     AC_SUBST([$1])
-   else
-     AC_MSG_ERROR([pkg-config description of $2, needed for static build, is not available])
-@@ -203,8 +203,8 @@
- # Our udev rule gives us the friendly dm names but isn't required (or valid)
- # on earlier releases.
- UDEVDIR=
--if pkg-config udev --atleast-version 190; then
--	UDEVDIR="$(pkg-config udev --variable=udevdir)"
-+if $PKG_CONFIG udev --atleast-version 190; then
-+	UDEVDIR="$($PKG_CONFIG udev --variable=udevdir)"
- fi
- AC_SUBST(UDEVDIR)
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index def274a0..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-cross.patch
-- 
cgit v1.2.3