[DRE-commits] [SCM] ruby-facets.git branch, master, updated. debian/2.9.2-1-9-g4d1b617

[=?UTF-8?Q?Marc=20Dequ=C3=A8nes=20?=(Duck)]

The following commit has been merged in the master branch:
commit 4d1b617e83f9d24a1d8759e8471096c88f112e6f
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Fri Jun 21 03:54:43 2013 +0200

    [evol] rakefile->setuprb due to upstream changes, and recreated doc build rules

diff --git a/debian/changelog b/debian/changelog
index 62909c2..800fe1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ruby-facets (2.9.3-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release:
+    - rakefile is gone, switched back to setuprb method
+    - recreated documention build rules and adapted to new paths
   * Updated copyright file.
   * Increased Standards-Version to 3.9.4 (no changes).
   * Removed transitional libfacets-* package and obsolete relations.
diff --git a/debian/control b/debian/control
index a02c251..6d37eba 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 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: debhelper (>= 7.0.50~), gem2deb (>= 0.2.7~), rake
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.7~), ruby-setup
 Build-Depends-Indep: graphviz
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-facets.git
diff --git a/debian/ruby-facets-doc.doc-base.facets-core-uncommon b/debian/ruby-facets-doc.doc-base.facets-core-uncommon
deleted file mode 100644
index c92c26d..0000000
--- a/debian/ruby-facets-doc.doc-base.facets-core-uncommon
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: ruby-facets-core-uncommon
-Title: Facets Core-Uncommon API Documentation
-Author: Thomas Sawyer (aka Trans)
-Abstract: Rdoc-generated API documentation.
-Section: Programming/Ruby
-
-Format: HTML
-Index: /usr/share/doc/ruby-facets-doc/api/core-uncommon/index.html
-Files: /usr/share/doc/ruby-facets-doc/api/core-uncommon/*
diff --git a/debian/ruby-facets-doc.doc-base.facets-supplemental b/debian/ruby-facets-doc.doc-base.facets-supplemental
deleted file mode 100644
index 5b8cdb4..0000000
--- a/debian/ruby-facets-doc.doc-base.facets-supplemental
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: ruby-facets-supplemental
-Title: Facets Supplemental API Documentation
-Author: Thomas Sawyer (aka Trans)
-Abstract: Rdoc-generated API documentation.
-Section: Programming/Ruby
-
-Format: HTML
-Index: /usr/share/doc/ruby-facets-doc/api/supplemental/index.html
-Files: /usr/share/doc/ruby-facets-doc/api/supplemental/*
diff --git a/debian/ruby-facets-doc.docs b/debian/ruby-facets-doc.docs
index dcb1ceb..2353a8c 100644
--- a/debian/ruby-facets-doc.docs
+++ b/debian/ruby-facets-doc.docs
@@ -1,4 +1,4 @@
 README.rdoc
 HISTORY.rdoc
-AUTHORS.rdoc
-site/doc/api
+NOTICE.rdoc
+build-doc/api
diff --git a/debian/rules b/debian/rules
index 40353aa..aba4452 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,29 +11,27 @@
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
+DOC_DIR = build-doc/api
+
 %:
-	dh $@ --buildsystem=ruby --with ruby
+	dh $@ --buildsystem=rubysetuprb --with ruby
+
+override_dh_auto_configure:
+	ln -s /usr/lib/ruby/vendor_ruby/setup.rb .
+	dh_auto_configure
 
 override_dh_auto_build:
 	dh_auto_build
-	mkdir -p site/doc/api
-	ln -s . lib/facets		# workaround
-	rake rdoc
+	mkdir -p $(DOC_DIR)
+	rdoc -a -S -t'Facets Core API' -T html -m README.rdoc --op '$(DOC_DIR)/core' README.rdoc lib/facets/core
+	rdoc -a -S -t'Facets Standard API' -T html -m README.rdoc --op '$(DOC_DIR)/standard' README.rdoc lib/facets/standard
 
 LIB_INSTALL_PATH=debian/ruby-facets/usr/lib/ruby/vendor_ruby
 
 override_dh_auto_install:
 	dh_auto_install
-	# workaround
-	mv ${LIB_INSTALL_PATH}/core/facets.rb ${LIB_INSTALL_PATH}/
-	mkdir ${LIB_INSTALL_PATH}/facets
-	for p in core core-uncommon standard supplemental; do \
-		cp -r ${LIB_INSTALL_PATH}/$${p}/facets/* ${LIB_INSTALL_PATH}/facets/;\
-		rm -rf ${LIB_INSTALL_PATH}/$${p};\
-	done
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -f lib/facets		# workaround
-	rm -rf site/doc/api
+	rm -rf setup.rb build-doc
 

-- 
ruby-facets.git