[DRE-commits] r1263 - packages-wip/mongrel/trunk/debian

Tue Jan 9 17:23:42 CET 2007

Author: filipe-guest
Date: 2007-01-09 17:23:42 +0100 (Tue, 09 Jan 2007)
New Revision: 1263

Modified:
   packages-wip/mongrel/trunk/debian/changelog
   packages-wip/mongrel/trunk/debian/control
   packages-wip/mongrel/trunk/debian/control.in
   packages-wip/mongrel/trunk/debian/copyright
   packages-wip/mongrel/trunk/debian/docs
   packages-wip/mongrel/trunk/debian/rules
Log:
 * Cdbsfied debian/rules
 * Updated dependecies on control and control.in
 * Removed examples and rdoc from docs (shall we ship it?)
 * Added reference to GPL on copyright



Modified: packages-wip/mongrel/trunk/debian/changelog
===================================================================

--- packages-wip/mongrel/trunk/debian/changelog	2007-01-09 15:20:46 UTC (rev 1262)
+++ packages-wip/mongrel/trunk/debian/changelog	2007-01-09 16:23:42 UTC (rev 1263)
@@ -4,10 +4,11 @@
   * Aplied patch to init.d, so now it suports multiple environments.
   * Removed insconsistent patchs.
   * Updated copyright information.
-  * Added examples and doc to docs file.
   * Created watch file for rubygems files.
+  * Cdbsfied debian rules.
+  * Added patch to use ruby default CGI lib.
 
- -- Filipe Lautert <filipe at icewall.org>  Mon,  8 Jan 2007 15:55:15 -0200
+ -- Filipe Lautert <filipe at icewall.org>  Tue,  9 Jan 2007 14:16:59 -0200
 
 mongrel (0.3.13.4-1) experimental; urgency=low
 

Modified: packages-wip/mongrel/trunk/debian/control
===================================================================
--- packages-wip/mongrel/trunk/debian/control	2007-01-09 15:20:46 UTC (rev 1262)
+++ packages-wip/mongrel/trunk/debian/control	2007-01-09 16:23:42 UTC (rev 1263)
@@ -2,7 +2,8 @@
 Section: web
 Priority: optional
 Maintainer: Filipe Lautert <filipe at icewall.org>, Gunnar Wolf <gwolf at debian.org>, Jens Kraemer <jk at jkraemer.net>
-Build-Depends: debhelper (>= 4.0.0), ruby1.8 (>=1.8.4), ruby1.8-dev (>=1.8.4), dpatch
+Build-Depends: debhelper (>= 4.0.0), ruby1.8 (>=1.8.4), ruby1.8-dev (>=1.8.4), dpatch, cdbs
+Build-Depends-Indep: ruby-pkg-tools
 Build-Conflicts: gcc-3.3 (<< 1:3.3.2-0pre1)
 Standards-Version: 3.7.2
 

Modified: packages-wip/mongrel/trunk/debian/control.in
===================================================================
--- packages-wip/mongrel/trunk/debian/control.in	2007-01-09 15:20:46 UTC (rev 1262)
+++ packages-wip/mongrel/trunk/debian/control.in	2007-01-09 16:23:42 UTC (rev 1263)
@@ -3,13 +3,14 @@
 Priority: optional
 Maintainer: Filipe Lautert <filipe at icewall.org>, Gunnar Wolf <gwolf at debian.org>, Jens Kraemer <jk at jkraemer.net>
 Uploaders: @RUBY_EXTRAS_TEAM@
-Build-Depends: debhelper (>= 4.0.0), ruby1.8 (>=1.8.4), ruby1.8-dev (>=1.8.4), dpatch
+Build-Depends: debhelper (>= 4.0.0), ruby1.8 (>=1.8.4), ruby1.8-dev (>=1.8.4), dpatch, cdbs
+Build-Depends-Indep: ruby-pkg-tools
 Build-Conflicts: gcc-3.3 (<< 1:3.3.2-0pre1)
 Standards-Version: 3.7.2
 
 Package: mongrel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 (>=1.8.4), libgems-ruby1.8, libgemplugin-ruby1.8 (>=0.2.2)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 (>=1.8.4), libgems-ruby1.8, libgemplugin-ruby1.8 (>=0.2.2), 
 Recommends: rails
 Description: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps
  Mongrel is a fast HTTP library and server for Ruby that is intended

