[DRE-commits] r4970 - trunk/libfacets-ruby/debian

Marc Dequènes duck at alioth.debian.org
Sat Mar 20 14:43:13 UTC 2010


Author: duck
Date: 2010-03-20 14:43:11 +0000 (Sat, 20 Mar 2010)
New Revision: 4970

Removed:
   trunk/libfacets-ruby/debian/libfacets-ruby-doc.doc-base.facets-lore
Modified:
   trunk/libfacets-ruby/debian/changelog
   trunk/libfacets-ruby/debian/control
   trunk/libfacets-ruby/debian/control.in
   trunk/libfacets-ruby/debian/rules
Log:
[evol] NUR, fixed rdoc with new ruby-pkg-tools, Ruby 1.9.1 support

Modified: trunk/libfacets-ruby/debian/changelog
===================================================================
--- trunk/libfacets-ruby/debian/changelog	2010-03-20 13:47:44 UTC (rev 4969)
+++ trunk/libfacets-ruby/debian/changelog	2010-03-20 14:43:11 UTC (rev 4970)
@@ -1,9 +1,12 @@
-libfacets-ruby (2.5.2+git20090627-ef2fec+dfsg1-1.2) UNRELEASED; urgency=low
+libfacets-ruby (2.7.0-1) UNRELEASED; urgency=low
 
   [ Paul van Tilburg ]
   * Added debian/watch.
 
   [ Marc Dequènes (Duck) ]
+  * New upstream release.
+  * Adapted rdoc generation to fit well with recent ruby-pkg-tools.
+  * Added support for Ruby 1.9.1.
   * Improved 'debian/copyright' to be more consistant with DEP-5 draft.
 
  -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Sat, 20 Mar 2010 14:44:49 +0100

Modified: trunk/libfacets-ruby/debian/control
===================================================================
--- trunk/libfacets-ruby/debian/control	2010-03-20 13:47:44 UTC (rev 4969)
+++ trunk/libfacets-ruby/debian/control	2010-03-20 14:43:11 UTC (rev 4970)
@@ -4,8 +4,7 @@
 Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: cdbs, debhelper, ruby (>= 1.8.1), ruby-pkg-tools (>= 0.6)
-Build-Depends-Indep: rdoc (>= 1.8.1)
-Build-Conflicts-Indep: graphviz
+Build-Depends-Indep: ruby1.8, ruby1.9.1, rdoc1.8, rdoc1.9.1, graphviz
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libfacets-ruby/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libfacets-ruby/
 Standards-Version: 3.8.2
@@ -29,6 +28,24 @@
  components commonly useful across a variety of applications
  (Dictionary, LinkedList, PQueue, Random, ...).
 
+Package: libfacets-ruby1.9.1
+Architecture: all
+Depends: ${misc:Depends}, libruby1.9.1
+Description: extensive additions and extensions library for Ruby
+ Ruby Facets is the single largest collection of core extension
+ methods and standard library additions available for the Ruby
+ programming language. 
+ .
+ The core library extend existing base classes with lot's of
+ convenient methods and new base objects (Binding, Functor,
+ Stackable, ...).
+ .
+ In addition to the core libraries, Facets provides dozens of
+ additional classes, modules, mixins and light-weight frameworks.
+ These solid libraries provide a general-purpose set of
+ components commonly useful across a variety of applications
+ (Dictionary, LinkedList, PQueue, Random, ...).
+
 Package: libfacets-ruby
 Architecture: all
 Depends: ${misc:Depends}, libfacets-ruby1.8
@@ -48,7 +65,7 @@
  (Dictionary, LinkedList, PQueue, Random, ...).
  .
  This is a dependency package, which depends on a Facets package
- built for the latest version of Ruby.
+ built for the current default version of Ruby.
 
 Package: libfacets-ruby-doc
 Section: doc

Modified: trunk/libfacets-ruby/debian/control.in
===================================================================
--- trunk/libfacets-ruby/debian/control.in	2010-03-20 13:47:44 UTC (rev 4969)
+++ trunk/libfacets-ruby/debian/control.in	2010-03-20 14:43:11 UTC (rev 4970)
@@ -4,8 +4,7 @@
 Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: @cdbs@, ruby (>= 1.8.1), ruby-pkg-tools (>= 0.6)
-Build-Depends-Indep: rdoc (>= 1.8.1)
-Build-Conflicts-Indep: graphviz
+Build-Depends-Indep: ruby1.8, ruby1.9.1, rdoc1.8, rdoc1.9.1, graphviz
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libfacets-ruby/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libfacets-ruby/
 Standards-Version: 3.8.2
