[DRE-commits] r1315 - in packages-wip/libqt4-ruby/trunk/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2007-03-19 20:22:30 +0000 (Mon, 19 Mar 2007)
New Revision: 1315

Added:
   packages-wip/libqt4-ruby/trunk/debian/patches/01-fix-rpath.dpatch
Removed:
   packages-wip/libqt4-ruby/trunk/debian/control.in
Modified:
   packages-wip/libqt4-ruby/trunk/debian/changelog
   packages-wip/libqt4-ruby/trunk/debian/control
   packages-wip/libqt4-ruby/trunk/debian/patches/00list
   packages-wip/libqt4-ruby/trunk/debian/rules
Log:
libqt4-ruby: Putting 1.4.7 in a good shape

Modified: packages-wip/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/changelog	2007-03-16 23:29:43 UTC (rev 1314)
+++ packages-wip/libqt4-ruby/trunk/debian/changelog	2007-03-19 20:22:30 UTC (rev 1315)
@@ -1,4 +1,4 @@
-libqt4-ruby (1.4.7-1) UNRELEASED; urgency=low
+libqt4-ruby (1.4.7-1) unstable; urgency=low
 
   * Fix source package name to match Debian Ruby policy conventions
   * New upstream release with many bug fixes and enhancements
@@ -12,8 +12,12 @@
   * Wrote small manpages for both
   * Fix bug in QVariant translation frome QDate/QDateTime
   * Fixed 30-qt_enum that was breaking function lookup in certain cases.
+  * Removed the uploaders rule + using my shiny new address ;-) !
+  * Small improvements in the description.
+  * Fixed painful -rpath problem, using first suggestion on http://wiki.debian.org/RpathIssue
+  * lintian is finally silent, great !
 
- -- Vincent Fourmond <vincent.fourmond at 9online.fr>  Tue, 16 Jan 2007 12:00:00 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 19 Mar 2007 20:54:20 +0100
 
 qt4-qtruby (1.4.6-2) unstable; urgency=low
 

Modified: packages-wip/libqt4-ruby/trunk/debian/control
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/control	2007-03-16 23:29:43 UTC (rev 1314)
+++ packages-wip/libqt4-ruby/trunk/debian/control	2007-03-19 20:22:30 UTC (rev 1315)
@@ -1,9 +1,9 @@
 Source: libqt4-ruby
 Section: interpreters
 Priority: optional
-Maintainer: Vincent Fourmond <vincent.fourmond at 9online.fr>
+Maintainer: Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>= 5), autotools-dev, dpatch,
- libqt4-dev, automake, libtool, ruby1.8-dev, ruby, ruby1.8,
+ libqt4-dev, automake1.7, autoconf, libtool, ruby1.8-dev, ruby, ruby1.8,
  ruby-pkg-tools
 Standards-Version: 3.7.2
 
@@ -11,7 +11,7 @@
 Architecture: all
 Depends: libqt4-ruby1.8
 Description: ruby bindings for the Qt4 GUI library
- Ruby bindings for Qt4.
+ Smoke-based ruby bindings for Qt4, the Trolltech GUI library.
  .
  This is a dependency package to point to the current version
  of ruby.
@@ -21,7 +21,7 @@
 Depends: libsmokeqt4-1, ruby, ruby1.8, libruby1.8
 Conflicts: libqt0-ruby1.8
 Description: ruby bindings for the Qt4 GUI library
- Ruby bindings for Qt4.
+ Smoke-based ruby bindings for Qt4, the Trolltech GUI library.
  .
  Provides the bindings for ruby 1.8
 

