[DRE-commits] [SCM] ruby-gnome2.git branch, master, updated. debian/1.0.3-1-10-g9f333a3

Paul van Tilburg paulvt at debian.org
Fri May 4 17:54:14 UTC 2012 

The following commit has been merged in the master branch:
commit 9d0f29348fecdc4b0f806690b617e23b2d6188eb
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri May 4 19:39:48 2012 +0200

    * debian/control:
      - Bumped standards version to 3.9.3; no changes required.
      - Set the priority of all lib*-ruby packages to "extra".
    * debian/ruby-gstreamer.install: gst.so is now called gstreamer.so.
    * debian/rules:
      - Disable running debian/check-upstream-versus-debian that generates
        a patch as the debian tree is clean now w.r.t. upstream.
    * debian/source/local-options: set "unapply-patches".

diff --git a/debian/changelog b/debian/changelog
index e98862e..46c8b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
 ruby-gnome2 (1.1.3-1) unstable; urgency=low
 
-  * New upstream release! (Closes: #662013)
+  * New upstream release! (Closes: #662013, #665608)
   * debian/control:
+    - Bumped standards version to 3.9.3; no changes required.
     - Changed build-depend on libpng12-dev to libpng-dev.  (Closes: #662496)
-
- -- Paul van Tilburg <paulvt at debian.org>  Fri, 04 May 2012 12:19:17 +0200
+    - Set the priority of all lib*-ruby packages to "extra".
+  * debian/ruby-gstreamer.install: gst.so is now called gstreamer.so.
+  * debian/rules:
+    - Disable running debian/check-upstream-versus-debian that generates
+      a patch as the debian tree is clean now w.r.t. upstream.
+  * debian/source/local-options: set "unapply-patches".
+
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 04 May 2012 19:01:17 +0200
 
 ruby-gnome2 (1.0.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5bf5f65..5eb0f2b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Cornet <acornet at debian.org>, Paul van Tilburg <paulvt at debian.org>, Michael Schutte <m.schutte.jr at gmail.com>, Antonio Terceiro <terceiro at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), ruby, ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev, libpng-dev, libxmu-dev, librsvg2-dev (>= 2.8.0), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.8.0), pkg-config, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgoocanvas-dev (>= 0.8.0), libgtksourceview2.0-dev, libdrm-dev, libjpeg-dev, ruby-cairo, ruby-pkg-config
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://ruby-gnome2.sourceforge.jp/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-gnome2.git
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-gnome2.git
@@ -22,9 +22,9 @@ Description: Glib 2 bindings for the Ruby language
  other libraries such as GTK+.
 
 Package: ruby-glib2-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Depends: ruby-glib2 (= ${binary:Version}), ${misc:Depends}
 Description: Glib 2 bindings for the Ruby language (debugging symbols)
  Glib is a useful general-purpose C library, notably used by GTK+ and GNOME.
@@ -36,6 +36,7 @@ Description: Glib 2 bindings for the Ruby language (debugging symbols)
 
 Package: libglib2-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-glib2
 Description: Transitional package for ruby-glib2
@@ -44,6 +45,7 @@ Description: Transitional package for ruby-glib2
 
 Package: libglib2-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-glib2
 Description: Transitional package for ruby-glib2
@@ -51,8 +53,8 @@ Description: Transitional package for ruby-glib2
  package. It can safely be removed.
 
 Package: libglib2-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-glib2
 Description: Transitional package for ruby-glib2
@@ -73,9 +75,9 @@ Description: ATK bindings for the Ruby language
  ATK with the Ruby programming language.
 
 Package: ruby-atk-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Replaces: libatk1-dbg-ruby (<< 0.90.9-1~), libatk1-dbg-ruby1.8 (<< 0.90.9-1~)
 Breaks: libatk1-dbg-ruby (<< 0.90.9-1~), libatk1-dbg-ruby1.8 (<< 0.90.9-1~)
 Provides: libatk1-dbg-ruby, libatk1-dbg-ruby1.8
@@ -91,6 +93,7 @@ Description: ATK bindings for the Ruby language (debugging symbols)
 
 Package: libatk1-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-atk
 Description: Transitional package for ruby-atk
@@ -99,6 +102,7 @@ Description: Transitional package for ruby-atk
 
 Package: libatk1-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-atk
 Description: Transitional package for ruby-atk
@@ -106,8 +110,8 @@ Description: Transitional package for ruby-atk
  package. It can safely be removed.
 
 Package: libatk1-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, ruby-atk-dbg
 Description: Transitional package for ruby-atk-dbg
@@ -126,9 +130,9 @@ Description: Pango bindings for the Ruby language
  the Ruby programming language.
 
 Package: ruby-pango-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Replaces: libpango1-dbg-ruby (<< 0.90.9-1~), libpango1-dbg-ruby1.8 (<< 0.90.9-1~)
 Breaks: libpango1-dbg-ruby (<< 0.90.9-1~), libpango1-dbg-ruby1.8 (<< 0.90.9-1~)
 Provides: libpango1-dbg-ruby, libpango1-dbg-ruby1.8
@@ -142,6 +146,7 @@ Description: Pango bindings for the Ruby language (debug symbols)
 
 Package: libpango1-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-pango
 Description: Transitional package for ruby-pango
@@ -150,6 +155,7 @@ Description: Transitional package for ruby-pango
 
 Package: libpango1-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-pango
 Description: Transitional package for ruby-pango
@@ -157,8 +163,8 @@ Description: Transitional package for ruby-pango
  package. It can safely be removed.
 
 Package: libpango1-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-pango-dbg
 Description: Transitional package for ruby-pango-dbg
@@ -176,9 +182,9 @@ Description: Gdk-Pixbuf 2 bindings for the Ruby language
  contains libraries for using Gdk-Pixbuf with the Ruby programming language.
 
 Package: ruby-gdk-pixbuf2-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Replaces: libgdk-pixbuf2-ruby1.8-dbg (<< 0.90.9-1~)
 Breaks: libgdk-pixbuf2-ruby1.8-dbg (<< 0.90.9-1~)
 Provides: libgdk-pixbuf2-ruby1.8-dbg
@@ -191,6 +197,7 @@ Description: Gdk-Pixbuf 2 bindings for the Ruby language (debugging symbols)
 
 Package: libgdk-pixbuf2-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gdk-pixbuf2
 Description: Transitional package for ruby-gdk-pixbuf2
@@ -199,6 +206,7 @@ Description: Transitional package for ruby-gdk-pixbuf2
 
 Package: libgdk-pixbuf2-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gdk-pixbuf2
 Description: Transitional package for ruby-gdk-pixbuf2
@@ -206,8 +214,8 @@ Description: Transitional package for ruby-gdk-pixbuf2
  package. It can safely be removed.
 
 Package: libgdk-pixbuf2-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gdk-pixbuf2-dbg
 Description: Transitional package for ruby-gdk-pixbuf2-dbg
@@ -223,8 +231,8 @@ Description: GIO bindings for the Ruby language
  bindings to be used in Ruby programs.
 
 Package: ruby-gio2-dbg
-Priority: extra
 Section: debug
+Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, ruby-gio2 (= ${binary:Version})
 Description: GIO bindings for the Ruby language (debugging symbols)
@@ -246,6 +254,7 @@ Description: GTK+ bindings for the Ruby language
 
 Package: libgtk2-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gtk2
 Description: Transitional package for ruby-gtk2
@@ -254,6 +263,7 @@ Description: Transitional package for ruby-gtk2
 
 Package: libgtk2-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gtk2
 Description: Transitional package for ruby-gtk2
@@ -261,9 +271,9 @@ Description: Transitional package for ruby-gtk2
  package. It can safely be removed.
 
 Package: ruby-gtk2-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Depends: ruby-gtk2 (= ${binary:Version}), ${misc:Depends}
 Description: GTK+ bindings for the Ruby language (debugging symbols)
  GTK+ is a library for creating graphical user interfaces. This package
@@ -272,8 +282,8 @@ Description: GTK+ bindings for the Ruby language (debugging symbols)
  This package contains the debugging symbols.
 
 Package: libgtk2-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gtk2-dbg
 Description: Transitional package for ruby-gtk2-dbg
@@ -293,9 +303,9 @@ Description: GooCanvas bindings for the Ruby language
  editor in the Ruby programming language.
 
 Package: ruby-goocanvas-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Depends: ruby-goocanvas (= ${binary:Version}), ${misc:Depends}
 Replaces: libgoocanvas-ruby1.8-dbg (<< 0.90.9-1~)
 Breaks: libgoocanvas-ruby1.8-dbg (<< 0.90.9-1~)
@@ -310,6 +320,7 @@ Description: GooCanvas bindings for the Ruby language (debugging symbols)
 
 Package: libgoocanvas-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-goocanvas
 Description: Transitional package for ruby-goocanvas
@@ -318,6 +329,7 @@ Description: Transitional package for ruby-goocanvas
 
 Package: libgoocanvas-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-goocanvas
 Description: Transitional package for ruby-goocanvas
@@ -325,8 +337,8 @@ Description: Transitional package for ruby-goocanvas
  package. It can safely be removed.
 
 Package: libgoocanvas-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-goocanvas-dbg
 Description: Transitional package for ruby-goocanvas-dbg
@@ -347,9 +359,9 @@ Description: GtkSourceView2 bindings for the Ruby language
  editor in the Ruby programming language.
 
 Package: ruby-gtksourceview2-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Depends: ruby-gtksourceview2 (= ${binary:Version}), ${misc:Depends}
 Replaces: libgtksourceview2-ruby1.8-dbg (<< 0.90.9-1~)
 Breaks: libgtksourceview2-ruby1.8-dbg (<< 0.90.9-1~)
@@ -364,6 +376,7 @@ Description: GtkSourceView2 bindings for the Ruby language (debugging symbols)
 
 Package: libgtksourceview2-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gtksourceview2
 Description: Transitional package for ruby-gtksourceview2
@@ -372,6 +385,7 @@ Description: Transitional package for ruby-gtksourceview2
 
 Package: libgtksourceview2-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gtksourceview2
 Description: Transitional package for ruby-gtksourceview2
@@ -379,8 +393,8 @@ Description: Transitional package for ruby-gtksourceview2
  package. It can safely be removed.
 
 Package: libgtksourceview2-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gtksourceview2-dbg
 Description: Transitional package for ruby-gtksourceview2-dbg
@@ -398,9 +412,9 @@ Description: RSVG renderer bindings for the Ruby language
  contains libraries for using RSVG with the Ruby programming language.
 
 Package: ruby-rsvg2-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Depends: ruby-rsvg2 (= ${binary:Version}), ${misc:Depends}
 Replaces: librsvg2-ruby1.8-dbg (<< 0.90.9-1~)
 Breaks: librsvg2-ruby1.8-dbg (<< 0.90.9-1~)
@@ -413,6 +427,7 @@ Description: RSVG renderer bindings for the Ruby language (debugging symbols)
 
 Package: librsvg2-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-rsvg2
 Description: Transitional package for ruby-rsvg2
@@ -421,6 +436,7 @@ Description: Transitional package for ruby-rsvg2
 
 Package: librsvg2-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-rsvg2
 Description: Transitional package for ruby-rsvg2
@@ -428,8 +444,8 @@ Description: Transitional package for ruby-rsvg2
  package. It can safely be removed.
 
 Package: librsvg2-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-rsvg2-dbg
 Description: Transitional package for ruby-rsvg2-dbg
@@ -443,9 +459,9 @@ Description: VTE widget bindings for the Ruby language
  VTE is a Ruby binding for the VTE terminal emulator widget for GTK+.
 
 Package: ruby-vte-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Depends: ruby-vte (= ${binary:Version}), ${misc:Depends}
 Description: VTE widget bindings for the Ruby language (debugging symbols)
  VTE is a Ruby binding for the VTE terminal emulator widget for GTK+.
@@ -454,6 +470,7 @@ Description: VTE widget bindings for the Ruby language (debugging symbols)
 
 Package: libvte-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-vte
 Description: Transitional package for ruby-vte
@@ -462,6 +479,7 @@ Description: Transitional package for ruby-vte
 
 Package: libvte-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-vte
 Description: Transitional package for ruby-vte
@@ -469,8 +487,8 @@ Description: Transitional package for ruby-vte
  package. It can safely be removed.
 
 Package: libvte-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-vte-dbg
 Description: Transitional package for ruby-vte-dbg
@@ -485,9 +503,9 @@ Description: Ruby bindinds for the libpoppler-glib library
  contains ruby bindings for Poppler.
 
 Package: ruby-poppler-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Depends: ruby-poppler (= ${binary:Version}), ${misc:Depends}
 Description: Ruby bindinds for the libpoppler-glib library (debugging symbols)
  Poppler is a PDF rendering library based on xpdf PDF viewer. This package
@@ -497,6 +515,7 @@ Description: Ruby bindinds for the libpoppler-glib library (debugging symbols)
 
 Package: libpoppler-glib-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-poppler
 Description: Transitional package for ruby-poppler
@@ -505,6 +524,7 @@ Description: Transitional package for ruby-poppler
 
 Package: libpoppler-glib-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-poppler
 Description: Transitional package for ruby-poppler
@@ -512,8 +532,8 @@ Description: Transitional package for ruby-poppler
  package. It can safely be removed.
 
 Package: libpoppler-glib-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-poppler-dbg
 Description: Transitional package for ruby-poppler-dbg
@@ -530,9 +550,9 @@ Description: GStreamer bindings for the Ruby language
  programming language.
 
 Package: ruby-gstreamer-dbg
+Section: debug
 Priority: extra
 Architecture: any
-Section: debug
 Depends: ruby-gstreamer (= ${binary:Version}), ${misc:Depends}
 Description: GStreamer bindings for the Ruby language (debugging symbols)
  GStreamer is a media processing framework with support for a wide variety of
@@ -544,6 +564,7 @@ Description: GStreamer bindings for the Ruby language (debugging symbols)
 
 Package: libgst-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gstreamer
 Description: Transitional package for ruby-gstreamer
@@ -552,6 +573,7 @@ Description: Transitional package for ruby-gstreamer
 
 Package: libgst-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gstreamer
 Description: Transitional package for ruby-gstreamer
@@ -559,8 +581,8 @@ Description: Transitional package for ruby-gstreamer
  package. It can safely be removed.
 
 Package: libgst-ruby1.8-dbg
-Priority: extra
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-gstreamer-dbg
 Description: Transitional package for ruby-gstreamer-dbg
diff --git a/debian/ruby-gstreamer.install b/debian/ruby-gstreamer.install
index c5cf681..38a972f 100644
--- a/debian/ruby-gstreamer.install
+++ b/debian/ruby-gstreamer.install
@@ -1,2 +1,2 @@
 usr/lib/ruby/vendor_ruby/gst.rb
-usr/lib/ruby/vendor_ruby/*/*/gst.so
+usr/lib/ruby/vendor_ruby/*/*/gstreamer.so
diff --git a/debian/rules b/debian/rules
index 7a2e2e8..fc64665 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,9 @@
 %:
 	dh $@
 
-override_dh_auto_configure:
-	debian/check-upstream-versus-debian
-	dh_auto_configure
+#override_dh_auto_configure:
+#	debian/check-upstream-versus-debian
+#	dh_auto_configure
 
 override_dh_auto_install:
 	debian/build ruby1.8
@@ -18,6 +18,12 @@ override_dh_strip:
 	done
 	dh_strip
 
+override_dh_fixperms:
+	dh_fixperms
+	# Remove executable flag from some examples that aren't actually executable.
+	chmod -x debian/ruby-glib2/usr/share/doc/ruby-glib2/examples/type-register*.rb
+	chmod -x debian/ruby-gtk2/usr/share/doc/ruby-gtk2/examples/misc/properties.rb
+	chmod -x debian/ruby-goocanvas/usr/share/doc/ruby-goocanvas/examples/demo.rb
 
 override_dh_compress:
 	dh_compress -X.rb
diff --git a/debian/source/local-options b/debian/source/local-options
index 76269ea..4aceb10 100644
--- a/debian/source/local-options
+++ b/debian/source/local-options
@@ -1 +1 @@
-unapply-paches
+unapply-patches

-- 
ruby-gnome2.git

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