[DRE-commits] [SCM] amrita packaging branch, master, updated. debian/1.0.2-9-6-g9e9923f

[TANIGUCHI Takaki]

The following commit has been merged in the master branch:
commit 9e9923f9cea3805c45681604a518adc6631de550
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Thu May 19 14:19:26 2011 +0900

    prepare release

diff --git a/debian/changelog b/debian/changelog
index 9c755a0..48fd3a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 ruby-amrita (1.0.2-10) unstable; urgency=low
 
-  * Imported Upstream version 1.0.2
-  * debian/rules: use original build system (Closes: #627195)
-    - move /usr/bin/bin/* to examples.
+  * debian/rules: Mix old style build method.
+    - Move /usr/bin/bin/* to examples.(Closes: #627195)
+    - Install examples again.
 
- -- TANIGUCHI Takaki <takaki at debian.org>  Thu, 19 May 2011 13:54:00 +0900
+ -- TANIGUCHI Takaki <takaki at debian.org>  Thu, 19 May 2011 14:17:58 +0900
 
 ruby-amrita (1.0.2-9) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 726523c..1294fac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,9 @@
 
 override_dh_auto_install:
 	dh_auto_install
-	$(MAKE) rdoc RUBY_VER=1.8 PREFIX=$(CURDIR)/debian/ruby-amrita/usr
+	$(MAKE) rdoc RUBY_VER=1.8 \
+		PREFIX=$(CURDIR)/debian/ruby-amrita/usr \
+		DOCDIR=$(CURDIR)/debian/ruby-amrita/usr/share/doc/ruby-amrita/html
 	rm -f $(CURDIR)/debian/ruby-amrita/usr/bin/*  \
 
 override_dh_installexamples:

-- 
amrita packaging