Modified: packages-wip/mongrel/trunk/debian/copyright
===================================================================
--- packages-wip/mongrel/trunk/debian/copyright	2007-01-09 15:20:46 UTC (rev 1262)
+++ packages-wip/mongrel/trunk/debian/copyright	2007-01-09 16:23:42 UTC (rev 1263)
@@ -7,6 +7,8 @@
 
 Upstream Author: Zed Shaw <zedshaw at zedshaw.com>
 
+On Debian systems, the full text of the GNU General Public License can be
+found at /usr/share/common-licenses/GPL.
 
 Copyright (c) 2006-2007 Zed Shaw <zedshaw at zedshaw.com>
 

Modified: packages-wip/mongrel/trunk/debian/docs
===================================================================
--- packages-wip/mongrel/trunk/debian/docs	2007-01-09 15:20:46 UTC (rev 1262)
+++ packages-wip/mongrel/trunk/debian/docs	2007-01-09 16:23:42 UTC (rev 1263)
@@ -1,3 +1 @@
 README
-doc/
-examples/

Modified: packages-wip/mongrel/trunk/debian/rules
===================================================================
--- packages-wip/mongrel/trunk/debian/rules	2007-01-09 15:20:46 UTC (rev 1262)
+++ packages-wip/mongrel/trunk/debian/rules	2007-01-09 16:23:42 UTC (rev 1263)
@@ -1,28 +1,14 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PACKAGE = mongrel
-BUILDDIR = $(CURDIR)/debian/$(PACKAGE)
-
-PREFIX = $(BUILDDIR)/usr
-CONFDIR = $(BUILDDIR)/etc/$(PACKAGE)
-SITERUBY = $(PREFIX)/lib/ruby
-SITEVER = $(BUILDDIR)/`ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]'`
-ARCHDIR = $(BUILDDIR)/`ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]'`
-
+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-setup-rb.mk
+include /usr/share/ruby-pkg-tools/1/rules/uploaders.mk
 
-config = --prefix=$(PREFIX) \
-	--sysconfdir=$(CONFDIR) \
-	--localstatedir=$(STATEDIR) \
-	--siteruby=$(SITERUBY) \
-	--siterubyver=$(SITEVER) \
-	--siterubyverarch=$(ARCHDIR)
-
 # Upstream distributes only "Ruby gems". What do we do? Just gzip the gem
 # and use it as our orig.tar.gz - A gem contains two files: metadata.gz
 # (a YAML package description for the Ruby Gems package system) and 
@@ -30,59 +16,29 @@
 # And why do we hide tar's STDERR? Well, our upstream author ships tarballs
 # made in December 1969 - tar complains too much, at every line. We can just
 # skip it (and enable it in case we think it is necessary)
-unpack: 
-	dh_testdir
+reverse-config::
 	tar xzf data.tar.gz 2>/dev/null
-	-rm -fr patch-stamp debian/patched/
 
-build: unpack patch
-	dh_testdir 
-	ruby1.8 setup.rb config $(config)
-	ruby1.8 setup.rb setup
-
 # Usually, we would run unpatch here. Sadly, setup.rb modifies bin/mongrel*,
 # replacing /usr/bin/ruby by /usr/bin/ruby1.8 (or something like that). Ok, so
 # we don't depend on unpatch for clean, but do remove all of its tracks: 
 # patch-stamp and debian/patched. Niiiiice.
-clean: 
-	dh_testdir
-	dh_testroot
-	dh_clean
-	[ ! -f setup.rb ] || ruby setup.rb clean
-	rm -rf $(BUILDDIR)
-	rm -rf bin doc examples ext lib test tools COPYING LICENSE \
-		README Rakefile setup.rb patch-stamp debian/patched/
+#clean::
+#	dh_testdir
+#	dh_testroot
+#	dh_clean
+#	[ ! -f setup.rb ] || ruby setup.rb clean
+#	rm -rf $(BUILDDIR)
+#	rm -rf bin doc examples ext lib test tools COPYING LICENSE \
+#		README Rakefile setup.rb patch-stamp debian/patched/
 
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	ruby1.8 setup.rb install 
-
+install::
 	-find $(CURDIR)/debian -type d | xargs \
 		rmdir -p --ignore-fail-on-non-empty
 
-binary-indep:;
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installinit
+build/mongrel::
 	dh_installman debian/mongrel_rails_service.1\
 		debian/mongrel_rails_svc.1\
 		debian/mongrel_rails.1\
 		debian/mongrel.1
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure


