[DRE-maint] Bug#958395: debdiff

Tue Apr 21 14:54:27 BST 2020

Package: release.debian.org
Tags: buster
Followup-For: Bug #958395
User: release.debian.org at packages.debian.org
Usertags: pu

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Please find attached the debdiff.


- -- System Information:
Debian Release: bullseye/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.5.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEvu1N7VVEpMA+KD3HS80FZ8KW0F0FAl6e+xMACgkQS80FZ8KW
0F3udQ//T0pYGhiJGbKiapotylSYrm3KFCdP7bdLUB0RSZPzQrdDdGfPoqucUTJ+
ZvJW8zmNJWwL96KFuUW6B1iJqzSvfY6Z5U9OXiY9J2E/FJ+43u+DcdSpamFn2TKA
Ypd6cyRsn8j0UwnZm5xlfIQF5lwH7iQP3ChcziMZLyHXTVGz678E5pahKubNvH4h
l+jm8a7GnjlX6vdmxWBdLGVUYdbzLZVjCOjotQjh4XyJZ5y9wF5cDLG5Kdty7Z7O
jWO13rzTATrrHSRrV/Lq7FMYaD4gSFxuOEaKSVes8c5HwrekArPUyL5wGLacBBad
mUdCiBScqyzaUI1sp+WXGRivt9J3DY2ipEmH7dJZ5kfpdp81Dz33XSm+jsu9TDNg
n6K6ntG90CRsIm1EkQZfOhhJ4GLTBq9klr/mU4ZxzZ1f8MSS6rq4Z9vnwIANEkQi
p811mxwh6laEv7psVTXjW1JRIC8GaeIXbjhfkuYxF4DjbjBgiOggMOzklZDSbBmd
ty6jBiPmtjpfaMPsoXTJb33FE22JK+bNJEuYkXIO0NICthF23rMwCNuoSKgR+GP1
4MagTLYY0ox9xbjwqUrcHNFam9DmDm3OJBNd/Kgm/U5s3XnYVLFDm9GBhfFgVIcW
yF/tXBOHYt7egvnhQllpQaZJ4bvrymCTCmbdxM163I/wx3vgIXM=
=5nqT
-----END PGP SIGNATURE-----
-------------- next part --------------
diff -Nru ruby-i18n-1.5.3/debian/changelog ruby-i18n-1.5.3/debian/changelog

