[DRE-commits] r3996 - in trunk/libimage-science-ruby/debian: . patches

Gunnar Wolf gwolf at alioth.debian.org
Wed Aug 26 17:42:11 UTC 2009 

Author: gwolf
Date: 2009-08-26 17:42:10 +0000 (Wed, 26 Aug 2009)
New Revision: 3996

Added:
   trunk/libimage-science-ruby/debian/README.source
   trunk/libimage-science-ruby/debian/libimage-science-ruby.docs
   trunk/libimage-science-ruby/debian/libimage-science-ruby.examples
Modified:
   trunk/libimage-science-ruby/debian/
   trunk/libimage-science-ruby/debian/changelog
   trunk/libimage-science-ruby/debian/control
   trunk/libimage-science-ruby/debian/patches/fix_ruby_path
   trunk/libimage-science-ruby/debian/rules
Log:
New upstream release; several minor changes


Property changes on: trunk/libimage-science-ruby/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: trunk/libimage-science-ruby/debian/README.source
===================================================================
--- trunk/libimage-science-ruby/debian/README.source	                        (rev 0)
+++ trunk/libimage-science-ruby/debian/README.source	2009-08-26 17:42:10 UTC (rev 3996)
@@ -0,0 +1,6 @@
+This package uses quilt for managing its patches to upstream sources. 
+
+For further details on Quilt, please see
+/usr/share/doc/quilt/README.source
+
+ -- Gunnar Wolf <gwolf at debian.org>, Wed, 26 Aug 2009 12:05:36 -0500

Modified: trunk/libimage-science-ruby/debian/changelog
===================================================================
--- trunk/libimage-science-ruby/debian/changelog	2009-08-26 16:37:59 UTC (rev 3995)
+++ trunk/libimage-science-ruby/debian/changelog	2009-08-26 17:42:10 UTC (rev 3996)
@@ -1,8 +1,13 @@
-libimage-science-ruby (1.1.3-2) UNRELEASED; urgency=low
+libimage-science-ruby (1.2.1-1) unstable; urgency=low
 
+  * New upstream release
+  * Reworked some files explicitly listed in debian/rules so they are
+    handled in a cleaner DebHelper way
+  * Bumped up standards-version to 3.8.3 (no changes needed)
+  * added missing misc:Depends dependencies
   * Changed section to Ruby as per ftp-masters' request
 
- -- Gunnar Wolf <gwolf at debian.org>  Tue, 21 Apr 2009 15:54:19 -0500
+ -- Gunnar Wolf <gwolf at debian.org>  Wed, 26 Aug 2009 11:56:29 -0500
 
 libimage-science-ruby (1.1.3-1) unstable; urgency=low
 

Modified: trunk/libimage-science-ruby/debian/control
===================================================================
--- trunk/libimage-science-ruby/debian/control	2009-08-26 16:37:59 UTC (rev 3995)
+++ trunk/libimage-science-ruby/debian/control	2009-08-26 17:42:10 UTC (rev 3996)
@@ -7,12 +7,12 @@
 Build-Depends-Indep: ruby1.8, rdoc
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libimage-science-ruby/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libimage-science-ruby/
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Homepage: http://seattlerb.rubyforge.org/ImageScience.html
 
 Package: libimage-science-ruby
 Architecture: all
-Depends: libimage-science-ruby1.8
+Depends: ${misc:Depends}, libimage-science-ruby1.8
 Description: Clean Ruby library to provide simple transformations on images
  ImageScience is a clean Ruby library allowing for simple
  transformations on images, mainly geared towards generating thumbnails
@@ -28,6 +28,7 @@
 Package: libimage-science-ruby-doc
 Architecture: all
 Section: doc
+Depends: ${misc:Depends}
 Suggests: libimage-science-ruby
 Description: Clean Ruby library to provide simple transformations on images
  ImageScience is a clean Ruby library allowing for simple
@@ -43,7 +44,7 @@
 
 Package: libimage-science-ruby1.8
 Architecture: all
-Depends: ruby1.8, libinline-ruby1.8, libfreeimage-dev
+Depends: ${misc:Depends}, ruby1.8, libinline-ruby1.8, libfreeimage-dev
 Description: Clean Ruby library to provide simple transformations on images
  ImageScience is a clean Ruby library allowing for simple
  transformations on images, mainly geared towards generating thumbnails

Added: trunk/libimage-science-ruby/debian/libimage-science-ruby.docs
===================================================================
--- trunk/libimage-science-ruby/debian/libimage-science-ruby.docs	                        (rev 0)
+++ trunk/libimage-science-ruby/debian/libimage-science-ruby.docs	2009-08-26 17:42:10 UTC (rev 3996)
@@ -0,0 +1,2 @@
+README.txt
+History.txt

