Merge branch 'fixes' into 'main'

update Debian packaging for Ambient

See merge request subplot/subplot!374

5 files changed, 11 insertions, 5 deletions

diff --git a/debian/control b/debian/control
index 22409e4..fb9fd6a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Lars Wirzenius <liw@liw.fi>
 Section: utils
 Priority: optional
 Standards-Version: 4.2.0
-Build-Depends: debhelper (>= 10~), dh-cargo, python3, python3-requests,
+Build-Depends: debhelper (>= 10~), python3, python3-requests,
   librsvg2-bin, graphviz, plantuml, daemonize, procps, tidy
 Homepage: https://subplot.liw.fi
 
diff --git a/debian/copyright b/debian/copyright
index fe3a242..d3493fa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,10 +13,10 @@ License: MIT
  distribute, sublicense, and/or sell copies of the Software, and to
  permit persons to whom the Software is furnished to do so, subject to
  the following conditions:
-
+ .
  The above copyright notice and this permission notice shall be
  included in all copies or substantial portions of the Software.
-
+ .
  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -24,6 +24,6 @@ License: MIT
  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+ .
  Fork this project to create your own MIT license that you can always
  link to.
diff --git a/debian/rules b/debian/rules
index ec7656c..f1632f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem cargo
+	dh $@
 
 override_dh_auto_build:
 	true
@@ -10,6 +10,7 @@ override_dh_auto_install:
 	cargo install --path=. --root=debian/subplot --offline
 	rm -f debian/subplot/.crates.toml
 	rm -f debian/subplot/.crates2.json
+	dh_lintian
 
 override_dh_auto_test:
 	echo disabled: ./check
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..511a470
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+subplot source: source-nmu-has-incorrect-version-number
+subplot source: no-nmu-in-changelog
diff --git a/debian/subplot.lintian-overrides b/debian/subplot.lintian-overrides
new file mode 100644
index 0000000..ad79ed0
--- /dev/null
+++ b/debian/subplot.lintian-overrides
@@ -0,0 +1,3 @@
+subplot binary: no-manual-page
+subplot: shell-script-fails-syntax-check
+subplot: script-not-executable