[DRE-commits] [SCM] ruby-fusefs.git branch, master, updated. upstream/0.7.0-6-gabea175

Mon Apr 23 21:06:12 UTC 2012

The following commit has been merged in the master branch:
commit c557d48321acec0afa61f36c5716d81534bbd64f
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Mon Apr 23 22:47:41 2012 +0200

    Merged changes from the old libfusefs-ruby package

diff --git a/debian/changelog b/debian/changelog
index 858f4f2..f2f3d6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,44 @@
 ruby-fusefs (0.7.0-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * New upstream release.
+  * 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.3; no changes required.
+    - Set XS-Ruby-Versions to all.
+    - Changed the build-depends for using gem2deb instead of ruby-pkg-tools.
+    - Switched the maintainer with the uploaders field as per new
+      convention the team is the default maintainer.
+    - Added libdbus-ruby and libdbus-ruby1.8 as transitional packages.
+  * debian/copyright: updated to use the Debian machine-readable copyright
+    format version 1.0.
 
- -- Paul van Tilburg <paulvt at debian.org>  Mon, 23 Apr 2012 22:26:56 +0200
+ -- Paul van Tilburg <paulvt at debian.org>  Mon, 23 Apr 2012 22:46:22 +0200
+
+libfusefs-ruby (0.6.0-3) unstable; urgency=low
+
+  [ Arnaud Cornet ]
+  * Add API.txt to docs and foo.yaml in samples to test yamlfs
+  (Closes: 422725).
+  * Improve libfusefs-ruby1.8.examples with a wildcard.
+  * Sharpen copyright of setup.rb.
+
+ -- Arnaud Cornet <arnaud.cornet at gmail.com>  Tue, 08 May 2007 13:55:20 +0200
+
+libfusefs-ruby (0.6.0-2) unstable; urgency=low
+
+  [ Arnaud Cornet ]
+  * Drop uploaders.mk. Add Paul to uploaders.
+
+ -- Arnaud Cornet <arnaud.cornet at gmail.com>  Wed, 18 Apr 2007 21:49:28 +0200
+
+libfusefs-ruby (0.6.0-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Arnaud Cornet <arnaud.cornet at gmail.com>  Sat, 21 Oct 2006 14:17:25 +0200
diff --git a/debian/control b/debian/control
index 41a0799..2510d3c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: ruby-fusefs
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders:  <paulvt at debian.org>
+Uploaders: Paul van Tilburg <paulvt at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~)
-Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-fusefs.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-fusefs.git;a=summary
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), libfuse-dev
+Standards-Version: 3.9.3
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-fusefs.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-fusefs.git;a=summary
 Homepage: http://github.com/duairc/fusefs
 XS-Ruby-Versions: all
 
@@ -15,5 +15,28 @@ Package: ruby-fusefs
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Description: fusefs
- Gemified
+Replaces: libfusefs-ruby (<< 0.7.0-1~), libfusefs-ruby1.8 (<< 0.7.0-1~)
+Breaks: libfusefs-ruby (<< 0.7.0-1~), libfusefs-ruby1.8 (<< 0.7.0-1~)
+Provides: libfusefs-ruby, libfusefs-ruby1.8
+Description: library to easily define a filesystem in Ruby using fuse
+ This library provides a simple API to define a FUSE filesystem in Ruby.
+ It is *NOT* a full implementation of the FUSE API.
+
+Package: libfusefs-ruby
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-fusefs
+Description: Transitional package for ruby-fusefs
+ This is a transitional package to ease upgrades to the ruby-fusefs
+ package. It can safely be removed.
+
+Package: libfusefs-ruby1.8
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-fusefs
+Description: Transitional package for ruby-fusefs
+ This is a transitional package to ease upgrades to the ruby-fusefs
+ package. It can safely be removed.
+
diff --git a/debian/copyright b/debian/copyright
index 7b71dc9..83b64ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,46 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: fusefs
-Source: FIXME <http://example.com/>
+Upstream-Contact: Greg Millam <walker at deafcode.com>
+Source: https://github.com/duairc/fusefs
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
- 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; either
- version 2 of the License, or (at your option) any later
- version.
+Copyright: 2005 Greg Millam,
+           2009 Kyle Maxwell
+License: MIT
+ 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:
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ 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: 2012  <paulvt at debian.org>
-License:
- [LICENSE TEXT]
+Copyright: 2012 Paul van Tilburg <paulvt at debian.org>
+License: GPL-2+
+ 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, version 2 of the License, or (at your opinion) 
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this package; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/ruby-fusefs.docs b/debian/ruby-fusefs.docs
index 786a9ba..e0152df 100644
--- a/debian/ruby-fusefs.docs
+++ b/debian/ruby-fusefs.docs
@@ -1,2 +1,3 @@
-# FIXME: READMEs found
-# README
+API.txt
+README
+TODO
diff --git a/debian/ruby-fusefs.examples b/debian/ruby-fusefs.examples
index 19ae3fc..640e65f 100644
--- a/debian/ruby-fusefs.examples
+++ b/debian/ruby-fusefs.examples
@@ -1,3 +1 @@
-# FIXME: sample/ dir found in source. Consider installing the examples.
-# Examples:
-# sample/*
+sample/*
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
index 7f8b53b..1586a47 100644
--- a/debian/ruby-test-files.yaml
+++ b/debian/ruby-test-files.yaml
@@ -1,3 +1,2 @@
 --- 
-- test/test_helper.rb
 - test/fusefs_test.rb

-- 
ruby-fusefs.git

