[DRE-commits] [SCM] ctioga2.git branch, master, updated. debian/0.2-2-3-ga57547d

[Vincent Fourmond]

The following commit has been merged in the master branch:
commit fec4d7d804c1889b454099ac4a860b6871e48eb4
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Tue Jun 7 20:55:36 2011 +0200

    Switch to the newer package names + move manual page installation to debhelper

diff --git a/debian/changelog b/debian/changelog
index f016150..7e8f427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ctioga2 (0.2-3) unstable; urgency=low
+
+  * Do not forget the Ruby-Versions field in the binary packages
+  * Update the (Build)?-Depend to the newer ruby-tioga package
+
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 07 Jun 2011 20:44:40 +0200
+
 ctioga2 (0.2-2) unstable; urgency=low
 
   * Switch to gem2deb
diff --git a/debian/control b/debian/control
index dc06ffb..88577b7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,10 @@ Section: graphics
 Priority: optional
 Maintainer: Vincent Fourmond <fourmond at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb, ruby1.8-dev, ruby1.8, 
-	       libtioga-ruby1.8, cdbs
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.4~), 
+               ruby1.8-dev, ruby1.8, 
+               ruby1.9.1-dev, ruby1.9.1, 
+	       ruby-tioga, cdbs
 Standards-Version: 3.9.2
 Homepage: http://ctioga2.rubyforge.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/ctioga2/
@@ -13,7 +15,8 @@ XS-Ruby-Versions: all
 
 Package: ctioga2
 Architecture: all
-Depends: libtioga-ruby1.8 (>= 1.13), ruby1.8, ${misc:Depends}
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ruby-tioga (>= 1.13), ruby | ruby-interpreter, ${misc:Depends}
 Description: polymorphic plotting program
  ctioga2 is a plotting program in the spirit of gnuplot. It can be
  used either directly on command-line or writing command files (or a
diff --git a/debian/ctioga2.manpages b/debian/ctioga2.manpages
new file mode 100644
index 0000000..de932c2
--- /dev/null
+++ b/debian/ctioga2.manpages
@@ -0,0 +1 @@
+man/ctioga2.1
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 76ba315..2f2e216 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,3 @@ include /usr/share/cdbs/1/rules/buildvars.mk
 override_dh_auto_build:
 	dh_auto_build
 	cd man; RUBYLIB=$(RUBYLIB):../lib ruby ../bin/ctioga2 --write-man "$(DEB_UPSTREAM_VERSION)" ctioga2.1.template > ctioga2.1
-
-override_dh_auto_install:
-	dh_auto_install
-	dh_installman -p ctioga2 man/ctioga2.1

-- 
ctioga2.git