--- Begin Message ---
Package: coquelicot
Version: 0.9.2-4
Tags: patch
Patch-series is attached. I bundled them as they seemed too small to open as 6
separate bugs. Bugs #773820 and #741421 are also patched by this, perhaps you
want to merge those bug-reports with this one? I don't know BTS well enough to
do that myself.
--
Rowan Thorpe
PGP fingerprint:
BB0A 0787 C0EE BDD8 7F97 3D30 49F2 13A5 265D CCBD
----
"There is a great difference between worry and concern. A worried person sees
a problem, and a concerned person solves a problem."
- Harold Stephens
>From 545ea2a6799231ec566f1713142737f7f18e9191 Mon Sep 17 00:00:00 2001
From: Rowan Thorpe <[email protected]>
Date: Thu, 8 Jan 2015 14:46:11 +0200
Subject: [PATCH 0/6] v0.9.2 bugfixes
While updating packaging for upstream v0.9.3 this patch-series proved useful
for v0.9.2 too (except for the backported fix which I added specifically). The
patches apply against 0.9.2-4 and build cleanly (in a Jessie pbuilder env).
The only patch which might also be useful upstream is the one for the obsolete
rubygem dep naming (patch 0004).
Rowan Thorpe (6):
Improve package pgp-signing
Fix collab-maint URL (Closes: #773820) &extra typo
Fixes for clean package rebuilding
Fix obsolete rubygem dep naming for activesupport
Backport 0.9.3 auth-err-spill fix(Closes: #741421)
Bump Standards-Version & associated change
.gitignore | 5 ++
debian/README.source | 4 +-
debian/control | 6 +-
debian/coquelicot.gemspec | 6 +-
debian/patches/0008-Fix-rubygem-dep-naming.patch | 44 ++++++++++++
.../0009-Backport-auth-error-spill-fix.patch | 35 ++++++++++
debian/patches/series | 2 +
debian/rules | 4 ++
debian/upstream/signing-key.asc | 79 ++++++++++++++++++++++
debian/watch | 2 +-
10 files changed, 178 insertions(+), 9 deletions(-)
create mode 100644 debian/patches/0008-Fix-rubygem-dep-naming.patch
create mode 100644 debian/patches/0009-Backport-auth-error-spill-fix.patch
create mode 100644 debian/upstream/signing-key.asc
--
2.1.3
>From 64d0d8e2e214dc075d1d177e8c2cce102e409206 Mon Sep 17 00:00:00 2001
From: Rowan Thorpe <[email protected]>
Date: Fri, 2 Jan 2015 15:27:37 +0200
Subject: [PATCH 1/6] Improve package pgp-signing
* Add pgpsigurlmangle option to debian/watch to silence warning
* Add debian/upstream/signing-key.asc to let uscan verify tarball sigs
---
debian/upstream/signing-key.asc | 79 +++++++++++++++++++++++++++++++++++++++++
debian/watch | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 debian/upstream/signing-key.asc
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..7139433
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,79 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+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
+KhrUdhu3XY0q18VVrQ==
+=VVWi
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index eba76ca..9599b39 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-https://coquelicot.potager.org/dist/ coquelicot-(.*)\.tar\.gz
+opts=pgpsigurlmangle=s/$/.asc/ https://coquelicot.potager.org/dist/ coquelicot-(.*)\.tar\.gz
--
2.1.3
>From 4e9ff3cce41acdfb30edb287271ed7e0a78c3b4c Mon Sep 17 00:00:00 2001
From: Rowan Thorpe <[email protected]>
Date: Fri, 2 Jan 2015 16:25:35 +0200
Subject: [PATCH 2/6] Fix collab-maint URL (Closes: #773820) &extra typo
---
debian/README.source | 4 ++--
debian/control | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 8b9d147..a61b1f0 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -9,9 +9,9 @@ Allbery at: <http://www.eyrie.org/~eagle/notes/debian/git.html>
Quilt patches are managed using gbp-pq.
-Here is how a to setup a work environment:
+Here is how to setup a work environment:
- git clone git+ssh://git.debian.org/colab-maint/coquelicot.git
+ git clone git+ssh://git.debian.org/collab-maint/coquelicot.git
cd coquelicot
git branch upstream origin/upstream
git branch pristine-tar origin/pristine-tar
diff --git a/debian/control b/debian/control
index f349555..ff1c8e0 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 7.0.50~),
ruby-tzinfo,
ruby-upr
Standards-Version: 3.9.5
-Vcs-Git: git://git.debian.org/colab-maint/coquelicot.git
+Vcs-Git: git://git.debian.org/collab-maint/coquelicot.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/coquelicot.git;a=summary
Homepage: https://coquelicot.potager.org/
XS-Ruby-Versions: all
--
2.1.3
>From 4cbc3bd2d496f3c7ae902c4f70fa6dfa75db26f9 Mon Sep 17 00:00:00 2001
From: Rowan Thorpe <[email protected]>
Date: Fri, 2 Jan 2015 16:32:05 +0200
Subject: [PATCH 3/6] Fixes for clean package rebuilding
* Add to gitignore: .pc/, debian/coquelicot.debhelper.log,
debian/coquelicot.substvars, lib/coquelicot/debian.rb,
public/javascripts/jquery.min.js
* Cleanup extra generated files
---
.gitignore | 5 +++++
debian/rules | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/.gitignore b/.gitignore
index dac6ea1..9c15fcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.gem
+.pc/
.bundle
vendor/bundle/
Gemfile.lock
@@ -16,4 +17,8 @@ bin/*
debian/tmp/
debian/coquelicot/
debian/coquelicot.8
+debian/coquelicot.debhelper.log
+debian/coquelicot.substvars
lib/coquelicot/files.rb
+lib/coquelicot/debian.rb
+public/javascripts/jquery.min.js
diff --git a/debian/rules b/debian/rules
index 12a4572..24d1b13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,3 +67,7 @@ override_dh_installman:
override_dh_installchangelogs:
dh_installchangelogs -O--buildsystem=ruby NEWS
+
+override_dh_clean:
+ dh_clean
+ -rm -r public/javascripts/jquery.min.js lib/coquelicot/debian.rb
--
2.1.3
>From 345cbb21c248d59fc6cd809da0929fac376dfe2b Mon Sep 17 00:00:00 2001
From: Rowan Thorpe <[email protected]>
Date: Fri, 2 Jan 2015 20:13:13 +0200
Subject: [PATCH 4/6] Fix obsolete rubygem dep naming for activesupport
* Update debian/coquelicot.gemspec
* Add 0008-Fix-rubygem-dep-naming.patch for Gemfile.lock &
coquelicot.gemspec
---
debian/coquelicot.gemspec | 6 ++--
debian/patches/0008-Fix-rubygem-dep-naming.patch | 44 ++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 48 insertions(+), 3 deletions(-)
create mode 100644 debian/patches/0008-Fix-rubygem-dep-naming.patch
diff --git a/debian/coquelicot.gemspec b/debian/coquelicot.gemspec
index 733b1ba..1edc7b3 100644
--- a/debian/coquelicot.gemspec
+++ b/debian/coquelicot.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<timecop>, [">= 0"])
s.add_development_dependency(%q<rack-test>, [">= 0"])
s.add_development_dependency(%q<capybara>, [">= 0"])
- s.add_development_dependency(%q<active_support>, [">= 0"])
+ s.add_development_dependency(%q<activesupport>, [">= 0"])
s.add_development_dependency(%q<gettext>, [">= 0"])
s.add_runtime_dependency(%q<sinatra>, ["~> 1.3"])
s.add_runtime_dependency(%q<sinatra-contrib>, ["~> 1.3"])
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<timecop>, [">= 0"])
s.add_dependency(%q<rack-test>, [">= 0"])
s.add_dependency(%q<capybara>, [">= 0"])
- s.add_dependency(%q<active_support>, [">= 0"])
+ s.add_dependency(%q<activesupport>, [">= 0"])
s.add_dependency(%q<gettext>, [">= 0"])
s.add_dependency(%q<sinatra>, ["~> 1.3"])
s.add_dependency(%q<sinatra-contrib>, ["~> 1.3"])
@@ -73,7 +73,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<timecop>, [">= 0"])
s.add_dependency(%q<rack-test>, [">= 0"])
s.add_dependency(%q<capybara>, [">= 0"])
- s.add_dependency(%q<active_support>, [">= 0"])
+ s.add_dependency(%q<activesupport>, [">= 0"])
s.add_dependency(%q<gettext>, [">= 0"])
s.add_dependency(%q<sinatra>, ["~> 1.3"])
s.add_dependency(%q<sinatra-contrib>, ["~> 1.3"])
diff --git a/debian/patches/0008-Fix-rubygem-dep-naming.patch b/debian/patches/0008-Fix-rubygem-dep-naming.patch
new file mode 100644
index 0000000..64d1b22
--- /dev/null
+++ b/debian/patches/0008-Fix-rubygem-dep-naming.patch
@@ -0,0 +1,44 @@
+From: Rowan Thorpe <[email protected]>
+Date: Fri, 2 Jan 2015 18:06:07 +0200
+Subject: Fix rubygem dep outdated-naming bug,update Gemfile.lock
+
+---
+ coquelicot.gemspec | 2 +-
+ Gemfile.lock | 124 +++++++++++++++++++++++++++++------------------------------
+ 2 files changed, 63 insertions(+), 63 deletions(-)
+
+diff --git a/coquelicot.gemspec b/coquelicot.gemspec
+index 5d8f3e1..19e6c94 100644
+--- a/coquelicot.gemspec
++++ b/coquelicot.gemspec
+@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
+ s.add_development_dependency 'timecop'
+ s.add_development_dependency 'rack-test'
+ s.add_development_dependency 'capybara'
+- s.add_development_dependency 'active_support'
++ s.add_development_dependency 'activesupport'
+ s.add_development_dependency 'tzinfo'
+ s.add_development_dependency 'gettext'
+
+diff --git a/Gemfile.lock b/Gemfile.lock
+index 8478694..87bfc51 100644
+--- a/Gemfile.lock
++++ b/Gemfile.lock
+@@ -20,8 +20,6 @@ PATH
+ GEM
+ remote: https://rubygems.org/
+ specs:
+- active_support (3.0.0)
+- activesupport (= 3.0.0)
+ activesupport (3.0.0)
+ backports (3.1.0)
+ capybara (1.1.2)
+@@ -108,7 +106,7 @@ PLATFORMS
+ ruby
+
+ DEPENDENCIES
+- active_support
++ activesupport
+ capybara
+ coquelicot!
+ gettext
diff --git a/debian/patches/series b/debian/patches/series
index 796699a..b34d480 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-Adjust-paths-to-fit-Debian-packaging.patch
0006-Stop-using-non-free-background-image.patch
0007-Add-support-for-the-Psych-YAML-engine.patch
+0008-Fix-rubygem-dep-naming.patch
--
2.1.3
>From 7d49488b22f0acac20580cacc93720304484f200 Mon Sep 17 00:00:00 2001
From: Rowan Thorpe <[email protected]>
Date: Thu, 8 Jan 2015 14:08:37 +0200
Subject: [PATCH 5/6] Backport 0.9.3 auth-err-spill fix(Closes: #741421)
---
.../0009-Backport-auth-error-spill-fix.patch | 35 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 36 insertions(+)
create mode 100644 debian/patches/0009-Backport-auth-error-spill-fix.patch
diff --git a/debian/patches/0009-Backport-auth-error-spill-fix.patch b/debian/patches/0009-Backport-auth-error-spill-fix.patch
new file mode 100644
index 0000000..ac3a1dc
--- /dev/null
+++ b/debian/patches/0009-Backport-auth-error-spill-fix.patch
@@ -0,0 +1,35 @@
+From: Rowan Thorpe <[email protected]>
+Date: Thu, 8 Jan 2015 13:28:10 +0200
+Subject: Backport auth-error spill fix from 0.9.3
+
+---
+ lib/coquelicot/app.rb | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/lib/coquelicot/app.rb b/lib/coquelicot/app.rb
+index 6c2ccb0..73328b6 100644
+--- a/lib/coquelicot/app.rb
++++ b/lib/coquelicot/app.rb
+@@ -278,7 +278,11 @@
+
+ error 500..510 do
+ @error = env['sinatra.error'] || response.body.join
+- haml :error
++ if request.xhr?
++ "#{response.body.join}"
++ else
++ haml :error
++ end
+ end
+
+ get '/style.css' do
+@@ -337,6 +341,9 @@
+ 'OK'
+ rescue Coquelicot::Auth::Error => ex
+ error 503, ex.message
++ rescue => ex
++ dump_errors! ex
++ error 500, "Issue has been logged."
+ end
+ end
+
diff --git a/debian/patches/series b/debian/patches/series
index b34d480..8170ae3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
0006-Stop-using-non-free-background-image.patch
0007-Add-support-for-the-Psych-YAML-engine.patch
0008-Fix-rubygem-dep-naming.patch
+0009-Backport-auth-error-spill-fix.patch
--
2.1.3
>From 545ea2a6799231ec566f1713142737f7f18e9191 Mon Sep 17 00:00:00 2001
From: Rowan Thorpe <[email protected]>
Date: Thu, 8 Jan 2015 14:27:16 +0200
Subject: [PATCH 6/6] Bump Standards-Version & associated change
* Change Standards-Version: 3.9.5 -> 3.9.6
* Use canonical URLs in debian/control to silence Lintian
---
debian/control | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index ff1c8e0..a21c904 100644
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,9 @@ Build-Depends: debhelper (>= 7.0.50~),
ruby-timecop,
ruby-tzinfo,
ruby-upr
-Standards-Version: 3.9.5
-Vcs-Git: git://git.debian.org/collab-maint/coquelicot.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/coquelicot.git;a=summary
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/collab-maint/coquelicot.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/coquelicot.git;a=summary
Homepage: https://coquelicot.potager.org/
XS-Ruby-Versions: all
--
2.1.3
--- End Message ---
