Source: amiga-fdisk
Version: 0.04-16
Severity: important
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

your package installs files into /sbin. Please move them to /usr/sbin,
and ensure no empty directories are still installed by your package.

To achieve this, a patch is attached. Please upload at your earliest
convenience, to further the UsrMerge effort [1].

Thanks,
Chris
diff -Nru amiga-fdisk-0.04/debian/amiga-fdisk-bf.dirs 
amiga-fdisk-0.04/debian/amiga-fdisk-bf.dirs
--- amiga-fdisk-0.04/debian/amiga-fdisk-bf.dirs 2023-01-06 18:16:48.000000000 
+0100
+++ amiga-fdisk-0.04/debian/amiga-fdisk-bf.dirs 1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-/sbin
diff -Nru amiga-fdisk-0.04/debian/amiga-fdisk-cross.dirs 
amiga-fdisk-0.04/debian/amiga-fdisk-cross.dirs
--- amiga-fdisk-0.04/debian/amiga-fdisk-cross.dirs      2023-01-06 
18:16:48.000000000 +0100
+++ amiga-fdisk-0.04/debian/amiga-fdisk-cross.dirs      1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/sbin
diff -Nru amiga-fdisk-0.04/debian/changelog amiga-fdisk-0.04/debian/changelog
--- amiga-fdisk-0.04/debian/changelog   2023-01-29 15:50:36.000000000 +0100
+++ amiga-fdisk-0.04/debian/changelog   2023-11-27 02:22:11.000000000 +0100
@@ -1,3 +1,10 @@
+amiga-fdisk (0.04-16.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install programs into /usr/sbin instead of /sbin. (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Mon, 27 Nov 2023 02:22:11 +0100
+
 amiga-fdisk (0.04-16) unstable; urgency=medium
 
   * update Standards-Version to 4.6.2 (no changes)
diff -Nru amiga-fdisk-0.04/debian/dirs amiga-fdisk-0.04/debian/dirs
--- amiga-fdisk-0.04/debian/dirs        2023-01-06 18:16:48.000000000 +0100
+++ amiga-fdisk-0.04/debian/dirs        1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/sbin
diff -Nru amiga-fdisk-0.04/debian/patches/0003_makefile 
amiga-fdisk-0.04/debian/patches/0003_makefile
--- amiga-fdisk-0.04/debian/patches/0003_makefile       2023-01-20 
10:56:56.000000000 +0100
+++ amiga-fdisk-0.04/debian/patches/0003_makefile       2023-11-27 
02:22:11.000000000 +0100
@@ -1,9 +1,11 @@
 Description: allow one to override flags in Makefile
 Author: Christian T. Steigies <c...@debian.org>
 Last-Update: 2018-05-15
---- a/Makefile
-+++ b/Makefile
-@@ -5,14 +5,14 @@
+Index: amiga-fdisk-0.04/Makefile
+===================================================================
+--- amiga-fdisk-0.04.orig/Makefile
++++ amiga-fdisk-0.04/Makefile
+@@ -5,21 +5,21 @@
  
  CC=             gcc
  ifeq ($(USE_READLINE),no)
@@ -23,3 +25,19 @@
  endif
  
  # Where to put binaries?
+ # See the "install" rule for the links. . .
+ 
+ INSTALL=      install
+-INSTALLDIR=   /sbin
++INSTALLDIR=   /usr/sbin
+ SBIN=                 amiga-fdisk
+ 
+ # Where to put datebase files?
+@@ -30,6 +30,7 @@ amiga-fdisk: amigastuff.o fdisk.o
+       $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ install: all
++      $(INSTALL) -d $(DESTDIR)$(INSTALLDIR)
+       $(INSTALL) $(SBIN) $(DESTDIR)$(INSTALLDIR)
+ 
+ clean:

Reply via email to