[DRE-commits] [ruby-gnome2] 04/09: Fixing ruby2.1 builds, courtesy of Matthias Klose <doko at ubuntu.com>

Paul van Tilburg paulvt at moszumanska.debian.org
Tue May 6 14:19:45 UTC 2014 

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

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

commit 45a2ae11939684e9eee9e9da38c86608ca3cac31
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 6 15:25:19 2014 +0200

    Fixing ruby2.1 builds, courtesy of Matthias Klose <doko at ubuntu.com>
    
    * Merge changes from Ubuntu's ruby-gnome2 2.1.0-1ubuntu1, fixing
      ruby2.1 builds, courtesy of Matthias Klose <doko at ubuntu.com>
    * debian/build: add DESTDIR fix for Ruby 2.1
    * debian/ruby-*.install: remove ruby1.8/ruby1.9.1 install paths
---
 debian/build                              | 14 +++++++-------
 debian/changelog                          |  6 +++++-
 debian/ruby-atk.install                   |  1 -
 debian/ruby-cairo-gobject.install         |  1 -
 debian/ruby-gdk-pixbuf2.install           |  1 -
 debian/ruby-gdk3.install                  |  1 -
 debian/ruby-gio2.install                  |  1 -
 debian/ruby-glib2.install                 |  1 -
 debian/ruby-gnome2-dev.install            |  1 -
 debian/ruby-gobject-introspection.install |  1 -
 debian/ruby-goocanvas.install             |  1 -
 debian/ruby-gstreamer.install             |  1 -
 debian/ruby-gtk2.install                  |  1 -
 debian/ruby-gtk3.install                  |  1 -
 debian/ruby-gtksourceview2.install        |  1 -
 debian/ruby-gtksourceview3.install        |  1 -
 debian/ruby-pango.install                 |  1 -
 debian/ruby-poppler.install               |  1 -
 debian/ruby-rsvg2.install                 |  1 -
 debian/ruby-vte.install                   |  1 -
 debian/ruby-vte3.install                  |  1 -
 21 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/debian/build b/debian/build
index 5247687..b9fd1e4 100755
--- a/debian/build
+++ b/debian/build
@@ -22,14 +22,14 @@ echo "I: DESTDIR = $pkgdir"
 
 RUBYOPT='-Ku' $ruby extconf.rb
 
-# TODO remove this when support for ruby1.9.1 is dropped
-if [ "$ruby" = 'ruby1.9.1' ]; then
-  libdir="$pkgdir/$libdir"
-  archdir="$pkgdir/$archdir"
-fi
-
 make
 
-make install DESTDIR="$pkgdir" sitelibdir="$libdir" sitearchdir="$archdir"
+if [ "$ruby" = 'ruby2.1' ]; then
+  make install DESTDIR="$pkgdir" \
+    sitelibdir='$(DESTDIR)'"$libdir" sitearchdir='$(DESTDIR)'"$archdir"
+else
+  make install DESTDIR="$pkgdir" \
+    sitelibdir="$libdir" sitearchdir="$archdir"
+fi
 
 make distclean
diff --git a/debian/changelog b/debian/changelog
index 031a1fe..e557728 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 ruby-gnome2 (2.2.0-1) UNRELEASED; 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>
+  * debian/build: add DESTDIR fix for Ruby 2.1
+  * debian/ruby-*.install: remove ruby1.8/ruby1.9.1 install paths
 
- -- Paul van Tilburg <paulvt at debian.org>  Tue, 06 May 2014 09:59:46 +0200
+ -- Paul van Tilburg <paulvt at debian.org>  Tue, 06 May 2014 15:19:15 +0200
 
 ruby-gnome2 (2.1.0-1) unstable; urgency=low
 
diff --git a/debian/ruby-atk.install b/debian/ruby-atk.install
index 3f3d82c..4a58cd8 100644
--- a/debian/ruby-atk.install
+++ b/debian/ruby-atk.install
@@ -1,3 +1,2 @@
 usr/lib/ruby/vendor_ruby/atk.rb
-usr/lib/ruby/vendor_ruby/*/*/atk.so
 usr/lib/*/ruby/vendor_ruby/*/atk.so
diff --git a/debian/ruby-cairo-gobject.install b/debian/ruby-cairo-gobject.install
index 3d0773d..3a95446 100644
--- a/debian/ruby-cairo-gobject.install
+++ b/debian/ruby-cairo-gobject.install
@@ -1,3 +1,2 @@
 usr/lib/ruby/vendor_ruby/cairo-gobject.rb
-usr/lib/ruby/vendor_ruby/*/*/cairo_gobject.so
 usr/lib/*/ruby/vendor_ruby/*/cairo_gobject.so
