[DRE-commits] [ruby-gnome2] 01/01: Reconditionalize to make an exception for Ruby 2.0 instead of 2.1

[Paul van Tilburg]

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

paulvt pushed a commit to branch master
in repository ruby-gnome2.

commit 4298175564536ac43841677d78a130ff9001554a
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 6 16:30:40 2014 +0200

    Reconditionalize to make an exception for Ruby 2.0 instead of 2.1
---
 debian/build     | 6 +++---
 debian/changelog | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/build b/debian/build
index b9fd1e4..8ab59cc 100755
--- a/debian/build
+++ b/debian/build
@@ -24,12 +24,12 @@ RUBYOPT='-Ku' $ruby extconf.rb
 
 make
 
-if [ "$ruby" = 'ruby2.1' ]; then
+if [ "$ruby" = 'ruby2.0' ]; then
   make install DESTDIR="$pkgdir" \
-    sitelibdir='$(DESTDIR)'"$libdir" sitearchdir='$(DESTDIR)'"$archdir"
+    sitelibdir="$libdir" sitearchdir="$archdir"
 else
   make install DESTDIR="$pkgdir" \
-    sitelibdir="$libdir" sitearchdir="$archdir"
+    sitelibdir='$(DESTDIR)'"$libdir" sitearchdir='$(DESTDIR)'"$archdir"
 fi
 
 make distclean
diff --git a/debian/changelog b/debian/changelog
index bd4066e..b01b4bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ ruby-gnome2 (2.2.0-1) unstable; urgency=medium
   * New upstream release
   * Merge changes from Ubuntu's ruby-gnome2 2.1.0-1ubuntu1, fixing ruby2.1
     builds, courtesy of Matthias Klose <doko at ubuntu.com> (closes: #744809)
-  * debian/build: add DESTDIR fix for Ruby 2.1
+  * debian/build: 
+    - add DESTDIR fix for Ruby 2.1
+    - reconditionalize to make an exception for Ruby 2.0 instead of 2.1
   * debian/control: add packages ruby-clutter*, ruby-webkit-gtk*
   * debian/ruby-*.install: remove ruby1.8/ruby1.9.1 install paths
   * debian/ruby-{clutter,clutter-gstreamer,clutter-gtk}.{examples,install},

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