summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2018-12-11 10:32:42 +1100
committerDimitri John Ledkov <xnox@ubuntu.com>2018-12-11 10:32:42 +1100
commit1312b93315237d8e4a4852e71b4d240533f7442f (patch)
treea738cf6e21b36f6b5fd9d1b9040cc851b5a9aaf0
parent59d2f4ec0b9dff7b56da34541dffd3e676adf584 (diff)
New upstream release.
-rw-r--r--Makefile2
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/python3-use-deb-layout.patch8
3 files changed, 12 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ee1fc13..8edfb8a 100644
--- a/Makefile
+++ b/Makefile
@@ -668,7 +668,7 @@ endif
ifeq ($(PYTHON_BINDINGS),1)
install_python: libbtrfsutil_python
$(Q)cd libbtrfsutil/python; \
- $(PYTHON) setup.py install --skip-build $(if $(DESTDIR),--root $(DESTDIR)) --prefix $(prefix)
+ $(PYTHON) setup.py install --install-layout=deb --skip-build $(if $(DESTDIR),--root $(DESTDIR)) --prefix $(prefix)
.PHONY: install_python
endif
diff --git a/debian/changelog b/debian/changelog
index 454d318..0858594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+btrfs-progs (4.19.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 11 Dec 2018 10:31:04 +1100
+
btrfs-progs (4.17-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/python3-use-deb-layout.patch b/debian/patches/python3-use-deb-layout.patch
index 467c044..c44773c 100644
--- a/debian/patches/python3-use-deb-layout.patch
+++ b/debian/patches/python3-use-deb-layout.patch
@@ -3,9 +3,11 @@ Author: Dimitri John Ledkov <xnox@ubuntu.com>
Forwarded: not-needed
Last-Update: 2018-05-14
---- btrfs-progs-4.16.1.orig/Makefile
-+++ btrfs-progs-4.16.1/Makefile
-@@ -651,7 +651,7 @@ endif
+Index: btrfs-progs/Makefile
+===================================================================
+--- btrfs-progs.orig/Makefile
++++ btrfs-progs/Makefile
+@@ -668,7 +668,7 @@ endif
ifeq ($(PYTHON_BINDINGS),1)
install_python: libbtrfsutil_python
$(Q)cd libbtrfsutil/python; \