[DRE-commits] [SCM] ruby-inotify.git branch, master, updated. upstream/0.0.2-2-gb6690e6
Paul van Tilburg
paulvt at debian.org
Sun Sep 25 19:44:45 UTC 2011
The following commit has been merged in the master branch:
commit b6690e65db42a0aab9e4caef28dfb9261f6e2084
Author: Paul van Tilburg <paulvt at debian.org>
Date: Sun Sep 25 21:44:43 2011 +0200
Updated to use gem2deb and to follow the new Ruby policy.
diff --git a/debian/changelog b/debian/changelog
index 23aa007..f80ee2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+ruby-inotify (0.0.2-6) unstable; urgency=low
+
+ * Source packages adapted according to the new Ruby policy:
+ - Build for both ruby1.8 and ruby1.9.1.
+ - Migrated to pkg-ruby-extras git repos. Changed the Vcs-* fields in
+ debian/control accordingly.
+ - Changed the depends and recommends to follow the new Ruby
+ library naming scheme.
+ * debian/control:
+ - Added a default DM-Upload-Allowed field set to yes.
+ - Standards-Version bumped to 3.9.2; no changes required.
+ - Updated the homepage.
+ - Set XS-Ruby-Versions to all.
+ - Changed the build-depends for using gem2deb instead of ruby-pkg-tools.
+ - Added rake as a build-depend.
+ - Switched the maintainer with the uploaders field as per new
+ convention the team is the default maintainer.
+ * debian/copyright: reworked to fit the DEP5 format.
+
+ -- Paul van Tilburg <paulvt at debian.org> Sun, 25 Sep 2011 21:11:21 +0200
+
libinotify-ruby (0.0.2-5) unstable; urgency=low
* Team upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 69274d6..0f615c3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,39 +1,46 @@
-Source: libinotify-ruby
+Source: ruby-inotify
Section: ruby
Priority: optional
-Maintainer: Ryan Niebur <ryanryan52 at gmail.com>
-Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), ruby-pkg-tools (>= 0.17), ruby1.8,
- ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev
-Standards-Version: 3.9.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libinotify-ruby/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libinotify-ruby/
-Homepage: http://raa.ruby-lang.org/project/ruby-inotify/
+Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Uploaders: Ryan Niebur <ryanryan52 at gmail.com>, Paul van Tilburg <paulvt at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.10)
+Standards-Version: 3.9.2
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-feedparser.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-feedparser.git;a=summary
+Homepage: http://dinhe.net/~aredridel/projects/ruby/ruby-inotify.html
+XS-Ruby-Versions: all
-Package: libinotify-ruby
+Package: ruby-inotify
Architecture: all
-Depends: libinotify-ruby1.8, ${misc:Depends}
-Description: Ruby interface to Linux's inotify system (dependency package)
+XB-Ruby-Versions: ${ruby:Versions}
+Replaces: libinotify-ruby (<< 0.0.2-6~), libinotify-ruby1.8 (<< 0.0.2-6~), libinotify-ruby1.9.1 (<< 0.0.2-6~)
+Breaks: libinotify-ruby (<< 0.0.2-6~), libinotify-ruby1.8 (<< 0.0.2-6~), libinotify-ruby1.9.1 (<< 0.0.2-6~)
+Provides: libinotify-ruby, libinotify-ruby1.8, libinotify-ruby1.9.1
+Depends: ${misc:Depends}, ruby | ruby-interpreter
+Description: Ruby interface to Linux's inotify system
The Ruby package ruby-inotify allows to use Linux's inotify system to
wait for and respond to file access/change/create/delete events.
- .
- This is a dependency package which depends on Debian's default Ruby version
- (currently 1.8.x).
+
+Package: libinotify-ruby
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-inotify
+Description: Transitional package for ruby-inotify
+ This is a transitional package to ease upgrades to the ruby-inotify
+ package. It can safely be removed.
Package: libinotify-ruby1.8
-Architecture: any
-Depends: ruby1.8, ${shlibs:Depends}, ${misc:Depends}
-Description: Ruby interface to Linux's inotify system (ruby 1.8)
- The Ruby package ruby-inotify allows to use Linux's inotify system to
- wait for and respond to file access/change/create/delete events.
- .
- This package is built for Ruby 1.8.
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-inotify
+Description: Transitional package for ruby-inotify
+ This is a transitional package to ease upgrades to the ruby-inotify
+ package. It can safely be removed.
Package: libinotify-ruby1.9.1
-Architecture: any
-Depends: ruby1.9.1, ${shlibs:Depends}, ${misc:Depends}
-Description: Ruby interface to Linux's inotify system (ruby 1.9.1)
- The Ruby package ruby-inotify allows to use Linux's inotify system to
- wait for and respond to file access/change/create/delete events.
- .
- This package is built for Ruby 1.9.1.
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-inotify
+Description: Transitional package for ruby-inotify
+ This is a transitional package to ease upgrades to the ruby-inotify
+ package. It can safely be removed.
diff --git a/debian/copyright b/debian/copyright
index a461bdb..0394ca2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,80 +1,77 @@
-This package was debianised by Torsten Werner <twerner at debian.org>,
-on March 18th, 2007.
-
-It was downloaded from <http://raa.ruby-lang.org/project/ruby-inotify/>.
-
-Upstream Author: aredridel at nbtsc.org
-
-Copyright: (C) 2005-2007 aredridel at nbtsc.org
-
-License:
-
- ruby-inotify is licensed under the same terms as Ruby itself:
-
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see the file /usr/share/common-licenses/GPL), or the conditions below:
-
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: ruby-dbus
+Source: http://dinhe.net/~aredridel/projects/ruby/ruby-inotify.html
+
+Files: *
+Copyright: 2005-2007, aredridel at nbtsc.org
+License: Ruby | GPL
+
+Files: debian/*
+Copyright: 2007-2008, Torsten Werner <twerner at debian.org>
+ 2009, Ryan Niebur <ryanryan52 at gmail.com>
+License: Ruby | GPL
+
+License: Ruby
+ You can redistribute it and/or modify the software under the conditions
+ below:
+ .
1. You may make and give away verbatim copies of the source form of the
software without restriction, provided that you duplicate all of the
original copyright notices and associated disclaimers.
-
+ .
2. You may modify your copy of the software in any way, provided that
you do at least ONE of the following:
-
+ .
a) place your modifications in the Public Domain or otherwise
- make them Freely Available, such as by posting said
- modifications to Usenet or an equivalent medium, or by allowing
- the author to include your modifications in the software.
-
+ make them Freely Available, such as by posting said
+ modifications to Usenet or an equivalent medium, or by allowing
+ the author to include your modifications in the software.
+ .
b) use the modified software only within your corporation or
- organization.
-
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
-
+ organization.
+ .
+ c) rename any non-standard executables so the names do not conflict
+ with standard executables, which must also be provided.
+ .
d) make other distribution arrangements with the author.
-
- 3. You may distribute the software in object code or binary form,
- provided that you do at least ONE of the following:
-
- a) distribute the binaries and library files of the software,
- together with instructions (in the manual page or equivalent)
- on where to get the original distribution.
-
+ .
+ 3. You may distribute the software in object code or executable
+ form, provided that you do at least ONE of the following:
+ .
+ a) distribute the executables and library files of the software,
+ together with instructions (in the manual page or equivalent)
+ on where to get the original distribution.
+ .
b) accompany the distribution with the machine-readable source of
- the software.
-
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
-
+ the software.
+ .
+ c) give non-standard executables non-standard names, with
+ instructions on where to get the original software distribution.
+ .
d) make other distribution arrangements with the author.
-
+ .
4. You may modify and include the part of the software into any other
software (possibly commercial). But some files in the distribution
- are not written by the author, so that they are not under these terms.
-
- For the list of those files and their copying conditions, see the
- file LEGAL.
-
- 5. The scripts and library files supplied as input to or produced as
+ are not written by the author, so that they are not under this terms.
+ They are gc.c(partly), utils.c(partly), regex.[ch], fnmatch.[ch],
+ glob.c, st.[ch] and some files under the ./missing directory. See
+ each file for the copying condition.
+ .
+ 5. The scripts and library files supplied as input to or produced as
output from the software do not automatically fall under the
- copyright of the software, but belong to whomever generated them,
+ copyright of the software, but belong to whomever generated them,
and may be sold commercially, and may be aggregated with this
software.
-
+ .
6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
PURPOSE.
-
-GNU General Public License:
-
-On Debian systems, the complete text of the GNU General Public License can
-be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is Copyright 2007-2008 Torsten Werner
-<twerner at debian.org> and Copyright 2009 Ryan Niebur
-<ryanryan52 at gmail.com>, and is licensed under the same license as this
-package itself, see above.
+License: GPL
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation.
+ .
+ On Debian systems, the complete text of the GNU General Public License can
+ be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/libinotify-ruby1.8.examples b/debian/examples
similarity index 100%
rename from debian/libinotify-ruby1.8.examples
rename to debian/examples
diff --git a/debian/libinotify-ruby1.9.examples b/debian/libinotify-ruby1.9.examples
deleted file mode 100644
index e39721e..0000000
--- a/debian/libinotify-ruby1.9.examples
+++ /dev/null
@@ -1 +0,0 @@
-examples/*
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
new file mode 100644
index 0000000..932d303
--- /dev/null
+++ b/debian/ruby-tests.rb
@@ -0,0 +1,5 @@
+# Testing...
+$LOAD_PATH << 'lib'
+
+# Run the test suite.
+require "tests/test_1.rb"
diff --git a/debian/rules b/debian/rules
index 7cb40e1..b2eab18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,15 @@
#!/usr/bin/make -f
+#export DH_VERBOSE=1
+#
+# Uncomment to ignore all test failures (but the tests will run anyway)
+export DH_RUBY_IGNORE_TESTS=all
+#
+# Uncomment to ignore some test failures (but the tests will run anyway).
+# Valid values:
+#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
+#
+# If you need to specify the .gemspec (eg there is more than one)
+#export DH_RUBY_GEMSPEC=gem.gemspec
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk
-
-install/libinotify-ruby1.8::
- ruby1.8 tests/test_1.rb
-
-install/libinotify-ruby1.9.1::
- ruby1.9.1 tests/test_1.rb
+%:
+ dh $@ --buildsystem=ruby --with ruby
diff --git a/tests/test_1.rb b/tests/test_1.rb
index 6af61fa..4b46f15 100644
--- a/tests/test_1.rb
+++ b/tests/test_1.rb
@@ -1,5 +1,5 @@
require 'test/unit'
-require 'inotify'
+require './inotify'
class Test1 < Test::Unit::TestCase
def setup
--
ruby-inotify.git
More information about the Pkg-ruby-extras-commits
mailing list