control: retitle -1 unblock: ruby-maven-libs/3.3.9+ds-3 Hi Graham,
On Sun, 1 Aug 2021 14:33:35 +0200 Graham Inggs <gin...@debian.org> wrote: > Control: tags -1 + moreinfo > > Hi Praveen > > On Sat, 31 Jul 2021 at 21:21, <prav...@mahishasura.pxq.in> wrote: > > + * Bump debhelper from old 10 to 12. > > Please revert this change. See 'Target fixes' section of the freeze policy > [1]. I reverted this debhelper bump and uploaded a -3 to unstable. Debdiff for both the -3 release v/s -2 release (this one), and -3 v/s -1.1 release (in testing) can be found attached w/ this email Since the -2 changelog states inclusion of d/salsa-ci.yml, but the package did not include it, I added two lines of this file, which should be absolutely harmless by all metrics. Thanks a lot for your work on the release :-) Nilesh
diff -Nru ruby-maven-libs-3.3.9+ds/debian/changelog
ruby-maven-libs-3.3.9+ds/debian/changelog
--- ruby-maven-libs-3.3.9+ds/debian/changelog 2021-08-01 00:23:32.000000000
+0530
+++ ruby-maven-libs-3.3.9+ds/debian/changelog 2021-08-03 22:02:31.000000000
+0530
@@ -1,3 +1,10 @@
+ruby-maven-libs (3.3.9+ds-3) unstable; urgency=medium
+
+ * Team Upload.
+ * Revert debhelper bump from 10 to 12 for bullseye release
+
+ -- Nilesh Patra <nil...@debian.org> Tue, 03 Aug 2021 22:02:31 +0530
+
ruby-maven-libs (3.3.9+ds-2) unstable; urgency=medium
* Team upload.
diff -Nru ruby-maven-libs-3.3.9+ds/debian/compat
ruby-maven-libs-3.3.9+ds/debian/compat
--- ruby-maven-libs-3.3.9+ds/debian/compat 1970-01-01 05:30:00.000000000
+0530
+++ ruby-maven-libs-3.3.9+ds/debian/compat 2021-08-03 21:59:35.000000000
+0530
@@ -0,0 +1 @@
+10
diff -Nru ruby-maven-libs-3.3.9+ds/debian/control
ruby-maven-libs-3.3.9+ds/debian/control
--- ruby-maven-libs-3.3.9+ds/debian/control 2021-08-01 00:23:32.000000000
+0530
+++ ruby-maven-libs-3.3.9+ds/debian/control 2021-08-03 22:00:16.000000000
+0530
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Ruby Team
<pkg-ruby-extras-maintain...@lists.alioth.debian.org>
Uploaders: Miguel Landaeta <nomad...@debian.org>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper (>= 10~),
gem2deb
Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/ruby-team/ruby-maven-libs.git
diff -Nru ruby-maven-libs-3.3.9+ds/debian/salsa-ci.yml
ruby-maven-libs-3.3.9+ds/debian/salsa-ci.yml
--- ruby-maven-libs-3.3.9+ds/debian/salsa-ci.yml 1970-01-01
05:30:00.000000000 +0530
+++ ruby-maven-libs-3.3.9+ds/debian/salsa-ci.yml 2021-08-03
21:59:05.000000000 +0530
@@ -0,0 +1,4 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ -
https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff -Nru ruby-maven-libs-3.3.9+ds/debian/changelog
ruby-maven-libs-3.3.9+ds/debian/changelog
--- ruby-maven-libs-3.3.9+ds/debian/changelog 2021-01-09 17:39:58.000000000
+0530
+++ ruby-maven-libs-3.3.9+ds/debian/changelog 2021-08-03 22:02:31.000000000
+0530
@@ -1,9 +1,36 @@
-ruby-maven-libs (3.3.9+ds-1.1) unstable; urgency=medium
+ruby-maven-libs (3.3.9+ds-3) unstable; urgency=medium
- * Non maintainer upload by the Reproducible Builds team.
- * No source change upload to rebuild on buildd with .buildinfo files.
+ * Team Upload.
+ * Revert debhelper bump from 10 to 12 for bullseye release
- -- Holger Levsen <hol...@debian.org> Sat, 09 Jan 2021 13:09:58 +0100
+ -- Nilesh Patra <nil...@debian.org> Tue, 03 Aug 2021 22:02:31 +0530
+
+ruby-maven-libs (3.3.9+ds-2) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Utkarsh Gupta ]
+ * Add salsa-ci.yml
+
+ [ Debian Janitor ]
+ * Use secure copyright file specification URI.
+ * Bump debhelper from old 10 to 12.
+ * Set debhelper-compat version in Build-Depends.
+ * Update Vcs-* headers from URL redirect.
+ * Use canonical URL in Vcs-Git.
+
+ [ Cédric Boutillier ]
+ * Update team name
+ * Add .gitattributes to keep unwanted files out of the source package
+
+ [ Pirate Praveen ]
+ * Add a simple require autopkgtest (to check the version patch)
+ * Fix maven version detection patch (Thanks to Raul Tambre) (Closes: #989175)
+ * Bump Standards-Version to 4.5.1 (no changes needed)
+ * Include NOTICE file in binary package
+ * Move debian/watch to gemwatch.debian.net
+
+ -- Pirate Praveen <prav...@debian.org> Sun, 01 Aug 2021 00:23:32 +0530
ruby-maven-libs (3.3.9+ds-1) unstable; urgency=medium
diff -Nru ruby-maven-libs-3.3.9+ds/debian/control
ruby-maven-libs-3.3.9+ds/debian/control
--- ruby-maven-libs-3.3.9+ds/debian/control 2017-03-10 00:09:43.000000000
+0530
+++ ruby-maven-libs-3.3.9+ds/debian/control 2021-08-03 22:00:16.000000000
+0530
@@ -1,13 +1,13 @@
Source: ruby-maven-libs
Section: ruby
Priority: optional
-Maintainer: Debian Ruby Extras Maintainers
<pkg-ruby-extras-maintain...@lists.alioth.debian.org>
+Maintainer: Debian Ruby Team
<pkg-ruby-extras-maintain...@lists.alioth.debian.org>
Uploaders: Miguel Landaeta <nomad...@debian.org>
Build-Depends: debhelper (>= 10~),
gem2deb
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-maven-libs.git
-Vcs-Browser:
https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-maven-libs.git
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/ruby-team/ruby-maven-libs.git
+Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-maven-libs
Homepage: https://github.com/takari/ruby-maven-libs
Testsuite: autopkgtest-pkg-ruby
XS-Ruby-Versions: all
diff -Nru ruby-maven-libs-3.3.9+ds/debian/copyright
ruby-maven-libs-3.3.9+ds/debian/copyright
--- ruby-maven-libs-3.3.9+ds/debian/copyright 2017-03-09 02:27:16.000000000
+0530
+++ ruby-maven-libs-3.3.9+ds/debian/copyright 2021-08-03 21:59:05.000000000
+0530
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ruby-maven-libs
Source: https://github.com/takari/ruby-maven-libs
diff -Nru
ruby-maven-libs-3.3.9+ds/debian/patches/02-do-not-hard-code-maven-version.patch
ruby-maven-libs-3.3.9+ds/debian/patches/02-do-not-hard-code-maven-version.patch
---
ruby-maven-libs-3.3.9+ds/debian/patches/02-do-not-hard-code-maven-version.patch
2017-03-10 00:16:22.000000000 +0530
+++
ruby-maven-libs-3.3.9+ds/debian/patches/02-do-not-hard-code-maven-version.patch
2021-08-03 21:59:05.000000000 +0530
@@ -3,8 +3,8 @@
Forwarded: no
Last-Update: 2017-03-09
---- ruby-maven-libs-3.3.9+ds.orig/lib/maven.rb
-+++ ruby-maven-libs-3.3.9+ds/lib/maven.rb
+--- a/lib/maven.rb
++++ b/lib/maven.rb
@@ -1,6 +1,14 @@
module Maven
@@ -17,7 +17,7 @@
+ # Default locale: en_US, platform encoding: UTF-8
+ # OS name: "linux", version: "4.9.0-1-amd64", arch: "amd64", family: "unix"
+ mvn_cmd_path = File.join(File.expand_path(File.dirname(__FILE__)), '..',
'..', '..', 'bin', 'mvn')
-+ VERSION = `#{mvn_cmd_path} --version`.split("\n").grep(/^Apache\
Maven/).shift.split[2].freeze # => "3.3.9"
++ VERSION = `#{mvn_cmd_path}
--version`.split("\n")[0].split[2].chomp("\e[m").freeze # => "3.3.9"
def self.exec( *args )
if args.member?( '-Dverbose=true' ) || args.member?( '-Dverbose' ) ||
args.member?( '-X' )
diff -Nru ruby-maven-libs-3.3.9+ds/debian/ruby-maven-libs.docs
ruby-maven-libs-3.3.9+ds/debian/ruby-maven-libs.docs
--- ruby-maven-libs-3.3.9+ds/debian/ruby-maven-libs.docs 1970-01-01
05:30:00.000000000 +0530
+++ ruby-maven-libs-3.3.9+ds/debian/ruby-maven-libs.docs 2021-08-03
21:59:05.000000000 +0530
@@ -0,0 +1,2 @@
+README.md
+maven-home/NOTICE
diff -Nru ruby-maven-libs-3.3.9+ds/debian/salsa-ci.yml
ruby-maven-libs-3.3.9+ds/debian/salsa-ci.yml
--- ruby-maven-libs-3.3.9+ds/debian/salsa-ci.yml 1970-01-01
05:30:00.000000000 +0530
+++ ruby-maven-libs-3.3.9+ds/debian/salsa-ci.yml 2021-08-03
21:59:05.000000000 +0530
@@ -0,0 +1,4 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ -
https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff -Nru ruby-maven-libs-3.3.9+ds/debian/tests/control
ruby-maven-libs-3.3.9+ds/debian/tests/control
--- ruby-maven-libs-3.3.9+ds/debian/tests/control 1970-01-01
05:30:00.000000000 +0530
+++ ruby-maven-libs-3.3.9+ds/debian/tests/control 2021-08-03
21:59:05.000000000 +0530
@@ -0,0 +1,2 @@
+Test-Command: ruby -e "require 'maven'"
+Depends: @
diff -Nru ruby-maven-libs-3.3.9+ds/debian/watch
ruby-maven-libs-3.3.9+ds/debian/watch
--- ruby-maven-libs-3.3.9+ds/debian/watch 2017-03-09 02:23:51.000000000
+0530
+++ ruby-maven-libs-3.3.9+ds/debian/watch 2021-08-03 21:59:05.000000000
+0530
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/\+ds// \
- http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/ruby-maven-libs
.*/ruby-maven-libs-(.*).tar.gz
+ https://gemwatch.debian.net/ruby-maven-libs .*/ruby-maven-libs-(.*).tar.gz
signature.asc
Description: PGP signature
