Hello, please find as an attachment a patch to fix #1012190 and #981703
and close them.

Best regards,                   Georges.

tags 1012190 + patch
thank you

-- 
Georges KHAZNADAR et Jocelyne FOURNIER
22 rue des mouettes, 59240 Dunkerque France.
Téléphone +33 (0)3 28 29 17 70

diff --git a/debian/changelog b/debian/changelog
index f5795bd..2c59b7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+slop (7.6-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * added a file d/libslop7.6.shlibs; #closes: #1012190
+  * modified d/control
+    + now libslop7.6 conflicts with libslop7.5 and replaces it
+    + added a strict dependency libdevel =>
+      libslopy7.6(>= ${source:Version}), libslopy7.6(<= ${source:Version}.1~)
+  * applied GSR's patch; closes: #981703
+  * modified d/rules to clean out bin/slop
+  * checked that the last release of maim can be built with this release of
+    libslop7.6 and run seamlessly
+
+ -- Georges Khaznadar <georg...@debian.org>  Fri, 24 Jun 2022 15:38:33 +0200
+
 slop (7.6-2) experimental; urgency=medium
 
   * split out shared library in new binary packages (Closes: #1009010)
diff --git a/debian/control b/debian/control
index 42c61ce..8e6487b 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,8 @@ Description: queries for a selection from the user and prints the region to stdo
   * Supports a magnifying glass.
 
 Package: libslopy7.6
+Conflicts:  libslopy7.5
+Replaces: libslopy7.5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: queries for a selection from the user and prints the region to stdout
@@ -65,7 +67,8 @@ Description: queries for a selection from the user and prints the region to stdo
 Package: libslopy-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends},
+ libslopy7.6(>= ${source:Version}), libslopy7.6(<= ${source:Version}.1~)
 Description: queries for a selection from the user and prints the region to stdout
  slop (Select Operation) is an application that queries for a
  selection from the user and prints the region to stdout. It grabs the
diff --git a/debian/libslopy7.6.shlibs b/debian/libslopy7.6.shlibs
new file mode 100644
index 0000000..05db7f3
--- /dev/null
+++ b/debian/libslopy7.6.shlibs
@@ -0,0 +1 @@
+libslopy 7.6 libslopy7.6
diff --git a/debian/patches/fix981703.patch b/debian/patches/fix981703.patch
new file mode 100644
index 0000000..c18e853
--- /dev/null
+++ b/debian/patches/fix981703.patch
@@ -0,0 +1,16 @@
+fix 981703: slop: Improve man page for better apropos results
+Index: slop/slop.1
+===================================================================
+--- slop.orig/slop.1
++++ slop/slop.1
+@@ -1,8 +1,8 @@
+ .\" Manpage for slop.
+ .\" Contact naelst...@gmail.com to correct errors or typos.
+-.TH SLOP 1 2017-03-21 Linux "slop man page"
++.TH SLOP 1 2021-02-03 Linux "slop man page"
+ .SH NAME
+-slop \- select operation
++slop \- select operation, either mark screen region or pick window
+ .SH SYNOPSIS
+ slop [-klqn] [OPTIONS]
+ .SH DESCRIPTION
diff --git a/debian/patches/series b/debian/patches/series
index 8c97052..fef7054 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix994824.patch
+fix981703.patch
diff --git a/debian/rules b/debian/rules
index bb2a2a9..61fae45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,3 +20,8 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 # main packaging script based on dh7 syntax
 %:
 	dh $@
+
+override_dh_auto_clean:
+	dh_auto_clean
+	# remove a binary file not cleaned by the Makefile
+	rm -f bin/slop

Attachment: signature.asc
Description: PGP signature

Reply via email to