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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 59b23f61a8b7f36b611fc5f71f7fea876d5f3153
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri May 4 20:08:56 2012 +0200

    Revert "debian/rules: added hardening flags. (Closes: #655415)"
    
    This reverts commit 4d8cb501a215418593e928f02ccfad087962720b as it accidently
    also contained quilt patched files.

diff --git a/debian/changelog b/debian/changelog
index 91fa7d9..4a2b3a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,13 +9,11 @@ ruby-gnome2 (1.1.3-1) unstable; urgency=low
     - Added patch Fix_erroneous_load_of_vte_deprecated. (Closes: #666986)
   * debian/ruby-gstreamer.install: gst.so is now called gstreamer.so.
   * debian/rules:
-    - Disabled running debian/check-upstream-versus-debian that generates
+    - Disable running debian/check-upstream-versus-debian that generates
       a patch as the debian tree is clean now w.r.t. upstream.
-    - Added hardening flags via a dh_auto_configure override as per
-      http://wiki.debian.org/HardeningWalkthrough (Closes: #655415)
   * debian/source/local-options: set "unapply-patches".
 
- -- Paul van Tilburg <paulvt at debian.org>  Fri, 04 May 2012 20:00:37 +0200
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 04 May 2012 19:42:14 +0200
 
 ruby-gnome2 (1.0.3-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 0bc3786..fc64665 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,9 @@
 %:
 	dh $@
 
-override_dh_auto_configure:
+#override_dh_auto_configure:
 #	debian/check-upstream-versus-debian
-	dh_auto_configure -- $(shell dpkg-buildflags --export=configure)
+#	dh_auto_configure
 
 override_dh_auto_install:
 	debian/build ruby1.8
diff --git a/exec_make.rb b/exec_make.rb
index 76ed54f..84550d7 100644
--- a/exec_make.rb
+++ b/exec_make.rb
@@ -29,8 +29,7 @@ SUBDIRS.each do |subdir|
 	if ret
 		success << subdir 
 	else
-                puts "Building of #{subdir} failed."
-                exit(1)
+		failure << subdir
 	end
 end
 
diff --git a/extconf.rb b/extconf.rb
index 4a72ccf..d85f497 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -75,10 +75,6 @@ subdirs.each do |subdir|
   if ret
     targets << subdir
   else
-    if $strict
-        exit(1)
-    end
-
     ignore << subdir
   end
 end
@@ -118,7 +114,6 @@ def run_make_in_sub_dirs(command)
 	  echo "FAILED: $$failed";		\\
 	  echo "-----";				\\
 	  echo "Done.";				\\
-	  test "$$failed" = "NONE";             \\
 	)
     EOS
   end
diff --git a/vte/lib/vte.rb b/vte/lib/vte.rb
index 89a2f8e..a8a0e50 100644
--- a/vte/lib/vte.rb
+++ b/vte/lib/vte.rb
@@ -1,5 +1,4 @@
 require "gtk2"
 require "vte.so"
-# Does not exist!
-#require "vte/deprecated"
+require "vte/deprecated"
 

-- 
ruby-gnome2.git