[DRE-commits] r6014 - trunk/libtioga-ruby/debian

Vincent Fourmond fourmond at alioth.debian.org
Mon Jan 24 20:41:33 UTC 2011


Author: fourmond
Date: 2011-01-24 20:41:31 +0000 (Mon, 24 Jan 2011)
New Revision: 6014

Added:
   trunk/libtioga-ruby/debian/libtioga-ruby1.8.postinst
   trunk/libtioga-ruby/debian/libtioga-ruby1.8.prerm
   trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.postinst
   trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.prerm
   trunk/libtioga-ruby/debian/tioga-1.8.1
   trunk/libtioga-ruby/debian/tioga-1.9.1.1
Modified:
   trunk/libtioga-ruby/debian/changelog
   trunk/libtioga-ruby/debian/control
   trunk/libtioga-ruby/debian/libtioga-ruby1.8.manpages
   trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.manpages
   trunk/libtioga-ruby/debian/rules
Log:
[libtioga-ruby] Have versions for both Rubys coexist in peace

Modified: trunk/libtioga-ruby/debian/changelog
===================================================================
--- trunk/libtioga-ruby/debian/changelog	2011-01-24 19:32:32 UTC (rev 6013)
+++ trunk/libtioga-ruby/debian/changelog	2011-01-24 20:41:31 UTC (rev 6014)
@@ -1,3 +1,12 @@
+libtioga-ruby (1.13-2) experimental; urgency=low
+
+  * Rename tioga as tioga-1.8 and tioga-1.9.1 to avoid conflicts
+  * Use alternatives to provide /usr/bin/tioga and the corresponding man
+    page
+  * Drop recommends on rdoc + move irb to suggests
+
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 24 Jan 2011 21:36:06 +0100
+
 libtioga-ruby (1.13-1) experimental; urgency=low
 
   * New upstream release

Modified: trunk/libtioga-ruby/debian/control
===================================================================
--- trunk/libtioga-ruby/debian/control	2011-01-24 19:32:32 UTC (rev 6013)
+++ trunk/libtioga-ruby/debian/control	2011-01-24 20:41:31 UTC (rev 6014)
@@ -14,7 +14,6 @@
 Package: tioga
 Architecture: all
 Depends: libtioga-ruby, ${misc:Depends}
-Recommends: irb1.8, rdoc1.8
 Description: Ruby library for scientific graphs [transition package]
  Tioga is a blend of PDF, pdfTex and ruby into a library to make
  scientific graphs of high quality. It is fairly complete and 
@@ -31,8 +30,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8, 
  texlive-latex-base | tetex-bin
 Replaces: tioga
-Suggests: libtioga-ruby-doc, xpdf | pdf-viewer
-Recommends: irb1.8, rdoc1.8
+Suggests: libtioga-ruby-doc, xpdf | pdf-viewer, irb1.8
 Description: Ruby library for scientific graphs
  Tioga is a blend of PDF, pdfTex and ruby into a library to make
  scientific graphs of high quality. It is fairly complete and 
@@ -51,8 +49,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.9.1, 
  texlive-latex-base | tetex-bin
 Replaces: tioga
-Suggests: libtioga-ruby-doc, xpdf | pdf-viewer
-Recommends: irb1.8, rdoc1.8
+Suggests: libtioga-ruby-doc, xpdf | pdf-viewer, irb1.9.1
 Description: Ruby library for scientific graphs
  Tioga is a blend of PDF, pdfTex and ruby into a library to make
  scientific graphs of high quality. It is fairly complete and 

Modified: trunk/libtioga-ruby/debian/libtioga-ruby1.8.manpages
===================================================================
--- trunk/libtioga-ruby/debian/libtioga-ruby1.8.manpages	2011-01-24 19:32:32 UTC (rev 6013)
+++ trunk/libtioga-ruby/debian/libtioga-ruby1.8.manpages	2011-01-24 20:41:31 UTC (rev 6014)
@@ -1 +1 @@
-debian/tioga.1
\ No newline at end of file
+debian/tioga-1.8.1
\ No newline at end of file