diff --git a/debian/ruby-gdk-pixbuf2.install b/debian/ruby-gdk-pixbuf2.install
index e0d0945..d43d036 100644
--- a/debian/ruby-gdk-pixbuf2.install
+++ b/debian/ruby-gdk-pixbuf2.install
@@ -1,3 +1,2 @@
 usr/lib/ruby/vendor_ruby/gdk_pixbuf2.rb
-usr/lib/ruby/vendor_ruby/*/*/gdk_pixbuf2.so
 usr/lib/*/ruby/vendor_ruby/*/gdk_pixbuf2.so
diff --git a/debian/ruby-gdk3.install b/debian/ruby-gdk3.install
index 971d208..6719fe4 100644
--- a/debian/ruby-gdk3.install
+++ b/debian/ruby-gdk3.install
@@ -1,4 +1,3 @@
 usr/lib/ruby/vendor_ruby/gdk3
 usr/lib/ruby/vendor_ruby/gdk3.rb
-usr/lib/ruby/vendor_ruby/*/*/gdk3.so
 usr/lib/*/ruby/vendor_ruby/*/gdk3.so
diff --git a/debian/ruby-gio2.install b/debian/ruby-gio2.install
index 8add9d5..f69d00b 100644
--- a/debian/ruby-gio2.install
+++ b/debian/ruby-gio2.install
@@ -1,4 +1,3 @@
 usr/lib/ruby/vendor_ruby/gio2.rb
 usr/lib/ruby/vendor_ruby/gio2/deprecated.rb
-usr/lib/ruby/vendor_ruby/*/*/gio2.so
 usr/lib/*/ruby/vendor_ruby/*/gio2.so
diff --git a/debian/ruby-glib2.install b/debian/ruby-glib2.install
index 44e9d74..5bd9853 100644
--- a/debian/ruby-glib2.install
+++ b/debian/ruby-glib2.install
@@ -1,4 +1,3 @@
 usr/lib/ruby/vendor_ruby/glib2.rb
 usr/lib/ruby/vendor_ruby/glib2/deprecatable.rb
-usr/lib/ruby/vendor_ruby/*/*/glib2.so
 usr/lib/*/ruby/vendor_ruby/*/glib2.so
diff --git a/debian/ruby-gnome2-dev.install b/debian/ruby-gnome2-dev.install
index 89c8cf9..82c8823 100644
--- a/debian/ruby-gnome2-dev.install
+++ b/debian/ruby-gnome2-dev.install
@@ -1,5 +1,4 @@
 usr/lib/ruby/vendor_ruby/gnome2-raketask.rb
 usr/lib/ruby/vendor_ruby/mkmf-gnome2.rb
 usr/lib/ruby/vendor_ruby/glib-mkenums.rb
-usr/lib/ruby/vendor_ruby/*/*/*.h
 usr/lib/*/ruby/vendor_ruby/*/*.h
diff --git a/debian/ruby-gobject-introspection.install b/debian/ruby-gobject-introspection.install
index e0762a9..946917b 100644
--- a/debian/ruby-gobject-introspection.install
+++ b/debian/ruby-gobject-introspection.install
@@ -1,4 +1,3 @@
 usr/lib/ruby/vendor_ruby/gobject-introspection/*
 usr/lib/ruby/vendor_ruby/gobject-introspection.rb
-usr/lib/ruby/vendor_ruby/*/*/gobject_introspection.so
 usr/lib/*/ruby/vendor_ruby/*/gobject_introspection.so
diff --git a/debian/ruby-goocanvas.install b/debian/ruby-goocanvas.install
index 6c4c896..28d1601 100644
--- a/debian/ruby-goocanvas.install
+++ b/debian/ruby-goocanvas.install
@@ -1,3 +1,2 @@
 usr/lib/ruby/vendor_ruby/goocanvas.rb
-usr/lib/ruby/vendor_ruby/*/*/goocanvas.so
 usr/lib/*/ruby/vendor_ruby/*/goocanvas.so
diff --git a/debian/ruby-gstreamer.install b/debian/ruby-gstreamer.install
index 029864e..defbd8c 100644
--- a/debian/ruby-gstreamer.install
+++ b/debian/ruby-gstreamer.install
@@ -1,4 +1,3 @@
 usr/lib/ruby/vendor_ruby/gst.rb
 usr/lib/ruby/vendor_ruby/gst
-usr/lib/ruby/vendor_ruby/*/*/gstreamer.so
 usr/lib/*/ruby/vendor_ruby/*/gstreamer.so