@@ -29,6 +28,24 @@
  components commonly useful across a variety of applications
  (Dictionary, LinkedList, PQueue, Random, ...).
 
+Package: libfacets-ruby1.9.1
+Architecture: all
+Depends: ${misc:Depends}, libruby1.9.1
+Description: extensive additions and extensions library for Ruby
+ Ruby Facets is the single largest collection of core extension
+ methods and standard library additions available for the Ruby
+ programming language. 
+ .
+ The core library extend existing base classes with lot's of
+ convenient methods and new base objects (Binding, Functor,
+ Stackable, ...).
+ .
+ In addition to the core libraries, Facets provides dozens of
+ additional classes, modules, mixins and light-weight frameworks.
+ These solid libraries provide a general-purpose set of
+ components commonly useful across a variety of applications
+ (Dictionary, LinkedList, PQueue, Random, ...).
+
 Package: libfacets-ruby
 Architecture: all
 Depends: ${misc:Depends}, libfacets-ruby1.8
@@ -48,7 +65,7 @@
  (Dictionary, LinkedList, PQueue, Random, ...).
  .
  This is a dependency package, which depends on a Facets package
- built for the latest version of Ruby.
+ built for the current default version of Ruby.
 
 Package: libfacets-ruby-doc
 Section: doc

Deleted: trunk/libfacets-ruby/debian/libfacets-ruby-doc.doc-base.facets-lore
===================================================================
--- trunk/libfacets-ruby/debian/libfacets-ruby-doc.doc-base.facets-lore	2010-03-20 13:47:44 UTC (rev 4969)
+++ trunk/libfacets-ruby/debian/libfacets-ruby-doc.doc-base.facets-lore	2010-03-20 14:43:11 UTC (rev 4970)
@@ -1,10 +0,0 @@
-Document: facets-lore
-Title: Facets Lore API Documentation
-Author: Thomas Sawyer (aka Trans)
-Abstract: Rdoc-generated API documentation.
-Section: Programming/Ruby
-
-Format: HTML
-Index: /usr/share/doc/libfacets-ruby-doc/rdoc/lore/index.html
-Files: /usr/share/doc/libfacets-ruby-doc/rdoc/lore/*
-

Modified: trunk/libfacets-ruby/debian/rules
===================================================================
--- trunk/libfacets-ruby/debian/rules	2010-03-20 13:47:44 UTC (rev 4969)
+++ trunk/libfacets-ruby/debian/rules	2010-03-20 14:43:11 UTC (rev 4970)
@@ -1,20 +1,24 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
+# override rdoc generation
+LIB_DOC_PACKAGE_FILTER=
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
 install/libfacets-ruby-doc::
 	if [ ! -e debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/rdoc ]; then \
-		for PART in core lore more; do \
+		for PART in core more; do \
 			rdoc --all --inline-source --fileboxes --line-numbers --fmt=html -t"Facets $${PART} API" -m doc/README.$${PART} -o debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/rdoc/$${PART} lib/$${PART} doc/README.$${PART}; \
 		done; \
 	fi
 
-binary-install/libfacets-ruby1.8::
-	mkdir debian/$(cdbs_curpkg)/usr/lib/ruby/1.8/facets
-	for PART in core lore more; do \
-		mv debian/$(cdbs_curpkg)/usr/lib/ruby/1.8/$${PART}/facets/* debian/$(cdbs_curpkg)/usr/lib/ruby/1.8/facets/; \
-		rm -rf debian/$(cdbs_curpkg)/usr/lib/ruby/1.8/$${PART}; \
+$(patsubst %,install/%,$(DEB_RUBY_REAL_LIB_PACKAGES)) :: install/% :
+	mkdir debian/$(cdbs_curpkg)/usr/lib/ruby/$(cdbs_ruby_ver)/facets
+	mv debian/$(cdbs_curpkg)/usr/lib/ruby/$(cdbs_ruby_ver)/core/facets*.rb debian/$(cdbs_curpkg)/usr/lib/ruby/$(cdbs_ruby_ver)/
+	for PART in core more; do \
+		mv debian/$(cdbs_curpkg)/usr/lib/ruby/$(cdbs_ruby_ver)/$${PART}/facets/* debian/$(cdbs_curpkg)/usr/lib/ruby/$(cdbs_ruby_ver)/facets/; \
+		rm -rf debian/$(cdbs_curpkg)/usr/lib/ruby/$(cdbs_ruby_ver)/$${PART}; \
 	done
 




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