--- ruby-i18n-1.5.3/debian/changelog	2019-02-02 13:46:00.000000000 +0100
+++ ruby-i18n-1.5.3/debian/changelog	2020-04-21 13:54:58.000000000 +0200
@@ -1,3 +1,21 @@
+ruby-i18n (1.5.3-1+deb10u1) buster; urgency=medium
+
+  * Team upload.
+  * Pick up patch from unstable to fix .gemspec created and shipped.
+
+  [ Antonio Terceiro ]
+  * d/patches/strip_bundler.patch: Rename to
+    d/patches/0001-disable-bundler-on-build-time-do-not-install-stuff-a.patch.
+  * d/patches/0002-gemspec-prepend-local-directory-to-the-LOAD_PATH.patch: Add
+    patch to avoid picking up the version number from an installed version of
+    the package (Closes: #927339).
+  * d/patches/series: Adjust.
+
+  [ Daniel Leidert ]
+  * d/control (Homepage): Fix homepage-field-uses-insecure-uri.
+
+ -- Daniel Leidert <dleidert at debian.org>  Tue, 21 Apr 2020 13:54:58 +0200
+
 ruby-i18n (1.5.3-1) unstable; urgency=medium
 
   * debian/watch: pull from github
diff -Nru ruby-i18n-1.5.3/debian/control ruby-i18n-1.5.3/debian/control
--- ruby-i18n-1.5.3/debian/control	2019-02-02 13:46:00.000000000 +0100
+++ ruby-i18n-1.5.3/debian/control	2020-04-21 13:54:58.000000000 +0200
@@ -11,9 +11,9 @@
                ruby-test-declarative,
                ruby-test-unit,
 Standards-Version: 4.3.0
-Vcs-Git: https://salsa.debian.org/ruby-team/ruby-i18n.git
+Vcs-Git: https://salsa.debian.org/ruby-team/ruby-i18n.git -b debian/buster
 Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-i18n
-Homepage: http://github.com/ruby-i18n/i18n
+Homepage: https://github.com/ruby-i18n/i18n
 Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 Rules-Requires-Root: no
diff -Nru ruby-i18n-1.5.3/debian/patches/0001-disable-bundler-on-build-time-do-not-install-stuff-a.patch ruby-i18n-1.5.3/debian/patches/0001-disable-bundler-on-build-time-do-not-install-stuff-a.patch
--- ruby-i18n-1.5.3/debian/patches/0001-disable-bundler-on-build-time-do-not-install-stuff-a.patch	1970-01-01 01:00:00.000000000 +0100
+++ ruby-i18n-1.5.3/debian/patches/0001-disable-bundler-on-build-time-do-not-install-stuff-a.patch	2020-04-21 13:54:58.000000000 +0200
@@ -0,0 +1,21 @@
+From: Jonas Genannt <jonas.genannt at capi2name.de>
+Date: Thu, 6 Feb 2020 18:20:06 +0100
+Subject: disable bundler on build time, do not install stuff at build time
+
+Forwarded: not-needed
+---
+ test/test_helper.rb | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/test/test_helper.rb b/test/test_helper.rb
+index d4a8488..cc81aec 100644
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -11,7 +11,6 @@ class TEST_CASE
+   end
+ end
+ 
+-require 'bundler/setup'
+ require 'i18n'
+ require 'mocha/setup'
+ require 'test_declarative'
diff -Nru ruby-i18n-1.5.3/debian/patches/0002-gemspec-prepend-local-directory-to-the-LOAD_PATH.patch ruby-i18n-1.5.3/debian/patches/0002-gemspec-prepend-local-directory-to-the-LOAD_PATH.patch
--- ruby-i18n-1.5.3/debian/patches/0002-gemspec-prepend-local-directory-to-the-LOAD_PATH.patch	1970-01-01 01:00:00.000000000 +0100
+++ ruby-i18n-1.5.3/debian/patches/0002-gemspec-prepend-local-directory-to-the-LOAD_PATH.patch	2020-04-21 13:54:58.000000000 +0200
@@ -0,0 +1,20 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Thu, 6 Feb 2020 18:20:29 +0100
+Subject: gemspec: prepend local directory to the $LOAD_PATH
+
+---
+ i18n.gemspec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/i18n.gemspec b/i18n.gemspec
+index 0e67209..f4211e9 100644
+--- a/i18n.gemspec
++++ b/i18n.gemspec
+@@ -1,6 +1,6 @@
+ # encoding: utf-8
+ 
+-$: << File.expand_path('../lib', __FILE__)
++$:.prepend File.expand_path('../lib', __FILE__)
+ require 'i18n/version'
+ 
+ Gem::Specification.new do |s|
diff -Nru ruby-i18n-1.5.3/debian/patches/series ruby-i18n-1.5.3/debian/patches/series
--- ruby-i18n-1.5.3/debian/patches/series	2019-02-02 13:46:00.000000000 +0100
+++ ruby-i18n-1.5.3/debian/patches/series	2020-04-21 13:54:58.000000000 +0200
@@ -1 +1,2 @@
-strip_bundler.patch
+0001-disable-bundler-on-build-time-do-not-install-stuff-a.patch
+0002-gemspec-prepend-local-directory-to-the-LOAD_PATH.patch
diff -Nru ruby-i18n-1.5.3/debian/patches/strip_bundler.patch ruby-i18n-1.5.3/debian/patches/strip_bundler.patch
--- ruby-i18n-1.5.3/debian/patches/strip_bundler.patch	2019-02-02 13:46:00.000000000 +0100
+++ ruby-i18n-1.5.3/debian/patches/strip_bundler.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-Author: Jonas Genannt <jonas.genannt at capi2name.de>
-Description: disable bundler on build time, do not install dependency on build
-             time via bundler
-Forwarded: not-needed
-
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -11,7 +11,6 @@ class TEST_CASE
-   end
- end
- 
--require 'bundler/setup'
- require 'i18n'
- require 'mocha/setup'
- require 'test_declarative'
