[DRE-commits] r2248 - in packages/libqt4-ruby/trunk/debian: . patches
fourmond at alioth.debian.org
fourmond at alioth.debian.org
Tue Dec 11 22:54:56 UTC 2007
Author: fourmond
Date: 2007-12-11 22:54:56 +0000 (Tue, 11 Dec 2007)
New Revision: 2248
Added:
packages/libqt4-ruby/trunk/debian/patches/40-fix-gcc-snapshot.dpatch
Modified:
packages/libqt4-ruby/trunk/debian/changelog
packages/libqt4-ruby/trunk/debian/control
packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.postrm
packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.preinst
packages/libqt4-ruby/trunk/debian/patches/00list
Log:
[libqt4-ruby] Fix various annoying bugs
Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog 2007-12-11 22:42:48 UTC (rev 2247)
+++ packages/libqt4-ruby/trunk/debian/changelog 2007-12-11 22:54:56 UTC (rev 2248)
@@ -1,8 +1,11 @@
-libqt4-ruby (1.4.9-7) UNRELEASED; urgency=low
+libqt4-ruby (1.4.9-7) unstable; urgency=low
- * NOT RELEASED YET
+ * Removed the --rename option of dpkg-divert, as it causes problems
+ with upgrades from etch (Closes: #455122)
+ * 40-fix-gcc-snapshot to make gcc 4.3 happy (Closes: #455665)
+ * Bumped Standards-Version to 3.7.3; no changes required
- -- Vincent Fourmond <fourmond at debian.org> Sun, 28 Oct 2007 10:56:36 +0100
+ -- Vincent Fourmond <fourmond at debian.org> Tue, 11 Dec 2007 23:54:00 +0100
libqt4-ruby (1.4.9-6) unstable; urgency=low
Modified: packages/libqt4-ruby/trunk/debian/control
===================================================================
--- packages/libqt4-ruby/trunk/debian/control 2007-12-11 22:42:48 UTC (rev 2247)
+++ packages/libqt4-ruby/trunk/debian/control 2007-12-11 22:54:56 UTC (rev 2248)
@@ -5,7 +5,7 @@
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5), dpatch,
libqt4-dev (>= 4.3), ruby1.8-dev, ruby, ruby1.8, cmake (> 2.4.7)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://developer.kde.org/language-bindings/ruby/index.html
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/packages/libqt4-ruby/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libqt4-ruby/
Modified: packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.postrm
===================================================================
--- packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.postrm 2007-12-11 22:42:48 UTC (rev 2247)
+++ packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.postrm 2007-12-11 22:54:56 UTC (rev 2248)
@@ -20,11 +20,10 @@
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
+ dpkg-divert --package libqt4-ruby1.8 \
+ --remove /usr/bin/rbqtapi
+ dpkg-divert --package libqt4-ruby1.8 \
+ --remove /usr/share/man/man1/rbqtapi.1.gz
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
Modified: packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.preinst
===================================================================
--- packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.preinst 2007-12-11 22:42:48 UTC (rev 2247)
+++ packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.preinst 2007-12-11 22:54:56 UTC (rev 2248)
@@ -16,9 +16,9 @@
install|upgrade)
# Set up the diversions of rbqtapi and rbqtapi.1.gz
- dpkg-divert --add --rename --package libqt4-ruby1.8 \
+ dpkg-divert --add --package libqt4-ruby1.8 \
--divert /usr/bin/rbqtapi.qt3 /usr/bin/rbqtapi
- dpkg-divert --add --rename --package libqt4-ruby1.8 \
+ dpkg-divert --add --package libqt4-ruby1.8 \
--divert /usr/share/man/man1/rbqtapi.qt3.1.gz \
/usr/share/man/man1/rbqtapi.1.gz
;;
Modified: packages/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/00list 2007-12-11 22:42:48 UTC (rev 2247)
+++ packages/libqt4-ruby/trunk/debian/patches/00list 2007-12-11 22:54:56 UTC (rev 2248)
@@ -7,6 +7,7 @@
25-fix-hppa-build
28-optimization
30-qt_enum
+40-fix-gcc-snapshot
# 31-constants-warning
97-soname
99-smoke-qt4
Added: packages/libqt4-ruby/trunk/debian/patches/40-fix-gcc-snapshot.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/40-fix-gcc-snapshot.dpatch (rev 0)
+++ packages/libqt4-ruby/trunk/debian/patches/40-fix-gcc-snapshot.dpatch 2007-12-11 22:54:56 UTC (rev 2248)
@@ -0,0 +1,401 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-fix-gcc-snapshot.dpatch by <fourmond at debian.org>
+##
+## DP: Fix the gcc-snapshot error message:
+## DP: error: explicit template specialization cannot have a storage class
+
+ at DPATCH@
+diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_basetypes.h libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_basetypes.h
+--- libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_basetypes.h 2007-04-12 19:04:54.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_basetypes.h 2007-12-11 23:09:45.000000000 +0100
+@@ -26,14 +26,14 @@
+ template <class T> VALUE primitive_to_ruby(T);
+
+ template <class T>
+-static void marshall_from_ruby(Marshall *m)
++void marshall_from_ruby(Marshall *m)
+ {
+ VALUE obj = *(m->var());
+ (*smoke_ptr<T>(m)) = ruby_to_primitive<T>(obj);
+ }
+
+ template <class T>
+-static void marshall_to_ruby(Marshall *m)
++void marshall_to_ruby(Marshall *m)
+ {
+ *(m->var()) = primitive_to_ruby<T>( *smoke_ptr<T>(m) );
+ }
+@@ -44,13 +44,13 @@
+ // Special case marshallers
+
+ template <>
+-static void marshall_from_ruby<char *>(Marshall *m)
++void marshall_from_ruby<char *>(Marshall *m)
+ {
+ m->item().s_voidp = ruby_to_primitive<char*>(*(m->var()));
+ }
+
+ template <>
+-static void marshall_from_ruby<SmokeEnumWrapper>(Marshall *m)
++void marshall_from_ruby<SmokeEnumWrapper>(Marshall *m)
+ {
+ VALUE v = *(m->var());
+
+@@ -65,7 +65,7 @@
+ }
+
+ template <>
+-static void marshall_to_ruby<SmokeEnumWrapper>(Marshall *m)
++void marshall_to_ruby<SmokeEnumWrapper>(Marshall *m)
+ {
+ long val = m->item().s_enum;
+ *(m->var()) = rb_funcall(qt_internal_module, rb_intern("create_qenum"),
+@@ -73,7 +73,7 @@
+ }
+
+ template <>
+-static void marshall_from_ruby<SmokeClassWrapper>(Marshall *m)
++void marshall_from_ruby<SmokeClassWrapper>(Marshall *m)
+ {
+ VALUE v = *(m->var());
+
+@@ -119,7 +119,7 @@
+ }
+
+ template <>
+-static void marshall_to_ruby<SmokeClassWrapper>(Marshall *m)
++void marshall_to_ruby<SmokeClassWrapper>(Marshall *m)
+ {
+ if(m->item().s_voidp == 0) {
+ *(m->var()) = Qnil;
+@@ -164,7 +164,7 @@
+ }
+
+ template <>
+-static void marshall_to_ruby<char *>(Marshall *m)
++void marshall_to_ruby<char *>(Marshall *m)
+ {
+ char *sv = (char*)m->item().s_voidp;
+ VALUE obj;
+@@ -180,7 +180,7 @@
+ }
+
+ template <>
+-static void marshall_to_ruby<unsigned char *>(Marshall *m)
++void marshall_to_ruby<unsigned char *>(Marshall *m)
+ {
+ m->unsupported();
+ }
+diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_complex.h libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_complex.h
+--- libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_complex.h 2007-04-12 19:04:54.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_complex.h 2007-12-11 23:09:45.000000000 +0100
+@@ -8,7 +8,7 @@
+ ***************************************************************************/
+
+ template <>
+-static void marshall_from_ruby<long long>(Marshall *m)
++void marshall_from_ruby<long long>(Marshall *m)
+ {
+ VALUE obj = *(m->var());
+ m->item().s_voidp = new long long;
+@@ -22,7 +22,7 @@
+ }
+
+ template <>
+-static void marshall_from_ruby<unsigned long long>(Marshall *m)
++void marshall_from_ruby<unsigned long long>(Marshall *m)
+ {
+ VALUE obj = *(m->var());
+ m->item().s_voidp = new unsigned long long;
+@@ -36,7 +36,7 @@
+ }
+
+ template <>
+-static void marshall_from_ruby<int *>(Marshall *m)
++void marshall_from_ruby<int *>(Marshall *m)
+ {
+ VALUE rv = *(m->var());
+ int *i = new int;
+@@ -63,7 +63,7 @@
+ }
+
+ template <>
+-static void marshall_to_ruby<int *>(Marshall *m)
++void marshall_to_ruby<int *>(Marshall *m)
+ {
+ int *ip = (int*)m->item().s_voidp;
+ VALUE rv = *(m->var());
+@@ -79,7 +79,7 @@
+ }
+
+ template <>
+-static void marshall_from_ruby<bool *>(Marshall *m)
++void marshall_from_ruby<bool *>(Marshall *m)
+ {
+ VALUE rv = *(m->var());
+ bool * b = new bool;
+@@ -103,7 +103,7 @@
+ }
+
+ template <>
+-static void marshall_to_ruby<bool *>(Marshall *m)
++void marshall_to_ruby<bool *>(Marshall *m)
+ {
+ bool *ip = (bool*)m->item().s_voidp;
+ if(!ip) {
+diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_primitives.h libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_primitives.h
+--- libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_primitives.h 2007-04-12 19:04:54.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_primitives.h 2007-12-11 23:09:45.000000000 +0100
+@@ -8,7 +8,7 @@
+ ***************************************************************************/
+
+ template <>
+-static bool ruby_to_primitive<bool>(VALUE v)
++bool ruby_to_primitive<bool>(VALUE v)
+ {
+ if (TYPE(v) == T_OBJECT) {
+ // A Qt::Boolean has been passed as a value
+@@ -20,61 +20,61 @@
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<bool>(bool sv)
++ VALUE primitive_to_ruby<bool>(bool sv)
+ {
+ return sv ? Qtrue : Qfalse;
+ }
+
+ template <>
+-static signed char ruby_to_primitive<signed char>(VALUE v)
++ signed char ruby_to_primitive<signed char>(VALUE v)
+ {
+ return NUM2CHR(v);
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<signed char>(signed char sv)
++ VALUE primitive_to_ruby<signed char>(signed char sv)
+ {
+ return CHR2FIX(sv);
+ }
+
+ template <>
+-static unsigned char ruby_to_primitive<unsigned char>(VALUE v)
++ unsigned char ruby_to_primitive<unsigned char>(VALUE v)
+ {
+ return NUM2CHR(v);
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<unsigned char>(unsigned char sv)
++ VALUE primitive_to_ruby<unsigned char>(unsigned char sv)
+ {
+ return CHR2FIX(sv);
+ }
+
+ template <>
+-static short ruby_to_primitive<short>(VALUE v)
++ short ruby_to_primitive<short>(VALUE v)
+ {
+ return (short)NUM2INT(v);
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<short>(short sv)
++ VALUE primitive_to_ruby<short>(short sv)
+ {
+ return INT2NUM(sv);
+ }
+
+ template <>
+-static unsigned short ruby_to_primitive<unsigned short>(VALUE v)
++ unsigned short ruby_to_primitive<unsigned short>(VALUE v)
+ {
+ return (unsigned short)NUM2UINT(v);
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<unsigned short>(unsigned short sv)
++ VALUE primitive_to_ruby<unsigned short>(unsigned short sv)
+ {
+ return UINT2NUM((unsigned int) sv);
+ }
+
+ template <>
+-static int ruby_to_primitive<int>(VALUE v)
++ int ruby_to_primitive<int>(VALUE v)
+ {
+ if (TYPE(v) == T_OBJECT) {
+ return (int)NUM2INT(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, v));
+@@ -84,13 +84,13 @@
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<int>(int sv)
++ VALUE primitive_to_ruby<int>(int sv)
+ {
+ return INT2NUM(sv);
+ }
+
+ template <>
+-static unsigned int ruby_to_primitive<unsigned int>(VALUE v)
++ unsigned int ruby_to_primitive<unsigned int>(VALUE v)
+ {
+ if (TYPE(v) == T_OBJECT) {
+ return (unsigned int) NUM2UINT(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, v));
+@@ -100,13 +100,13 @@
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<unsigned int>(unsigned int sv)
++ VALUE primitive_to_ruby<unsigned int>(unsigned int sv)
+ {
+ return UINT2NUM(sv);
+ }
+
+ template <>
+-static long ruby_to_primitive<long>(VALUE v)
++ long ruby_to_primitive<long>(VALUE v)
+ {
+ if (TYPE(v) == T_OBJECT) {
+ return (long) NUM2LONG(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, v));
+@@ -116,13 +116,13 @@
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<long>(long sv)
++ VALUE primitive_to_ruby<long>(long sv)
+ {
+ return INT2NUM(sv);
+ }
+
+ template <>
+-static unsigned long ruby_to_primitive<unsigned long>(VALUE v)
++ unsigned long ruby_to_primitive<unsigned long>(VALUE v)
+ {
+ if (TYPE(v) == T_OBJECT) {
+ return (unsigned long) NUM2ULONG(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, v));
+@@ -132,61 +132,61 @@
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<unsigned long>(unsigned long sv)
++ VALUE primitive_to_ruby<unsigned long>(unsigned long sv)
+ {
+ return INT2NUM(sv);
+ }
+
+ template <>
+-static long long ruby_to_primitive<long long>(VALUE v)
++ long long ruby_to_primitive<long long>(VALUE v)
+ {
+ return NUM2LL(v);
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<long long>(long long sv)
++ VALUE primitive_to_ruby<long long>(long long sv)
+ {
+ return LL2NUM(sv);
+ }
+
+ template <>
+-static unsigned long long ruby_to_primitive<unsigned long long>(VALUE v)
++ unsigned long long ruby_to_primitive<unsigned long long>(VALUE v)
+ {
+ return rb_num2ull(v);
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<unsigned long long>(unsigned long long sv)
++ VALUE primitive_to_ruby<unsigned long long>(unsigned long long sv)
+ {
+ return rb_ull2inum(sv);
+ }
+
+ template <>
+-static float ruby_to_primitive<float>(VALUE v)
++ float ruby_to_primitive<float>(VALUE v)
+ {
+ return (float) NUM2DBL(v);
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<float>(float sv)
++ VALUE primitive_to_ruby<float>(float sv)
+ {
+ return rb_float_new((double) sv);
+ }
+
+ template <>
+-static double ruby_to_primitive<double>(VALUE v)
++ double ruby_to_primitive<double>(VALUE v)
+ {
+ return (double) NUM2DBL(v);
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<double>(double sv)
++ VALUE primitive_to_ruby<double>(double sv)
+ {
+ return rb_float_new((double) sv);
+ }
+
+ template <>
+-static char* ruby_to_primitive<char *>(VALUE rv)
++ char* ruby_to_primitive<char *>(VALUE rv)
+ {
+ if(rv == Qnil)
+ return 0;
+@@ -195,7 +195,7 @@
+ }
+
+ template <>
+-static unsigned char* ruby_to_primitive<unsigned char *>(VALUE rv)
++ unsigned char* ruby_to_primitive<unsigned char *>(VALUE rv)
+ {
+ if(rv == Qnil)
+ return 0;
+@@ -208,7 +208,7 @@
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<int*>(int* sv)
++ VALUE primitive_to_ruby<int*>(int* sv)
+ {
+ if(!sv) {
+ return Qnil;
+@@ -219,7 +219,7 @@
+
+ #if defined(Q_OS_WIN32)
+ template <>
+-static WId ruby_to_primitive<WId>(VALUE v)
++ WId ruby_to_primitive<WId>(VALUE v)
+ {
+ if(v == Qnil)
+ return 0;
+@@ -228,13 +228,13 @@
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<WId>(WId sv)
++ VALUE primitive_to_ruby<WId>(WId sv)
+ {
+ return ULONG2NUM((unsigned long) sv);
+ }
+
+ template <>
+-static Q_PID ruby_to_primitive<Q_PID>(VALUE v)
++ Q_PID ruby_to_primitive<Q_PID>(VALUE v)
+ {
+ if(v == Qnil)
+ return 0;
+@@ -243,7 +243,7 @@
+ }
+
+ template <>
+-static VALUE primitive_to_ruby<Q_PID>(Q_PID sv)
++ VALUE primitive_to_ruby<Q_PID>(Q_PID sv)
+ {
+ return ULONG2NUM((unsigned long) sv);
+ }
Property changes on: packages/libqt4-ruby/trunk/debian/patches/40-fix-gcc-snapshot.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-ruby-extras-commits
mailing list