[DRE-commits] r1516 - packages/libqt4-ruby/trunk/debian
Vincent Fourmond
fourmond at alioth.debian.org
Thu May 3 21:51:06 UTC 2007
Author: fourmond
Date: 2007-05-03 21:51:05 +0000 (Thu, 03 May 2007)
New Revision: 1516
Added:
packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.postrm
packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.preinst
packages/libqt4-ruby/trunk/debian/qt4rubyinit.1
Removed:
packages/libqt4-ruby/trunk/debian/qtrubyinit.1
Modified:
packages/libqt4-ruby/trunk/debian/NEWS
packages/libqt4-ruby/trunk/debian/changelog
packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages
packages/libqt4-ruby/trunk/debian/rules
Log:
Fix last remnants of conflict with libqt0-ruby1.8
Modified: packages/libqt4-ruby/trunk/debian/NEWS
===================================================================
--- packages/libqt4-ruby/trunk/debian/NEWS 2007-05-02 19:29:11 UTC (rev 1515)
+++ packages/libqt4-ruby/trunk/debian/NEWS 2007-05-03 21:51:05 UTC (rev 1516)
@@ -1,15 +1,24 @@
+libqt4-ruby (1.4.7-3) unstable; urgency=low
+
+ qtrubyinit has been renamed to qt4rubyinit to avoid conflicts
+ with libqt0-ruby1.8, as the binary provided there preloads
+ the Qt3 libraries. It might cause problems, although I think it
+ should only decrease speed.
+
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 03 May 2007 22:17:58 +0200
+
libqt4-ruby (1.4.7-2) unstable; urgency=low
-The transition Qt.rb file has been removed to allow side by side
-installation of Qt3 and Qt4 ruby bindings. Please update all code
-using Qt.rb to now use Qt4.rb.
+ The transition Qt.rb file has been removed to allow side by side
+ installation of Qt3 and Qt4 ruby bindings. Please update all code
+ using Qt.rb to now use Qt4.rb.
-- Vincent Fourmond <fourmond at debian.org> Wed, 02 May 2007 20:23:21 +0200
libqt4-ruby (1.4.7-1) unstable; urgency=low
-For compatibility with the Qt3 extension, upstream has renamed
-Qt.rb Qt4.rb. A transition Qt.rb is provided, but you are strongly
-encouraged to migrate old code.
+ For compatibility with the Qt3 extension, upstream has renamed
+ Qt.rb Qt4.rb. A transition Qt.rb is provided, but you are strongly
+ encouraged to migrate old code.
-- Vincent Fourmond <vincent.fourmond at 9online.fr> Mon, 1 Jan 2007 18:21:58 +0100
Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog 2007-05-02 19:29:11 UTC (rev 1515)
+++ packages/libqt4-ruby/trunk/debian/changelog 2007-05-03 21:51:05 UTC (rev 1516)
@@ -1,8 +1,10 @@
-libqt4-ruby (1.4.7-3) UNRELEASED; urgency=low
+libqt4-ruby (1.4.7-3) unstable; urgency=low
- * NOT RELEASED YET
+ * Add diversions of usr/bin/rbqtapi and usr/share/man/man1/rbqtapi.1.gz
+ to really remove the conflict with libqt0-ruby1.8
+ * Renamed qtrubyinit to qt4rubyinit to avoid conflict with libqt0-ruby1.8
- -- Vincent Fourmond <fourmond at debian.org> Wed, 02 May 2007 21:28:53 +0200
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 03 May 2007 22:43:20 +0200
libqt4-ruby (1.4.7-2) unstable; urgency=low
Modified: packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages
===================================================================
--- packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages 2007-05-02 19:29:11 UTC (rev 1515)
+++ packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages 2007-05-03 21:51:05 UTC (rev 1516)
@@ -1,4 +1,4 @@
debian/rbqtapi.1
-debian/qtrubyinit.1
+debian/qt4rubyinit.1
debian/rbuic4.1
-debian/rbrcc.1
\ No newline at end of file
+debian/rbrcc.1
Added: packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.postrm
===================================================================
--- packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.postrm 2007-05-02 19:29:11 UTC (rev 1515)
+++ packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.postrm 2007-05-03 21:51:05 UTC (rev 1516)
@@ -0,0 +1,41 @@
+#! /bin/sh
+# preinst script for libqt4-ruby1.8
+#
+# see: dh_installdeb(1)
+set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/share/doc/packaging-manual/
+
+
+case "$1" in
+ remove|purge)
+
+ # Removing diversions of rbqtapi and rbqtapi.1.gz
+ dpkg-divert --remove --rename --package libqt4-ruby1.8 \
+ --divert /usr/bin/rbqtapi.qt3 /usr/bin/rbqtapi
+ dpkg-divert --remove --rename --package libqt4-ruby1.8 \
+ --divert /usr/share/man/man1/rbqtapi.qt3.1.gz \
+ /usr/share/man/man1/rbqtapi.1.gz
+ ;;
+
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+# Inclusion of debhelper stuff
+#DEBHELPER#
\ No newline at end of file
Added: packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.preinst
===================================================================
--- packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.preinst 2007-05-02 19:29:11 UTC (rev 1515)
+++ packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.preinst 2007-05-03 21:51:05 UTC (rev 1516)
@@ -0,0 +1,36 @@
+#! /bin/sh
+# preinst script for libqt4-ruby1.8
+#
+# see: dh_installdeb(1)
+set -e
+
+# summary of how this script can be called:
+# * <new-preinst> `install'
+# * <new-preinst> `install' <old-version>
+# * <new-preinst> `upgrade' <old-version>
+# * <old-preinst> `abort-upgrade' <new-version>
+#
+# For details see /usr/share/doc/packaging-manual/
+
+case "$1" in
+ install|upgrade)
+
+ # Set up the diversions of rbqtapi and rbqtapi.1.gz
+ dpkg-divert --add --rename --package libqt4-ruby1.8 \
+ --divert /usr/bin/rbqtapi.qt3 /usr/bin/rbqtapi
+ dpkg-divert --add --rename --package libqt4-ruby1.8 \
+ --divert /usr/share/man/man1/rbqtapi.qt3.1.gz \
+ /usr/share/man/man1/rbqtapi.1.gz
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+# Inclusion of debhelper stuff
+#DEBHELPER#
\ No newline at end of file
Copied: packages/libqt4-ruby/trunk/debian/qt4rubyinit.1 (from rev 1318, packages/libqt4-ruby/trunk/debian/qtrubyinit.1)
===================================================================
--- packages/libqt4-ruby/trunk/debian/qtrubyinit.1 2007-03-19 20:24:28 UTC (rev 1318)
+++ packages/libqt4-ruby/trunk/debian/qt4rubyinit.1 2007-05-03 21:51:05 UTC (rev 1516)
@@ -0,0 +1,28 @@
+.TH QTRUBYINIT "1" "October 2006" "Qt4-qtruby version 1.4.7"
+.SH NAME
+qt4rubyinit \- a preload tool for Qt4/Ruby scripts
+
+.SH SYNOPSIS
+.B qt4rubyinit
+.I [ruby arguments]
+
+
+.SH DESCRIPTION
+
+.B qt4rubyinit
+is a thin wrapper around
+.IR ruby (1)
+that loads all the necessary libraries to speed up a little the
+loading of Qt4/Ruby scripts. It gives its command-line to a ruby
+interpreter, so it takes exactly the same command-line as
+.IR ruby (1).
+
+.SH "SEE ALSO"
+.BR ruby (1)
+
+.SH AUTHOR
+.B rbqtapi
+was written by Alexander Kellett.
+
+This manual page was written by Vincent
+Fourmond for the Debian project, but may be used by others.
Deleted: packages/libqt4-ruby/trunk/debian/qtrubyinit.1
===================================================================
--- packages/libqt4-ruby/trunk/debian/qtrubyinit.1 2007-05-02 19:29:11 UTC (rev 1515)
+++ packages/libqt4-ruby/trunk/debian/qtrubyinit.1 2007-05-03 21:51:05 UTC (rev 1516)
@@ -1,28 +0,0 @@
-.TH QTRUBYINIT "1" "October 2006" "Qt4-qtruby version 1.4.6"
-.SH NAME
-qtrubyinit \- a preload tool for qtruby scripts
-
-.SH SYNOPSIS
-.B qtrubyinit
-.I [ruby arguments]
-
-
-.SH DESCRIPTION
-
-.B qtrubyinit
-is a thin wrapper around
-.IR ruby (1)
-that loads all the necessary libraries to speed up a little the
-loading of Qtruby scripts. It gives its command-line to a ruby
-interpreter, so it takes exactly the same command-line as
-.IR ruby (1).
-
-.SH "SEE ALSO"
-.BR ruby (1)
-
-.SH AUTHOR
-.B rbqtapi
-was written by Alexander Kellett.
-
-This manual page was written by Vincent
-Fourmond for the Debian project, but may be used by others.
Modified: packages/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages/libqt4-ruby/trunk/debian/rules 2007-05-02 19:29:11 UTC (rev 1515)
+++ packages/libqt4-ruby/trunk/debian/rules 2007-05-03 21:51:05 UTC (rev 1516)
@@ -118,7 +118,7 @@
cd qtruby/rubylib/designer/rbuic; $(MAKE) install DESTDIR=$(CURDIR)/debian/libqt4-ruby1.8
# Remove rbqtsh as it fails for now
- cd $(CURDIR)/debian/libqt4-ruby1.8/usr/bin; rm -f rbqtsh
+ cd $(CURDIR)/debian/libqt4-ruby1.8/usr/bin; rm -f rbqtsh; mv qtrubyinit qt4rubyinit
cd $(CURDIR)/debian/libqt4-ruby1.8/$(ARCHDIR); rm *.la *.so *.so.0; mv *.so.* qtruby4.so
dh_install -s
# Must not depend on anything. This is to be called by
More information about the Pkg-ruby-extras-commits
mailing list