[DRE-commits] [ruby-ramaze] 02/04: Minor fixes, including some lintian warnings

[Gunnar Wolf]

This is an automated email from the git hooks/post-receive script.

gwolf pushed a commit to branch master
in repository ruby-ramaze.

commit ca54921256da9f4b975c53094fb9644e338923e0
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Thu Aug 29 11:46:19 2013 -0500

    Minor fixes, including some lintian warnings
---
 debian/changelog                     |    3 ++-
 debian/control                       |   10 ++++++----
 debian/copyright                     |    2 +-
 debian/ruby-ramaze.dirs              |    1 +
 debian/ruby-ramaze.lintian-overrides |    5 +++++
 debian/rules                         |    7 +++++++
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6481ea8..c082b77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ ruby-ramaze (2012.12.08-1) UNRELEASED; urgency=low
   * Create transitional packages; review+update copyright information
   * Incorporate previous packaging information from the old packaging
   * Don't require rubygems from within Debian packages
+  * Minor fixes, including some lintian warnings
 
- -- Gunnar Wolf <gwolf at gwolf.org>  Thu, 29 Aug 2013 10:10:15 -0500
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 29 Aug 2013 10:10:15 -0500
 
 libramaze-ruby (2010.06.18-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3f82977..a35a8a9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: ruby-ramaze
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Cédric Boutillier <cedric.boutillier at gmail.com>
+Uploaders: Cédric Boutillier <cedric.boutillier at gmail.com>, Gunnar Wolf <gwolf at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-ramaze.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-ramaze.git;a=summary
 Homepage: http://ramaze.net/
@@ -19,8 +19,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-innat
 Replaces: libramaze-ruby1.8 (<< 3.1.4-1~), libramaze-ruby (<< 3.1.4-1~)
 Breaks: libramaze-ruby1.8 (<< 3.1.4-1~), libramaze-ruby (<< 3.1.4-1~)
 Provides: libramaze-ruby1.8, libramaze-ruby
-Description: Ramaze is a simple and modular web framework
- Ramaze is a simple and modular web framework
+Description: Simple and modular web framework
+ Ramaze is a very simple and straight-forward web-framework.
+ The philosophy of it could be expressed in a mix of KISS and POLS,
+ trying to make simple things simple and complex things possible and fun.
 
 Package: libramaze-ruby
 Section: oldlibs
diff --git a/debian/copyright b/debian/copyright
index 96e3bcc..df6a171 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -65,7 +65,7 @@ License: GPL-2
 
 Files: lib/proto/public/js/jquery.js
 Copyright: 2008 John Resig
-License: MIT, GPL-2
+License: MIT or GPL-2
 
 Files: lib/ramaze/snippets/ramaze/lru_hash.rb
 Copyright: 2002 Yoshinori K. Okuji <okuji at enbug.org>
diff --git a/debian/ruby-ramaze.dirs b/debian/ruby-ramaze.dirs
new file mode 100644
index 0000000..ba50dd6
--- /dev/null
+++ b/debian/ruby-ramaze.dirs
@@ -0,0 +1 @@
+usr/share/ruby/vendor_ruby/
diff --git a/debian/ruby-ramaze.lintian-overrides b/debian/ruby-ramaze.lintian-overrides
new file mode 100644
index 0000000..edd46ad
--- /dev/null
+++ b/debian/ruby-ramaze.lintian-overrides
@@ -0,0 +1,5 @@
+# We ship a very old version of jquery as part of the examples,
+# not worth declaring a dependency on libjs-jquery
+ruby-ramaze binary: embedded-javascript-library
+# Spurious error emitted by lintian, reported as #721268
+ruby-ramaze binary: missing-dep-for-interpreter
diff --git a/debian/rules b/debian/rules
index a5e7dc8..eb01726 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,13 @@
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
+DEST = debian/ruby-ramaze
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_install:
+	dh_install
+	mv $(DEST)/usr/lib/ruby/vendor_ruby/proto $(DEST)/usr/share/ruby/vendor_ruby/
+	ln -s ../../../share/ruby/vendor_ruby/proto $(DEST)/usr/lib/ruby/vendor_ruby/
+	chmod a+x $(DEST)/usr/lib/ruby/vendor_ruby/proto/config.ru

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-ramaze.git