[DRE-commits] r4977 - in trunk/libffi-ruby: . debian debian/.pc debian/patches

Micah Anderson micah at alioth.debian.org
Sat Mar 20 20:30:35 UTC 2010


Author: micah
Date: 2010-03-20 20:30:33 +0000 (Sat, 20 Mar 2010)
New Revision: 4977

Added:
   trunk/libffi-ruby/debian/
   trunk/libffi-ruby/debian/.pc/
   trunk/libffi-ruby/debian/.pc/.quilt_patches
   trunk/libffi-ruby/debian/.pc/.quilt_series
   trunk/libffi-ruby/debian/.pc/.version
   trunk/libffi-ruby/debian/.pc/applied-patches
   trunk/libffi-ruby/debian/README.source
   trunk/libffi-ruby/debian/changelog
   trunk/libffi-ruby/debian/compat
   trunk/libffi-ruby/debian/control
   trunk/libffi-ruby/debian/copyright
   trunk/libffi-ruby/debian/libffi-ruby1.8.docs
   trunk/libffi-ruby/debian/libffi-ruby1.8.examples
   trunk/libffi-ruby/debian/libffi-ruby1.9.1.docs
   trunk/libffi-ruby/debian/libffi-ruby1.9.1.examples
   trunk/libffi-ruby/debian/patches/
   trunk/libffi-ruby/debian/patches/change_location_of_binding
   trunk/libffi-ruby/debian/patches/series
   trunk/libffi-ruby/debian/post-install.rb
   trunk/libffi-ruby/debian/repack.sh
   trunk/libffi-ruby/debian/rules
   trunk/libffi-ruby/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


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

Added: trunk/libffi-ruby/debian/.pc/.quilt_patches
===================================================================
--- trunk/libffi-ruby/debian/.pc/.quilt_patches	                        (rev 0)
+++ trunk/libffi-ruby/debian/.pc/.quilt_patches	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1 @@
+patches

Added: trunk/libffi-ruby/debian/.pc/.quilt_series
===================================================================
--- trunk/libffi-ruby/debian/.pc/.quilt_series	                        (rev 0)
+++ trunk/libffi-ruby/debian/.pc/.quilt_series	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1 @@
+series

Added: trunk/libffi-ruby/debian/.pc/.version
===================================================================
--- trunk/libffi-ruby/debian/.pc/.version	                        (rev 0)
+++ trunk/libffi-ruby/debian/.pc/.version	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1 @@
+2

Added: trunk/libffi-ruby/debian/.pc/applied-patches
===================================================================
--- trunk/libffi-ruby/debian/.pc/applied-patches	                        (rev 0)
+++ trunk/libffi-ruby/debian/.pc/applied-patches	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1 @@
+change_location_of_binding

Added: trunk/libffi-ruby/debian/README.source
===================================================================
--- trunk/libffi-ruby/debian/README.source	                        (rev 0)
+++ trunk/libffi-ruby/debian/README.source	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,8 @@
+This package includes patches managed with the «quilt» patch
+management system. Changes to the upstream sources are stored as diffs
+in debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+ -- Micah Anderson <micah at debian.org>, Thu,  4 Mar 2010 16:53:54 -0500
+

