From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 13 Jul 2019 21:29:32 +0000 (-0400)
Subject: debian: move logsave to its own package
X-Git-Tag: v1.45.3~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb788de9b021d21686d08366f02415a4c0a91f5e;p=thirdparty%2Fe2fsprogs.git

debian: move logsave to its own package

Addresses-Debian-Bug: #923372
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/debian/changelog b/debian/changelog
index 57dd12829..5a2bfed99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ e2fsprogs (1.45.3-1) unstable; urgency=medium
   * Restructure rules file to use dh
   * Only require the udev, systemd, and cron build dependencies when
     building on Linux. (Closes: #931266)
+  * Move logsave to its own package.  (Closes: #923372)
 
- -- Theodore Y. Ts'o <tytso@mit.edu>  Sat, 13 Jul 2019 16:13:38 -0400
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Sat, 13 Jul 2019 17:28:38 -0400
 
 e2fsprogs (1.45.2-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 9405de6de..48a2dd9cf 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,19 @@ Description: ext2 / ext3 / ext4 file system driver for FUSE
  writing from devices or image files containing ext2, ext3, and ext4
  file systems.
 
+Package: logsave
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: e2fsprogs (<< 1.45.2-1)
+Breaks: e2fsprogs (<< 1.45.2-1)
+Architecture: linux-any kfreebsd-any
+Description: save the output of a command in a log file
+ The logsave program will execute cmd_prog with the specified
+ argument(s), and save a copy of its output to logfile.  If the
+ containing directory for logfile does not exist, logsave will
+ accumulate the output in memory until it can be written out.  A copy
+ of the output will also be written to standard output.
+
 Package: e2fsck-static
 Priority: optional
 Depends: ${misc:Depends}
@@ -188,7 +201,7 @@ Package: e2fsprogs
 XB-Important: yes
 Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, libblkid1, libuuid1
 Multi-Arch: foreign
-Suggests: gpart, parted, fuse2fs, e2fsck-static
+Suggests: gpart, parted, fuse2fs, e2fsck-static, logsave
 Recommends: e2fsprogs-l10n
 Architecture: any
 Description: ext2/ext3/ext4 file system utilities
diff --git a/debian/e2fsprogs.install b/debian/e2fsprogs.install
index 38064a44b..f23399d3a 100644
--- a/debian/e2fsprogs.install
+++ b/debian/e2fsprogs.install
@@ -9,7 +9,6 @@ sbin/e2scrub
 sbin/e2scrub_all
 sbin/e2undo
 sbin/fsck.ext?
-sbin/logsave
 sbin/mke2fs
 sbin/mkfs.ext?
 sbin/resize2fs
@@ -43,7 +42,6 @@ usr/share/man/man8/e4crypt.8
 usr/share/man/man8/e4defrag.8
 usr/share/man/man8/filefrag.8
 usr/share/man/man8/fsck.ext?.8
-usr/share/man/man8/logsave.8
 usr/share/man/man8/mke2fs.8
 usr/share/man/man8/mkfs.ext?.8
 usr/share/man/man8/mklost+found.8
diff --git a/debian/logsave.install b/debian/logsave.install
new file mode 100644
index 000000000..dd5b065f6
--- /dev/null
+++ b/debian/logsave.install
@@ -0,0 +1,2 @@
+sbin/logsave
+usr/share/man/man8/logsave.8
diff --git a/doc/RelNotes/v1.45.3.txt b/doc/RelNotes/v1.45.3.txt
index e9fdac754..658cafaed 100644
--- a/doc/RelNotes/v1.45.3.txt
+++ b/doc/RelNotes/v1.45.3.txt
@@ -31,7 +31,8 @@ problem descriptions.  (Addresses Debian Bug: #892173)
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
 
-Fixed various debian packaging issues.  (Addresses Debian Bug: #931266)
+Fixed various debian packaging issues.  (Addresses Debian Bug: #931266,
+#923372)
 
 Fixed error checking for calls to posix_{memalign,fadvise}.