Added: trunk/libimage-science-ruby/debian/libimage-science-ruby.examples
===================================================================
--- trunk/libimage-science-ruby/debian/libimage-science-ruby.examples	                        (rev 0)
+++ trunk/libimage-science-ruby/debian/libimage-science-ruby.examples	2009-08-26 17:42:10 UTC (rev 3996)
@@ -0,0 +1,2 @@
+bench.rb
+bin/image_science_thumb

Modified: trunk/libimage-science-ruby/debian/patches/fix_ruby_path
===================================================================
--- trunk/libimage-science-ruby/debian/patches/fix_ruby_path	2009-08-26 16:37:59 UTC (rev 3995)
+++ trunk/libimage-science-ruby/debian/patches/fix_ruby_path	2009-08-26 17:42:10 UTC (rev 3996)
@@ -1,30 +1,30 @@
-Index: libimage-science-ruby-1.1.3/bench.rb
+Index: libimage-science-ruby-1.2.1/bench.rb
 ===================================================================
---- libimage-science-ruby-1.1.3.orig/bench.rb	2008-09-15 20:19:36.000000000 -0500
-+++ libimage-science-ruby-1.1.3/bench.rb	2008-09-15 20:19:44.000000000 -0500
+--- libimage-science-ruby-1.2.1.orig/bench.rb	2007-03-08 16:26:39.000000000 -0600
++++ libimage-science-ruby-1.2.1/bench.rb	2009-08-26 11:41:26.000000000 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/ruby -w
-+#!/usr/bin/ruby -w
++#!/usr/bin/ruby1.8 -w
  
  require 'benchmark'
  require 'rubygems'
-Index: libimage-science-ruby-1.1.3/lib/image_science.rb
+Index: libimage-science-ruby-1.2.1/lib/image_science.rb
 ===================================================================
---- libimage-science-ruby-1.1.3.orig/lib/image_science.rb	2008-09-15 20:19:36.000000000 -0500
-+++ libimage-science-ruby-1.1.3/lib/image_science.rb	2008-09-15 20:19:41.000000000 -0500
+--- libimage-science-ruby-1.2.1.orig/lib/image_science.rb	2009-08-14 03:29:51.000000000 -0500
++++ libimage-science-ruby-1.2.1/lib/image_science.rb	2009-08-26 11:41:26.000000000 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/ruby -w
-+#!/usr/bin/ruby -w
++#!/usr/bin/ruby1.8 -w
  
  require 'rubygems'
  require 'inline'
-Index: libimage-science-ruby-1.1.3/quick_thumb
+Index: libimage-science-ruby-1.2.1/bin/image_science_thumb
 ===================================================================
---- libimage-science-ruby-1.1.3.orig/quick_thumb	2008-09-15 20:19:36.000000000 -0500
-+++ libimage-science-ruby-1.1.3/quick_thumb	2008-09-15 20:19:46.000000000 -0500
+--- libimage-science-ruby-1.2.1.orig/bin/image_science_thumb	2008-12-20 17:06:55.000000000 -0600
++++ libimage-science-ruby-1.2.1/bin/image_science_thumb	2009-08-26 11:41:26.000000000 -0500
 @@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/ruby -w
+-#!/usr/local/bin/ruby -ws
++#!/usr/bin/ruby1.8 -ws
  
- abort "#{File.basename $0} max_length files..." unless ARGV.size > 1
+ $s ||= false
  

Modified: trunk/libimage-science-ruby/debian/rules
===================================================================
--- trunk/libimage-science-ruby/debian/rules	2009-08-26 16:37:59 UTC (rev 3995)
+++ trunk/libimage-science-ruby/debian/rules	2009-08-26 17:42:10 UTC (rev 3996)
@@ -4,10 +4,8 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
-install/libimage-science-ruby::
-	# Add the examples, README
-	install -d debian/libimage-science-ruby/usr/share/doc/libimage-science-ruby/examples
-	install bench.rb debian/libimage-science-ruby/usr/share/doc/libimage-science-ruby/examples/
-	install quick_thumb debian/libimage-science-ruby/usr/share/doc/libimage-science-ruby/examples/
-	install README.txt debian/libimage-science-ruby/usr/share/doc/libimage-science-ruby/
-	install History.txt debian/libimage-science-ruby/usr/share/doc/libimage-science-ruby/
+# We really don't want bin/image_science_thumb to be installed as a
+# systemwide binary, and it is already an example elsewhere — But it's
+# better to install it as an example at two locations. It is a very
+# small file FWIW.
+DEB_RUBY_CONFIG_ARGS = --installdirs=std --bindir=/usr/share/doc/$(cdbs_curpkg)/examples

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