Deleted: packages-wip/libqt4-ruby/trunk/debian/control.in
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/control.in	2007-03-16 23:29:43 UTC (rev 1314)
+++ packages-wip/libqt4-ruby/trunk/debian/control.in	2007-03-19 20:22:30 UTC (rev 1315)
@@ -1,46 +0,0 @@
-Source: libqt4-ruby
-Section: interpreters
-Priority: optional
-Maintainer: Vincent Fourmond <vincent.fourmond at 9online.fr>
-Build-Depends: debhelper (>= 5), autotools-dev, dpatch,
- libqt4-dev, automake1.7, libtool, ruby1.8-dev, ruby, ruby1.8,
- ruby-pkg-tools
-Uploaders: @RUBY_EXTRAS_TEAM@
-Standards-Version: 3.7.2
-
-Package: libqt4-ruby
-Architecture: all
-Depends: libqt4-ruby1.8
-Description: ruby bindings for the Qt4 GUI library
- Ruby bindings for Qt4.
- .
- This is a dependency package to point to the current version
- of ruby.
-
-Package: libqt4-ruby1.8
-Architecture: any
-Depends: libsmokeqt4-1, ruby, ruby1.8, libruby1.8
-Conflicts: libqt0-ruby1.8
-Description: ruby bindings for the Qt4 GUI library
- Ruby bindings for Qt4.
- .
- Provides the bindings for ruby 1.8
-
-Package: libsmokeqt4-1
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: smoke library for Qt4
- This is the smoke library for Qt4, on which bindings for different
- languages (ruby, python, perl...) can be based.
-
-Package: libsmokeqt4-dev
-Architecture: any
-Section: libdevel
-Depends: libsmokeqt4-1 (= ${Source-Version})
-Description: Smoke library for Qt4
- This is the Smoke library for Qt4, on which bindings for different
- languages (ruby, python, perl...) can be based. 
- .
- This package contains files needed for development with the
- Smoke Qt4 library.

Modified: packages-wip/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/00list	2007-03-16 23:29:43 UTC (rev 1314)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/00list	2007-03-19 20:22:30 UTC (rev 1315)
@@ -1,3 +1,4 @@
+01-fix-rpath
 02-qtruby-makefile
 # 10-kalyptus
 15-fix-install

Added: packages-wip/libqt4-ruby/trunk/debian/patches/01-fix-rpath.dpatch
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/01-fix-rpath.dpatch	2007-03-16 23:29:43 UTC (rev 1314)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/01-fix-rpath.dpatch	2007-03-19 20:22:30 UTC (rev 1315)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-fix-rpath.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix the -rpath problem for generated binaries.
+
+ at DPATCH@
+diff -urNad libqt4-ruby-1.4.7~/configure.in libqt4-ruby-1.4.7/configure.in
+--- libqt4-ruby-1.4.7~/configure.in	2006-10-30 18:09:06.000000000 +0100
++++ libqt4-ruby-1.4.7/configure.in	2007-03-19 20:44:52.000000000 +0100
+@@ -31,6 +31,15 @@
+ AC_ENABLE_STATIC(no)
+ KDE_PROG_LIBTOOL
+ 
++# by Marcelo Magallon <mmagallo at efis.ucr.ac.cr>
++# Turn around -rpath problem with libtool 1.0c
++# This define should be improbable enough to not conflict with anything
++AC_MSG_RESULT([Fixing libtool for -rpath problems.])
++sed < libtool > libtool-2 \
++'s/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
++mv libtool-2 libtool
++chmod 755 libtool
++
+ AC_PATH_QT()
+ AC_SUBST(all_includes)
+ AC_SUBST(all_libraries)


Property changes on: packages-wip/libqt4-ruby/trunk/debian/patches/01-fix-rpath.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages-wip/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/rules	2007-03-16 23:29:43 UTC (rev 1314)
+++ packages-wip/libqt4-ruby/trunk/debian/rules	2007-03-19 20:22:30 UTC (rev 1315)
@@ -14,7 +14,8 @@
 #export DH_VERBOSE=1
 
 # Include the uploader rule:
-include /usr/share/ruby-pkg-tools/1/rules/uploaders.mk
+# include /usr/share/ruby-pkg-tools/1/rules/uploaders.mk
+# not anymore !!
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
@@ -37,6 +38,8 @@
 	dh_testdir
 	aclocal-1.7
 	automake-1.7
+#	libtoolize -f
+	autoconf
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 # 	cd qtruby/rubylib/qtruby; touch Makefile.am; make Makefile;
 # 	touch $@