Merge pull request #17 from modelrockettier/master

Update debian URLs and remove libattr from dependencies

diff --git a/INSTALL b/INSTALL
index c20b7d9559d34968fce7d40952c29b50d6221124..5e22623be9d67465a47f4679fe0b85cce5c08213 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,21 @@
 
 Dependencies:
 
- * libattr1
+ * libaio
  * libblkid
- * libuuid
+ * libkeyutils
+ * liblz4
  * libscrypt
  * libsodium
- * libkeyutils
  * liburcu
+ * libuuid
+ * libzstd
  * pkg-config
  * zlib1g
 
 On debian, you can install these with
-    apt install -y pkg-config libblkid-dev uuid-dev libscrypt-dev libsodium-dev
-       libkeyutils-dev liburcu-dev zlib1g-dev libzstd-dev libattr1-dev
-       libaio-dev liblz4-dev
+    apt install -y pkg-config libaio-dev libblkid-dev libkeyutils-dev \
+        liblz4-dev libscrypt-dev libsodium-dev liburcu-dev libzstd-dev \
+        uuid-dev zlib1g-dev
 
 Then, just make && make install

diff --git a/Makefile b/Makefile
index d9220b981060106a87921df690087616e22fdc35..cffb3c657791447d7970e46ee00ef06f0a896911 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,13 @@ endif
 PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd"
 
 PKGCONFIG_CFLAGS:=$(shell pkg-config --cflags $(PKGCONFIG_LIBS))
+ifeq (,$(PKGCONFIG_CFLAGS))
+    $(error pkg-config error)
+endif
 PKGCONFIG_LDLIBS:=$(shell pkg-config --libs   $(PKGCONFIG_LIBS))
+ifeq (,$(PKGCONFIG_LDLIBS))
+    $(error pkg-config error (libs))
+endif
 
 CFLAGS+=$(PKGCONFIG_CFLAGS)
 LDLIBS+=$(PKGCONFIG_LDLIBS)

diff --git a/debian/control b/debian/control
index 08673f4be2c5849746b323bcc4032ea619fbc296..21205042923bd37bbcc7ae7ca4e066553594b313 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Maintainer: Kent Overstreet <kent.overstreet@gmail.com>
 Section: utils
 Priority: optional
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), pkg-config, libblkid-dev, uuid-dev,
-       libscrypt-dev, libsodium-dev, libkeyutils-dev, liburcu-dev, zlib1g-dev,
-       libattr1-dev, libaio-dev, libzstd-dev
-Homepage: http://bcache.evilpiepirate.org/
+Build-Depends: debhelper (>= 9), pkg-config, libaio-dev, libblkid-dev,
+       libkeyutils-dev, liblz4-dev, libscrypt-dev, libsodium-dev, liburcu-dev,
+       libzstd-dev, uuid-dev, zlib1g-dev
+Homepage: https://bcachefs.org/
 
 Package: bcachefs-tools
 Architecture: linux-any

diff --git a/debian/copyright b/debian/copyright
index 1491ae80524662b711b1369ab63901ad8de71eff..e6e051ba60ba2e2e57740d74718e9b2029e4ff7b 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: kmo@daterainc.com
                   linux-bcache@vger.kernel.org
-Source: http://evilpiepirate.org/git/bcache-tools.git
+Source: https://evilpiepirate.org/git/bcachefs-tools.git
 
 Files: *
 Copyright: 2013 Kent Overstreet <kmo@daterainc.com>

diff --git a/debian/watch b/debian/watch
index f9ca3c6d8e324f552911f886454018dbcb095670..a6755b163a88cc1f92fb6c60a9bca75e0c85a465 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
-
-http://evilpiepirate.org/git/bcache-tools.git/refs/ /git/bcache-tools.git/tag/\?id=v(\d[\d.]*)
+version=4
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/bcachefs-tools_$1\.tar\.gz/ \
+  https://github.com/koverstreet/bcachefs-tools/tags .*/v?(\d\S+)\.tar\.gz