Added: trunk/libffi-ruby/debian/changelog
===================================================================
--- trunk/libffi-ruby/debian/changelog	                        (rev 0)
+++ trunk/libffi-ruby/debian/changelog	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,33 @@
+libffi-ruby (0.6.2debian-5) unstable; urgency=low
+
+  * Fix ruby1.9.1 Build-Depends (Closes: #574532)
+  * Fix libffi-ruby binary dependency to be libffi-ruby1.8
+  * Add Dependency on ruby1.8 for libffi-ruby1.8
+
+ -- Micah Anderson <micah at debian.org>  Thu, 18 Mar 2010 23:51:04 -0400
+
+libffi-ruby (0.6.2debian-4) unstable; urgency=low
+
+  * Upstream confirmation of 1.9.1 support, so adding that back
+
+ -- Micah Anderson <micah at debian.org>  Tue, 09 Mar 2010 13:08:48 -0500
+
+libffi-ruby (0.6.2debian-3) unstable; urgency=low
+
+  * Fix ruby path in types.conf generation
+
+ -- Micah Anderson <micah at debian.org>  Sat, 06 Mar 2010 12:04:55 -0500
+
+libffi-ruby (0.6.2debian-2) unstable; urgency=low
+
+  * Generate missing types.conf during the package build
+  * Seems to only support ruby 1.9 for now, so switch away from 1.9.1
+
+ -- Micah Anderson <micah at debian.org>  Fri, 05 Mar 2010 01:01:30 -0500
+
+libffi-ruby (0.6.2debian-1) unstable; urgency=low
+
+  * Repack upstream source to remove embedded libffi
+  * Initial release (Closes: #572597)
+
+ -- Micah Anderson <micah at debian.org>  Thu, 04 Mar 2010 15:45:17 -0500

Added: trunk/libffi-ruby/debian/compat
===================================================================
--- trunk/libffi-ruby/debian/compat	                        (rev 0)
+++ trunk/libffi-ruby/debian/compat	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1 @@
+7

Added: trunk/libffi-ruby/debian/control
===================================================================
--- trunk/libffi-ruby/debian/control	                        (rev 0)
+++ trunk/libffi-ruby/debian/control	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,48 @@
+Source: libffi-ruby
+Section: ruby
+Priority: optional
+Maintainer: Micah Anderson <micah at debian.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7), cdbs, ruby-pkg-tools (>= 0.8), libsetup-ruby1.8, libffi-dev, ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev, quilt
+Standards-Version: 3.8.4
+Homepage: http://github.com/ffi/ffi
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libffi-ruby/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libffi-ruby/
+
+Package: libffi-ruby
+Architecture: all
+Depends: libffi-ruby1.8, ${misc:Depends}
+Description: load dynamic libraries, bind functions from within ruby code
+ Ruby-FFI is a ruby extension for programmatically loading dynamic
+ libraries, binding functions within them, and calling those functions
+ from Ruby code. Moreover, a Ruby-FFI extension works without changes
+ on Ruby and JRuby. Discover why should you write your next extension
+ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].
+ .
+ This is a dependency package which depends on Debian's default Ruby version
+ (currently 1.8).
+
+Package: libffi-ruby1.8
+Architecture: any
+Depends: ruby1.8, ${shlibs:Depends}, ${misc:Depends}
+Description: load dynamic libraries, bind functions from within ruby code
+ Ruby-FFI is a ruby extension for programmatically loading dynamic
+ libraries, binding functions within them, and calling those functions
+ from Ruby code. Moreover, a Ruby-FFI extension works without changes
+ on Ruby and JRuby. Discover why should you write your next extension
+ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].
+ .
+ This package is built for Ruby 1.8.
+
+
+Package: libffi-ruby1.9.1
+Architecture: any
+Depends: ruby1.9.1, ${shlibs:Depends}, ${misc:Depends}
+Description: load dynamic libraries, bind functions from within ruby code
+ Ruby-FFI is a ruby extension for programmatically loading dynamic
+ libraries, binding functions within them, and calling those functions
+ from Ruby code. Moreover, a Ruby-FFI extension works without changes
+ on Ruby and JRuby. Discover why should you write your next extension
+ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].
+ .
+ This package is built for Ruby 1.9.1.

