[DRE-commits] r1940 - packages/mongrel/trunk/debian

[filipe-guest at alioth.debian.org]

Author: filipe-guest
Date: 2007-09-24 04:29:15 +0000 (Mon, 24 Sep 2007)
New Revision: 1940

Removed:
   packages/mongrel/trunk/debian/patches/
Modified:
   packages/mongrel/trunk/debian/changelog
   packages/mongrel/trunk/debian/control
   packages/mongrel/trunk/debian/rules
Log:
  * Removed patches as there is no use for them anymore (solved upstream).
  * Added rdoc generation as upstream do not provide pre-generated rdocs
    anymore.
  * Added rdoc as build dependency and removed dpatch.
  * Now it builds twice in a row (closes: #442677).
  * New upstream release.



Modified: packages/mongrel/trunk/debian/changelog
===================================================================
--- packages/mongrel/trunk/debian/changelog	2007-09-24 03:03:59 UTC (rev 1939)
+++ packages/mongrel/trunk/debian/changelog	2007-09-24 04:29:15 UTC (rev 1940)
@@ -1,8 +1,13 @@
-mongrel (1.0.1-2) UNRELEASED; urgency=low
+mongrel (1.0.2-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Removed patches as there is no use for them anymore (solved upstream).
+  * Added rdoc generation as upstream do not provide pre-generated rdocs
+    anymore.
+  * Added rdoc as build dependency and removed dpatch.
+  * Now it builds twice in a row (closes: #442677).
+  * New upstream release.
 
- -- Paul van Tilburg <paulvt at debian.org>  Wed, 08 Aug 2007 22:54:14 +0200
+ -- Filipe Lautert <filipe at icewall.org>  Sun, 23 Sep 2007 23:55:01 -0300
 
 mongrel (1.0.1-1) unstable; urgency=low
 

Modified: packages/mongrel/trunk/debian/control
===================================================================
--- packages/mongrel/trunk/debian/control	2007-09-24 03:03:59 UTC (rev 1939)
+++ packages/mongrel/trunk/debian/control	2007-09-24 04:29:15 UTC (rev 1940)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Filipe Lautert <filipe at icewall.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Gunnar Wolf <gwolf at debian.org>, Paul van Tilburg <paulvt at debian.org>
-Build-Depends: debhelper (>= 5.0.0), ruby1.8 (>=1.8.4), ruby1.8-dev (>=1.8.4), dpatch, cdbs, ruby-pkg-tools
+Build-Depends: debhelper (>= 5.0.0), ruby1.8 (>=1.8.4), ruby1.8-dev (>=1.8.4), rdoc1.8, cdbs, ruby-pkg-tools
 Build-Conflicts: gcc-3.3 (<< 1:3.3.2-0pre1)
 Standards-Version: 3.7.2
 

Modified: packages/mongrel/trunk/debian/rules
===================================================================
--- packages/mongrel/trunk/debian/rules	2007-09-24 03:03:59 UTC (rev 1939)
+++ packages/mongrel/trunk/debian/rules	2007-09-24 04:29:15 UTC (rev 1940)
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/dpatch/dpatch.make
 include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
 #include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
@@ -16,15 +14,21 @@
 configure/mongrel::
 	/usr/bin/ruby$(cdbs_ruby_ver) setup.rb config $(DEB_RUBY_CONFIG_ARGS)
 
+configure/mongrel-doc::
+	rdoc --op doc/rdoc lib/ ext/
+
 build/mongrel::
 	/usr/bin/ruby$(cdbs_ruby_ver) setup.rb setup
 
 install/mongrel::
 	/usr/bin/ruby$(cdbs_ruby_ver) setup.rb install $(DEB_RUBY_INSTALL_ARGS)
-	-ln -sf ../../../bin/mongrel_rails debian/mongrel/usr/lib/ruby/1.8/mongrel_rails 
+	-ln -sf ../../../bin/mongrel_rails debian/mongrel/usr/lib/ruby/1.8/mongrel_rails
 	-dh_installman --package=mongrel debian/mongrel_rails.1
 	-find $(CURDIR)/debian -type d | xargs \
 		rmdir -p --ignore-fail-on-non-empty
 
 clean/mongrel::
 	$(MAKE) distclean
+
+clean/mongrel-doc::
+	rm -rf doc/