Added: trunk/libtioga-ruby/debian/libtioga-ruby1.8.postinst
===================================================================
--- trunk/libtioga-ruby/debian/libtioga-ruby1.8.postinst	                        (rev 0)
+++ trunk/libtioga-ruby/debian/libtioga-ruby1.8.postinst	2011-01-24 20:41:31 UTC (rev 6014)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e 
+
+if [ "$1" = "configure" ]
+then
+  update-alternatives --install /usr/bin/tioga tioga /usr/bin/tioga-1.8 30 \
+      --slave /usr/share/man/man1/tioga.1.gz tioga.1.gz /usr/share/man/man1/tioga-1.8.1.gz
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#

Added: trunk/libtioga-ruby/debian/libtioga-ruby1.8.prerm
===================================================================
--- trunk/libtioga-ruby/debian/libtioga-ruby1.8.prerm	                        (rev 0)
+++ trunk/libtioga-ruby/debian/libtioga-ruby1.8.prerm	2011-01-24 20:41:31 UTC (rev 6014)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e 
+
+if [ "$1" = "remove" ]
+then
+  update-alternatives --remove tioga /usr/bin/tioga-1.8
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#

Modified: trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.manpages
===================================================================
--- trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.manpages	2011-01-24 19:32:32 UTC (rev 6013)
+++ trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.manpages	2011-01-24 20:41:31 UTC (rev 6014)
@@ -1 +1 @@
-debian/tioga.1
\ No newline at end of file
+debian/tioga-1.9.1.1
\ No newline at end of file

Added: trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.postinst
===================================================================
--- trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.postinst	                        (rev 0)
+++ trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.postinst	2011-01-24 20:41:31 UTC (rev 6014)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e 
+
+if [ "$1" = "configure" ]
+then
+  update-alternatives --install /usr/bin/tioga tioga /usr/bin/tioga-1.9.1 10 \
+      --slave /usr/share/man/man1/tioga.1.gz tioga.1.gz /usr/share/man/man1/tioga-1.9.1.gz
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#

Added: trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.prerm
===================================================================
--- trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.prerm	                        (rev 0)
+++ trunk/libtioga-ruby/debian/libtioga-ruby1.9.1.prerm	2011-01-24 20:41:31 UTC (rev 6014)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e 
+
+if [ "$1" = "remove" ]
+then
+  update-alternatives --remove tioga /usr/bin/tioga-1.9.1
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#

Modified: trunk/libtioga-ruby/debian/rules
===================================================================
--- trunk/libtioga-ruby/debian/rules	2011-01-24 19:32:32 UTC (rev 6013)
+++ trunk/libtioga-ruby/debian/rules	2011-01-24 20:41:31 UTC (rev 6014)
@@ -9,3 +9,15 @@
 	rm -rf rdoc-tmp
 	dh_install -plibtioga-ruby-doc images usr/share/doc/libtioga-ruby-doc/rdoc/
 
+bin_renames = tioga irb_tioga
+# rename tioga versions
+binary-install/libtioga-ruby1.8::
+	for f in $(bin_renames); do \
+		mv debian/libtioga-ruby1.8/usr/bin/$$f debian/libtioga-ruby1.8/usr/bin/$$f-1.8; \
+	done
+
+binary-install/libtioga-ruby1.9.1::
+	for f in $(bin_renames); do \
+		mv debian/libtioga-ruby1.9.1/usr/bin/$$f debian/libtioga-ruby1.9.1/usr/bin/$$f-1.9.1; \
+	done
+

Added: trunk/libtioga-ruby/debian/tioga-1.8.1
===================================================================
--- trunk/libtioga-ruby/debian/tioga-1.8.1	                        (rev 0)
+++ trunk/libtioga-ruby/debian/tioga-1.8.1	2011-01-24 20:41:31 UTC (rev 6014)
@@ -0,0 +1 @@
+link tioga.1
\ No newline at end of file


Property changes on: trunk/libtioga-ruby/debian/tioga-1.8.1
___________________________________________________________________
Added: svn:special
   + *

Added: trunk/libtioga-ruby/debian/tioga-1.9.1.1
===================================================================
--- trunk/libtioga-ruby/debian/tioga-1.9.1.1	                        (rev 0)
+++ trunk/libtioga-ruby/debian/tioga-1.9.1.1	2011-01-24 20:41:31 UTC (rev 6014)
@@ -0,0 +1 @@
+link tioga.1
\ No newline at end of file


Property changes on: trunk/libtioga-ruby/debian/tioga-1.9.1.1
___________________________________________________________________
Added: svn:special
   + *




More information about the Pkg-ruby-extras-commits mailing list