[DRE-commits] [SCM] ruby-taglib2.git branch, master, updated. upstream/0.1.4-14-g9d31c19
Vincent Carmona
vinc4mai at gmail.com
Sun Jan 22 00:13:38 UTC 2012
The following commit has been merged in the master branch:
commit 9d31c190661ed6c9f317003b0d16ec0fd7a842dd
Author: Vincent Carmona <vinc4mai at gmail.com>
Date: Sun Jan 22 00:50:22 2012 +0100
Fix unwanted changes by previous commit
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..89bcfa5
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,10 @@
+ruby-taglib2 for debian
+-----------------------
+
+The librairy is built so it can replace ruby-taglib
+(old libtagc0-ruby debian package) in place.
+When the librairy is called using "require 'taglib'" ruby-taglib2 should
+provides the same interface as ruby-taglib.
+New code based on ruby-taglib2 should use "require 'taglib2'".
+
+ -- Vincent Carmona <vinc4mai at gmail.com> Thu, 28 Apr 2011 20:13:21 +0200
diff --git a/debian/changelog b/debian/changelog
index f24d97e..0916be7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,23 @@
ruby-taglib2 (0.1.4-1) UNRELEASED; urgency=low
- * Initial release (Closes: #nnnn)
+ * New upstream release
+ * d/copyright
+ - change Format field
+ - change years
+ * d/control
+ - change required version for gem2deb
+ - depends on ruby instead of ruby1.8
-- Vincent Carmona <vinc4mai at gmail.com> Sat, 21 Jan 2012 23:40:58 +0100
+
+ruby-taglib2 (0.1.3-1) unstable; urgency=low
+
+ * Initial release (Closes: #624428)
+ * d/control
+ - Provides/Replaces/Conflicts ruby-taglib
+ * d/patches:
+ - add compat.diff see README.Debian
+ - add fix-require.diff
+ fix "require 'taglib2'" loading taglib2.so instead of taglib2.rb
+
+ -- Vincent Carmona <vinc4mai at gmail.com> Thu, 28 Apr 2011 20:13:21 +0200
diff --git a/debian/control b/debian/control
index 846a5c7..dd1f3c8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Uploaders: Vincent Carmona <vinc4mai at gmail.com>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~), libtagc0-dev
Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-taglib2.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-taglib2.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-taglib2.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-taglib2.git;a=summary
Homepage: http://zik.rubyforge.org/ruby-taglib2
XS-Ruby-Versions: all
@@ -15,5 +15,11 @@ Package: ruby-taglib2
Architecture: any
XB-Ruby-Versions: ${ruby:Versions}
Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Description: ruby-taglib2 is a Ruby interface to TagLib, the audio meta-data library. It allows Ruby programs to read and write meta-data of all the audio formats supported by TagLib. It was written because ruby-taglib suffers severals bugs with ruby 1.9.
- <insert long description, indented with spaces>
+Recommends: libtag-extras1
+Provides: libtagc0-ruby, libtagc0-ruby1.8
+Replaces: libtagc0-ruby, libtagc0-ruby1.8
+Conflicts: libtagc0-ruby, libtagc0-ruby1.8
+Description: Ruby interface to TagLib, the audio meta-data library.
+ It allows Ruby programs to read and write meta-data of all the audio
+ formats supported by TagLib.
+ It was written because ruby-taglib suffers severals bugs with ruby 1.9.
diff --git a/debian/copyright b/debian/copyright
index 8514eb6..0e69b77 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,9 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
-Upstream-Name: taglib2
-Source: FIXME (URL where source can be downloaded)
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173
+Upstream-Name: ruby-taglib2
+Source: http://rubyforge.org/frs/?group_id=5494 http://rubygems.org/gems/taglib2
Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
+Copyright: Copyright 2010-2012 Vincent Carmona <vinc4mai+taglib at gmail.com>
License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
@@ -28,6 +27,25 @@ License: GPL-2+
`/usr/share/common-licenses/GPL-2'.
Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
- [LICENSE TEXT]
+Copyright: Copyright 2011-2012 Vincent Carmona <vinc4mai at gmail.com>
+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; either
+ version 2 of the License, or (at your option) 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/patches/compat.diff b/debian/patches/compat.diff
new file mode 100644
index 0000000..03e2c6a
--- /dev/null
+++ b/debian/patches/compat.diff
@@ -0,0 +1,33 @@
+Author: Vincent Carmona <vinc4mai at gmail.com>
+Description: Compatibility with ruby-tagib
+ * See debian/README.Debian for details
+--- /dev/null
++++ b/lib/taglib.rb
+@@ -0,0 +1,27 @@
++=begin
++Copyright 2010-2011 Vincent Carmona
++vinc4mai+taglib at gmail.com
++
++This file is part of ruby-taglib2.
++
++ ruby-taglib2 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.
++
++ ruby-taglib2 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 ruby-taglib2; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++=end
++
++require "taglib2"
++
++module TagLib
++class BadPath < Exception
++end
++end
diff --git a/debian/patches/fix-require.diff b/debian/patches/fix-require.diff
new file mode 100644
index 0000000..f0e6480
--- /dev/null
+++ b/debian/patches/fix-require.diff
@@ -0,0 +1,33 @@
+Author: Vincent Carmona <vinc4mai at gmail.com>
+Description: Fix require bug
+ * "require 'taglib2'" was loading taglib2.so instead of taglib2.rb
+--- a/extconf.rb
++++ b/extconf.rb
+@@ -28,4 +28,4 @@
+ if ARGV.include?("--compat")
+ ($INSTALLFILES ||= []) << ["compat/taglib.rb", "$(RUBYLIBDIR)", 'compat']
+ end
+-create_makefile("taglib2")
++create_makefile("taglib2_ext")
+--- a/lib/taglib2.rb
++++ b/lib/taglib2.rb
+@@ -19,7 +19,7 @@
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ =end
+
+-require "taglib2.so"
++require "taglib2_ext.so"
+
+ #:main: TagLib::File
+ module TagLib
+--- a/taglib2.c
++++ b/taglib2.c
+@@ -372,7 +372,7 @@
+ }
+
+ void
+-Init_taglib2()
++Init_taglib2_ext()
+ {
+ /*
+ ruby-taglib2 is a Ruby interface to TagLib, the audio meta-data library.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f61f59b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-require.diff
+compat.diff
diff --git a/debian/ruby-taglib2.docs b/debian/ruby-taglib2.docs
deleted file mode 100644
index 786a9ba..0000000
--- a/debian/ruby-taglib2.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-# FIXME: READMEs found
-# README
--
ruby-taglib2.git
More information about the Pkg-ruby-extras-commits
mailing list