[DRE-commits] r4716 - in trunk/libole-ruby/debian: . patches source

[Gunnar Wolf]

Author: gwolf
Date: 2010-02-15 23:08:56 +0000 (Mon, 15 Feb 2010)
New Revision: 4716

Added:
   trunk/libole-ruby/debian/source/
   trunk/libole-ruby/debian/source/format
Modified:
   trunk/libole-ruby/debian/changelog
   trunk/libole-ruby/debian/control
   trunk/libole-ruby/debian/patches/move_propids_location
   trunk/libole-ruby/debian/rules
Log:
Preparing upload for Ruby 1.9.1 transition

Modified: trunk/libole-ruby/debian/changelog
===================================================================
--- trunk/libole-ruby/debian/changelog	2010-02-14 23:35:56 UTC (rev 4715)
+++ trunk/libole-ruby/debian/changelog	2010-02-15 23:08:56 UTC (rev 4716)
@@ -1,9 +1,12 @@
-libole-ruby (1.2.9-3.1) UNRELEASED; urgency=low
+libole-ruby (1.2.9-4) unstable; urgency=low
 
-  * Non-maintainer upload.
-  * NOT RELEASED YET
+  * Port the package to Ruby 1.9.1 (Closes: #569867)
+  * Standards-version 3.8.3→3.8.4 (no changes needed)
+  * Switched to 3.0 (quilt) source format; dropped build-dependency on
+    quilt
+  * Added DEP3 headers to move_propids_location patch
 
- -- Paul van Tilburg <paulvt at debian.org>  Sun, 14 Feb 2010 19:29:48 +0100
+ -- Gunnar Wolf <gwolf at debian.org>  Mon, 15 Feb 2010 17:08:40 -0600
 
 libole-ruby (1.2.9-3) unstable; urgency=low
 

Modified: trunk/libole-ruby/debian/control
===================================================================
--- trunk/libole-ruby/debian/control	2010-02-14 23:35:56 UTC (rev 4715)
+++ trunk/libole-ruby/debian/control	2010-02-15 23:08:56 UTC (rev 4716)
@@ -4,11 +4,11 @@
 Maintainer: Gunnar Wolf <gwolf at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>,
  Ryan Niebur <ryan at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), ruby-pkg-tools (>= 0.8), quilt
-Build-Depends-Indep: ruby1.8, rdoc, ruby1.9
+Build-Depends: cdbs, debhelper (>= 5), ruby-pkg-tools (>= 0.17)
+Build-Depends-Indep: ruby1.8, rdoc, ruby1.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libole-ruby/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libole-ruby/
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 
 Package: libole-ruby-doc
 Architecture: all
@@ -38,9 +38,9 @@
  streaming, by providing transparent access to the "files" within OLE
  documents as IO-like objects, supporting all the expected operations.
 
-Package: libole-ruby1.9
+Package: libole-ruby1.9.1
 Architecture: all
-Depends: ${misc:Depends}, ruby1.9, rubygems1.9.1
+Depends: ${misc:Depends}, ruby1.9.1, rubygems1.9.1
 Description: Ruby library for read/write access for OLE compound documents
  Ruby-ole is a library for read/write access to OLE2 structured storage
  files, such as those produced by Microsoft Office, eg *.doc, *.msg
@@ -52,7 +52,7 @@
 
 Package: libole-ruby
 Architecture: all
-Depends: ${misc:Depends}, ruby1.8 | ruby1.9, libole-ruby1.8 | libole-ruby1.9
+Depends: ${misc:Depends}, ruby1.8 | ruby1.9.1, libole-ruby1.8 | libole-ruby1.9.1
 Description: Ruby library for read/write access for OLE compound documents
  Ruby-ole is a library for read/write access to OLE2 structured storage
  files, such as those produced by Microsoft Office, eg *.doc, *.msg

Modified: trunk/libole-ruby/debian/patches/move_propids_location
===================================================================
--- trunk/libole-ruby/debian/patches/move_propids_location	2010-02-14 23:35:56 UTC (rev 4715)
+++ trunk/libole-ruby/debian/patches/move_propids_location	2010-02-15 23:08:56 UTC (rev 4716)
@@ -1,3 +1,14 @@
+Description: Hard-code the position of the `propids.yaml' file, as it
+ we know it known beforehand.
+ .
+ At build time, libole-ruby1.8 is replaced by libole-ruby1.9.1 for the
+ 1.9.1 package.
+ .
+ This patch was created at package creation time (hence no bug number)
+ and is Debian-specific.
+Origin: vendor
+Forwarded: not-needed
+Author: Gunnar Wolf <gwolf at debian.org>
 Index: libole-ruby-1.2.8.2/lib/ole/types/property_set.rb
 ===================================================================
 --- libole-ruby-1.2.8.2.orig/lib/ole/types/property_set.rb	2009-04-21 14:20:02.000000000 -0500

Modified: trunk/libole-ruby/debian/rules
===================================================================
--- trunk/libole-ruby/debian/rules	2010-02-14 23:35:56 UTC (rev 4715)
+++ trunk/libole-ruby/debian/rules	2010-02-15 23:08:56 UTC (rev 4716)
@@ -11,11 +11,11 @@
 	mv debian/libole-ruby1.8/usr/bin/oletool debian/libole-ruby1.8/usr/share/doc/libole-ruby1.8/examples/oletool
 	rm -fr debian/libole-ruby1.8/usr/bin/
 
-install/libole-ruby1.9::
-	mkdir -p debian/libole-ruby1.9/usr/share/doc/libole-ruby1.9/examples/
-	mv debian/libole-ruby1.9/usr/bin/oletool debian/libole-ruby1.9/usr/share/doc/libole-ruby1.9/examples/oletool
-	rm -fr debian/libole-ruby1.9/usr/bin/
+install/libole-ruby1.9.1::
+	mkdir -p debian/libole-ruby1.9.1/usr/share/doc/libole-ruby1.9.1/examples/
+	mv debian/libole-ruby1.9.1/usr/bin/oletool debian/libole-ruby1.9.1/usr/share/doc/libole-ruby1.9.1/examples/oletool
+	rm -fr debian/libole-ruby1.9.1/usr/bin/
 
-	mv debian/libole-ruby1.9/usr/share/libole-ruby1.8 debian/libole-ruby1.9/usr/share/libole-ruby1.9
+	mv debian/libole-ruby1.9.1/usr/share/libole-ruby1.8 debian/libole-ruby1.9.1/usr/share/libole-ruby1.9.1
 
-	ruby -p -i -e '$$_.gsub!(/ruby1.8/, "ruby1.9")' `find debian/libole-ruby1.9 -type f -name '*.rb'`
+	ruby -p -i -e '$$_.gsub!(/ruby1.8/, "ruby1.9.1")' `find debian/libole-ruby1.9.1 -type f -name '*.rb'`

Added: trunk/libole-ruby/debian/source/format
===================================================================
--- trunk/libole-ruby/debian/source/format	                        (rev 0)
+++ trunk/libole-ruby/debian/source/format	2010-02-15 23:08:56 UTC (rev 4716)
@@ -0,0 +1 @@
+3.0 (quilt)