Added: trunk/libffi-ruby/debian/copyright
===================================================================
--- trunk/libffi-ruby/debian/copyright	                        (rev 0)
+++ trunk/libffi-ruby/debian/copyright	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,58 @@
+Files: *
+Copyright (c) 2008, 2009 Ruby FFI contributors 
+
+License:
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of the JRuby Project nor the names of its contributors 
+  may be used to endorse or promote products derived from this software 
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE 
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: ext/ffi_c/libffi
+libffi - Copyright (c) 1996-2009  Anthony Green, Red Hat, Inc and others.  
+See source files for details.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+``Software''), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Files: debian/*
+Copyright: (c) 2010, Micah Anderson <micah at debian.org>
+License: Public Domain
+ It is assumed that all contributors release their packaging works under the
+ same term as the module itself.
+

Added: trunk/libffi-ruby/debian/libffi-ruby1.8.docs
===================================================================
--- trunk/libffi-ruby/debian/libffi-ruby1.8.docs	                        (rev 0)
+++ trunk/libffi-ruby/debian/libffi-ruby1.8.docs	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,2 @@
+README.rdoc
+History.txt

Added: trunk/libffi-ruby/debian/libffi-ruby1.8.examples
===================================================================
--- trunk/libffi-ruby/debian/libffi-ruby1.8.examples	                        (rev 0)
+++ trunk/libffi-ruby/debian/libffi-ruby1.8.examples	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1 @@
+samples/*

Added: trunk/libffi-ruby/debian/libffi-ruby1.9.1.docs
===================================================================
--- trunk/libffi-ruby/debian/libffi-ruby1.9.1.docs	                        (rev 0)
+++ trunk/libffi-ruby/debian/libffi-ruby1.9.1.docs	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,2 @@
+README.rdoc
+History.txt

Added: trunk/libffi-ruby/debian/libffi-ruby1.9.1.examples
===================================================================
--- trunk/libffi-ruby/debian/libffi-ruby1.9.1.examples	                        (rev 0)
+++ trunk/libffi-ruby/debian/libffi-ruby1.9.1.examples	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1 @@
+samples/*

Added: trunk/libffi-ruby/debian/patches/change_location_of_binding
===================================================================
--- trunk/libffi-ruby/debian/patches/change_location_of_binding	                        (rev 0)
+++ trunk/libffi-ruby/debian/patches/change_location_of_binding	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,15 @@
+Index: libffi-ruby/lib/ffi.rb
+===================================================================
+--- libffi-ruby.orig/lib/ffi.rb	2010-03-06 12:42:32.000000000 -0500
++++ libffi-ruby/lib/ffi.rb	2010-03-06 12:42:31.000000000 -0500
+@@ -1,8 +1,8 @@
+ begin
+   if RUBY_VERSION =~ /1.8/
+-    require '1.8/ffi_c'
++    require 'ffi_c'
+   elsif RUBY_VERSION =~ /1.9/
+-    require '1.9/ffi_c'
++    require 'ffi_c'
+   end
+ rescue Exception
+   require 'ffi_c'

Added: trunk/libffi-ruby/debian/patches/series
===================================================================
--- trunk/libffi-ruby/debian/patches/series	                        (rev 0)
+++ trunk/libffi-ruby/debian/patches/series	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1 @@
+change_location_of_binding

Added: trunk/libffi-ruby/debian/post-install.rb
===================================================================
--- trunk/libffi-ruby/debian/post-install.rb	                        (rev 0)
+++ trunk/libffi-ruby/debian/post-install.rb	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,16 @@
+require "fileutils"
+# Load the fresh installed ffi release
+
+RUBY_MAJOR = RUBY_VERSION.match(/^\d+\.\d+/).to_s
+RUBY_MINOR = RUBY_MAJOR == "1.9" ? "." + RUBY_VERSION.match(/\d+$/).to_s : ''
+
+paths = ["./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/", "./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/#{RUBY_PLATFORM}/"]
+
+paths.each {|i| $:.unshift(i)}
+
+require "./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/ffi.rb"
+require "./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/ffi/tools/types_generator"
+
+File.open(File.join("./debian/libffi-ruby#{RUBY_MAJOR}#{RUBY_MINOR}/usr/lib/ruby/#{RUBY_MAJOR}#{RUBY_MINOR}/ffi", 'types.conf'),'w') do |f|
+  f.puts FFI::TypesGenerator.generate
+end

Added: trunk/libffi-ruby/debian/repack.sh
===================================================================
--- trunk/libffi-ruby/debian/repack.sh	                        (rev 0)
+++ trunk/libffi-ruby/debian/repack.sh	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Repackage upstream source to exclude non-distributable files
+# should be called as "repack.sh --upstream-source <ver> <downloaded file>
+# (for example, via uscan)
+
+set -e
+set -u
+
+VER="$2debian"
+FILE="$3"
+PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
+
+REPACK_DIR="$PKG-$VER.orig" # DevRef § 6.7.8.2
+
+echo -e "\nRepackaging $FILE\n"
+
+DIR=`mktemp -d ./tmpRepackXXXXXX`
+trap "rm -rf \"$DIR\"" QUIT INT EXIT
+
+# Create an extra directory to cope with rootless tarballs
+UP_BASE="$DIR/unpack"
+mkdir "$UP_BASE"
+tar xzf "$FILE" -C "$UP_BASE"
+
+if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then
+	# Tarball does contain a root directory
+	UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
+fi
+
+## Remove stuff
+rm -vfr $UP_BASE/ext/ffi_c/libffi
+
+## End
+
+mv "$UP_BASE" "$DIR/$REPACK_DIR"
+
+# Using a pipe hides tar errors!
+tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
+gzip -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz"
+FILE="../tarballs/${PKG}_${VER}.orig.tar.gz"
+mv "$DIR/repacked.tar.gz" "$FILE"
+
+echo "*** $FILE repackaged"

Added: trunk/libffi-ruby/debian/rules
===================================================================
--- trunk/libffi-ruby/debian/rules	                        (rev 0)
+++ trunk/libffi-ruby/debian/rules	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+
+install/libffi-ruby1.8::
+	/usr/bin/ruby1.8 ./debian/post-install.rb
+
+install/libffi-ruby1.9.1::
+	/usr/bin/ruby1.9.1 ./debian/post-install.rb
+	
+


Property changes on: trunk/libffi-ruby/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/libffi-ruby/debian/watch
===================================================================
--- trunk/libffi-ruby/debian/watch	                        (rev 0)
+++ trunk/libffi-ruby/debian/watch	2010-03-20 20:30:33 UTC (rev 4977)
@@ -0,0 +1,5 @@
+version=3
+options="dversionmangle=s/debian[0-9]*//" \
+http://githubredir.debian.net/github/ffi/ffi/ ([.0-9]*).tar.gz debian debian/repack.sh
+
+




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