Merge remote-tracking branch 'salsa/master'

diff --git a/debian/changelog b/debian/changelog
index 28bb77c3258e46adf17ecee05560b1fffcefae21..d7f97dc00c2fa133711d8faf5af84807665889e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
 perltidy (20230309-1) unstable; urgency=medium
 
+  [ Don Armstrong ]
   * New upstream version
     - Includes patches for Object::Pad (closes: #1037462)
     - Remove obviated tokenizer patch
+  [ Debian Janitor ]
+  * Trim trailing whitespace.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 12 to 13.
+  * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Name,
+    Repository-Browse.
+  * Use canonical URL in Vcs-Browser.
+  * Update standards version to 4.6.1, no changes needed.
 
  -- Don Armstrong <don@debian.org>  Sat, 17 Jun 2023 15:21:02 -0700
 
@@ -150,7 +160,7 @@ perltidy (20031021-2) unstable; urgency=low
     in debian. (closes: #162066)
   * Change Build-Depends to perl (>=5.6.0-16) as per perl policy
   * Add reference to -st and note that - doesn't mean stdout to -o
-    documentation (closes: #202916) 
+    documentation (closes: #202916)
   * New upstream properly removes useless semi-colons (closes: #203171)
 
  -- Don Armstrong <don@donarmstrong.com>  Wed, 18 Aug 2004 22:54:01 -0700
@@ -204,5 +214,3 @@ perltidy (20010323-1) unstable; urgency=low
   * Adjusted paths in Makefile and fixed $DESTDIR problems.
 
  -- Dr. Guenter Bechly <gbechly@debian.org>  Tue, 27 Mar 2001 19:39:30 +0200
-
-

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12

diff --git a/debian/control b/debian/control
index 60aec4035595274e6d0fed68b6f0ed6e348165a3..ac0499741252d014eb686419b6d3a99acb8d2255 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,17 @@ Source: perltidy
 Section: devel
 Priority: optional
 Maintainer: Don Armstrong <don@debian.org>
-Build-Depends: debhelper (>= 12)
+Build-Depends: debhelper-compat (= 13)
 Build-Depends-Indep: perl
-Standards-Version: 4.3.0
-Homepage: http://perltidy.sourceforge.net/
+Standards-Version: 4.6.1
+Homepage: https://perltidy.sourceforge.net/
 Vcs-Git: https://salsa.debian.org/debian/perltidy.git
-Vcs-Browser: https://salsa.debian.org/debian/perltidy.git
+Vcs-Browser: https://salsa.debian.org/debian/perltidy
 
 Package: perltidy
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}
+Multi-Arch: foreign
 Description: Perl script indenter and reformatter
  Perltidy is a Perl script which indents and reformats Perl
  scripts to make them easier to read.

diff --git a/debian/rules b/debian/rules
index 6a7c69c437064d130cf15dddafaf036c538aadbe..d75e5071bf99f15f031e698771bccf9373799795 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,5 @@
 %:
        dh $@
 
-override_dh_installexamples: 
+override_dh_installexamples:
        dh_installexamples examples/*

diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644 (file)
index 0000000..fadc8b9
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Name: Perl-Tidy
+Bug-Database: https://github.com/perltidy/perltidy/issues
+Bug-Submit: https://github.com/perltidy/perltidy/issues/new
+Repository-Browse: https://github.com/perltidy/perltidy