Start working on NMU for new upstream version.

 - Bump the version (including epoch).
 - Remove the (now obsolete) do-not-install-mount-symlink patch.

diff --git a/debian/changelog b/debian/changelog
index 8ce015b0190ec36dd9bee40c0ce71a777ebdbc6b..de33a744c200e89b0190bb7b83de00d8e403331c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bcachefs-tools (1:1.6.3-0.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release.
+    * Remove the do-not-install-mount-symlink patch.
+    * Add epoch to deal with new upstream versioning scheme. (Closes: #1054620)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed, 21 Feb 2024 19:32:51 +0100
+
 bcachefs-tools (24+really1.3.4-2) unstable; urgency=medium
 
   * Upload to unstable 

diff --git a/debian/patches/do-not-install-mount-symlink b/debian/patches/do-not-install-mount-symlink
deleted file mode 100644 (file)
index cbbbf62..0000000
--- a/debian/patches/do-not-install-mount-symlink
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: do not install mount.bcachefs symlink 
-Bug-Debian: https://bugs.debian.org/1059373
-Last-Update: 2023-12-27
-
---- bcachefs-tools-24+really1.3.4.orig/Makefile
-+++ bcachefs-tools-24+really1.3.4/Makefile
-@@ -159,7 +159,8 @@ install: bcachefs
-       $(INSTALL) -m0755 -D initramfs/hook   $(DESTDIR)$(INITRAMFS_HOOK)
-       $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mkfs.bcachefs
-       $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/fsck.bcachefs
--      $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mount.bcachefs
-+      # See: #1057295
-+      # $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mount.bcachefs
-       $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mkfs.fuse.bcachefs
-       $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/fsck.fuse.bcachefs
-       $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mount.fuse.bcachefs

diff --git a/debian/patches/series b/debian/patches/series
index adfba3ce1092bed5bfba1bda56ed773af1f020e4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-do-not-install-mount-symlink