diff --git a/debian/ruby-gtk2.install b/debian/ruby-gtk2.install
index f816d1a..132847e 100644
--- a/debian/ruby-gtk2.install
+++ b/debian/ruby-gtk2.install
@@ -1,4 +1,3 @@
 usr/lib/ruby/vendor_ruby/gtk2.rb
 usr/lib/ruby/vendor_ruby/gtk2/base.rb
-usr/lib/ruby/vendor_ruby/*/*/gtk2.so
 usr/lib/*/ruby/vendor_ruby/*/gtk2.so
diff --git a/debian/ruby-gtk3.install b/debian/ruby-gtk3.install
index 489becb..048a6cd 100644
--- a/debian/ruby-gtk3.install
+++ b/debian/ruby-gtk3.install
@@ -1,4 +1,3 @@
 usr/lib/ruby/vendor_ruby/gtk3
 usr/lib/ruby/vendor_ruby/gtk3.rb
-usr/lib/ruby/vendor_ruby/*/*/gtk3.so
 usr/lib/*/ruby/vendor_ruby/*/gtk3.so
diff --git a/debian/ruby-gtksourceview2.install b/debian/ruby-gtksourceview2.install
index 0c02142..c16bb92 100644
--- a/debian/ruby-gtksourceview2.install
+++ b/debian/ruby-gtksourceview2.install
@@ -1,3 +1,2 @@
 usr/lib/ruby/vendor_ruby/gtksourceview2.rb
-usr/lib/ruby/vendor_ruby/*/*/gtksourceview2.so
 usr/lib/*/ruby/vendor_ruby/*/gtksourceview2.so
diff --git a/debian/ruby-gtksourceview3.install b/debian/ruby-gtksourceview3.install
index 582c3ce..a07bed9 100644
--- a/debian/ruby-gtksourceview3.install
+++ b/debian/ruby-gtksourceview3.install
@@ -1,4 +1,3 @@
 usr/lib/ruby/vendor_ruby/gtksourceview3.rb
 usr/lib/ruby/vendor_ruby/gtksourceview3
-usr/lib/ruby/vendor_ruby/*/*/gtksourceview3.so
 usr/lib/*/ruby/vendor_ruby/*/gtksourceview3.so
diff --git a/debian/ruby-pango.install b/debian/ruby-pango.install
index 1696db4..32399c1 100644
--- a/debian/ruby-pango.install
+++ b/debian/ruby-pango.install
@@ -1,3 +1,2 @@
 usr/lib/ruby/vendor_ruby/pango.rb
-usr/lib/ruby/vendor_ruby/*/*/pango.so
 usr/lib/*/ruby/vendor_ruby/*/pango.so
diff --git a/debian/ruby-poppler.install b/debian/ruby-poppler.install
index bce6171..4d588a4 100644
--- a/debian/ruby-poppler.install
+++ b/debian/ruby-poppler.install
@@ -1,3 +1,2 @@
 usr/lib/ruby/vendor_ruby/poppler.rb
-usr/lib/ruby/vendor_ruby/*/*/poppler.so
 usr/lib/*/ruby/vendor_ruby/*/poppler.so
diff --git a/debian/ruby-rsvg2.install b/debian/ruby-rsvg2.install
index d561b2d..058722d 100644
--- a/debian/ruby-rsvg2.install
+++ b/debian/ruby-rsvg2.install
@@ -1,3 +1,2 @@
 usr/lib/ruby/vendor_ruby/rsvg2.rb
-usr/lib/ruby/vendor_ruby/*/*/rsvg2.so
 usr/lib/*/ruby/vendor_ruby/*/rsvg2.so
diff --git a/debian/ruby-vte.install b/debian/ruby-vte.install
index 5bdd0c2..69185d0 100644
--- a/debian/ruby-vte.install
+++ b/debian/ruby-vte.install
@@ -1,4 +1,3 @@
 usr/lib/ruby/vendor_ruby/vte.rb
 usr/lib/ruby/vendor_ruby/vte/deprecated.rb
-usr/lib/ruby/vendor_ruby/*/*/vte.so
 usr/lib/*/ruby/vendor_ruby/*/vte.so
diff --git a/debian/ruby-vte3.install b/debian/ruby-vte3.install
index 5da5820..664b4d1 100644
--- a/debian/ruby-vte3.install
+++ b/debian/ruby-vte3.install
@@ -1,4 +1,3 @@
 usr/lib/ruby/vendor_ruby/vte3.rb
 usr/lib/ruby/vendor_ruby/vte3/deprecated.rb
-usr/lib/ruby/vendor_ruby/*/*/vte3.so
 usr/lib/*/ruby/vendor_ruby/*/vte3.so

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

More information about the Pkg-ruby-extras-commits mailing list