tags 734954 + patch
tags 734954 + pending
thanks
Dear maintainer,
I've prepared an NMU for screenruler (versioned as 0.960+bzr41-1.2) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru screenruler-0.960+bzr41/debian/changelog
screenruler-0.960+bzr41/debian/changelog
--- screenruler-0.960+bzr41/debian/changelog 2013-06-03 18:21:19.000000000
+0200
+++ screenruler-0.960+bzr41/debian/changelog 2014-01-16 11:09:08.000000000
+0100
@@ -1,3 +1,10 @@
+screenruler (0.960+bzr41-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply patch for Ruby 1.9 support, drop hardcoding of 1.8 (Closes: #734954)
+
+ -- Christian Hofstaedtler <z...@debian.org> Thu, 16 Jan 2014 11:08:20 +0100
+
screenruler (0.960+bzr41-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru screenruler-0.960+bzr41/debian/control
screenruler-0.960+bzr41/debian/control
--- screenruler-0.960+bzr41/debian/control 2013-06-03 18:20:23.000000000
+0200
+++ screenruler-0.960+bzr41/debian/control 2014-01-16 10:55:44.000000000
+0100
@@ -8,7 +8,7 @@
Package: screenruler
Architecture: all
-Depends: ${misc:Depends}, ruby1.8, ruby-gtk2, ruby-cairo, ruby-gettext
+Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-gtk2, ruby-cairo,
ruby-gettext
Description: measure objects on screen with a variety of metrics
ScreenRuler will display a ruler on screen which allows you to measure the
other objects that you've there. It has the following features:
diff -Nru screenruler-0.960+bzr41/debian/patches/debian-changes-0.960+bzr41-1
screenruler-0.960+bzr41/debian/patches/debian-changes-0.960+bzr41-1
--- screenruler-0.960+bzr41/debian/patches/debian-changes-0.960+bzr41-1
2012-01-25 00:34:33.000000000 +0100
+++ screenruler-0.960+bzr41/debian/patches/debian-changes-0.960+bzr41-1
1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-Description: Upstream changes introduced in version 0.960+bzr41-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- screenruler (0.960+bzr41-1) unstable; urgency=low
- .
- * New upstream version + modifications from trunk:
- - Port to GtkBuilder and replace GConf with a YAML file (Closes: #639437,
- #654710).
- - Handle symlinks in screenruler.rb.
- - Added a help window and internationalization support.
- - Various bug fixes.
- * debian/control:
- - Update dependencies.
- * debian/screenruler.xpm:
- - Fix typo in Catalan translation and add a German translation.
- * debian/watch:
- - Delete it (no point, upstream version numbers are inconsistent).
- * screenruler.rb:
- - Hardcode Ruby 1.8.
- * Change to source format "3.0 (quilt)" and debhelper compatibility
- version 7, switch from CDBS to dh and bump Standards-Version to 3.9.2.
- .
- The person named in the Author field signed this changelog entry.
-Author: Siegfried-Angel Gevatter Pujals <rai...@ubuntu.com>
-Bug-Debian: http://bugs.debian.org/639437
-Bug-Debian: http://bugs.debian.org/654710
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- screenruler-0.960+bzr41.orig/screenruler.rb
-+++ screenruler-0.960+bzr41/screenruler.rb
-@@ -1,4 +1,4 @@
--#!/usr/bin/env ruby
-+#!/usr/bin/ruby1.8
- #coding: utf-8
-
-
###############################################################################
diff -Nru screenruler-0.960+bzr41/debian/patches/hardcode-data-path.patch
screenruler-0.960+bzr41/debian/patches/hardcode-data-path.patch
--- screenruler-0.960+bzr41/debian/patches/hardcode-data-path.patch
2012-01-25 00:29:57.000000000 +0100
+++ screenruler-0.960+bzr41/debian/patches/hardcode-data-path.patch
2014-01-16 11:05:23.000000000 +0100
@@ -1,7 +1,7 @@
Index: screenruler-0.960+bzr41/screenruler.rb
===================================================================
---- screenruler-0.960+bzr41.orig/screenruler.rb 2012-01-25
00:28:43.160859576 +0100
-+++ screenruler-0.960+bzr41/screenruler.rb 2012-01-25 00:28:39.960859677
+0100
+--- screenruler-0.960+bzr41.orig/screenruler.rb 2014-01-16
11:04:00.063701352 +0100
++++ screenruler-0.960+bzr41/screenruler.rb 2014-01-16 11:04:47.919408300
+0100
@@ -19,7 +19,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
###############################################################################
@@ -11,3 +11,4 @@
$LOAD_PATH << './utils'
require 'gettext' # Internationalization Support
+
diff -Nru screenruler-0.960+bzr41/debian/patches/redhat-713404
screenruler-0.960+bzr41/debian/patches/redhat-713404
--- screenruler-0.960+bzr41/debian/patches/redhat-713404 1970-01-01
01:00:00.000000000 +0100
+++ screenruler-0.960+bzr41/debian/patches/redhat-713404 2014-01-16
11:07:58.000000000 +0100
@@ -0,0 +1,45 @@
+Description: Compatibility with Ruby 1.9
+ Patch from RedHat Bugzilla 831501, see
+ https://bugzilla.redhat.com/show_bug.cgi?id=831501#c9 .
+ Refreshed to match the current version in Debian.
+Forwarded: https://bugs.launchpad.net/screenruler/+bug/925835
+Author: Russell Harrison, Christian Hofstaedtler
+Last-Update: 2013-03-20
+
+Index: screenruler-0.960+bzr41/ruler_window.rb
+===================================================================
+--- screenruler-0.960+bzr41.orig/ruler_window.rb 2014-01-16
11:06:58.602608138 +0100
++++ screenruler-0.960+bzr41/ruler_window.rb 2014-01-16 11:06:58.594608187
+0100
+@@ -16,7 +16,8 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
###############################################################################
+
+-require 'glade_window', 'ruler_popup_menu', 'canvas', 'unique_timeout'
++require 'glade_window', 'canvas', 'unique_timeout'
++require_relative 'ruler_popup_menu'
+
+ Unit = Struct.new('Unit', :name, :tick_pattern,
:units_per_pattern_repetition, :per_inch)
+
+Index: screenruler-0.960+bzr41/screenruler.rb
+===================================================================
+--- screenruler-0.960+bzr41.orig/screenruler.rb 2014-01-16
11:06:58.602608138 +0100
++++ screenruler-0.960+bzr41/screenruler.rb 2014-01-16 11:06:58.598608162
+0100
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env ruby
+-#coding: utf-8
++# -*- encoding: utf-8; -*-
+
+
###############################################################################
+ # Copyright 2011 Ian McIntosh <i...@openanswers.org>
+@@ -48,7 +48,10 @@ SETTINGS_FILE_NAME = 'settings.yml'
+ puts _('Loading libraries...')
+
+ require 'addons_ruby'
# for multi-file 'require'
+-require 'gtk2', 'settings', 'addons_gtk', 'ruler_window',
'preferences_window', 'help_window'
++require 'gtk2', 'settings', 'addons_gtk'
++require_relative 'ruler_window'
++require_relative 'preferences_window'
++require_relative 'help_window'
+
+ ###################################################################
+ # Main
diff -Nru screenruler-0.960+bzr41/debian/patches/series
screenruler-0.960+bzr41/debian/patches/series
--- screenruler-0.960+bzr41/debian/patches/series 2012-01-25
00:34:33.000000000 +0100
+++ screenruler-0.960+bzr41/debian/patches/series 2014-01-16
10:57:10.000000000 +0100
@@ -1,2 +1,2 @@
hardcode-data-path.patch
-debian-changes-0.960+bzr41-1
+redhat-713404
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
