[DRE-commits] r3856 - in packages/libxslt-ruby/trunk/debian: . patches

Thu Jul 30 14:58:14 UTC 2009

Author: michi-guest
Date: 2009-07-30 14:58:13 +0000 (Thu, 30 Jul 2009)
New Revision: 3856

Added:
   packages/libxslt-ruby/trunk/debian/README.source
Modified:
   packages/libxslt-ruby/trunk/debian/changelog
   packages/libxslt-ruby/trunk/debian/compat
   packages/libxslt-ruby/trunk/debian/control
   packages/libxslt-ruby/trunk/debian/copyright
   packages/libxslt-ruby/trunk/debian/patches/001-configure_extconf_rb.patch
Log:
[libxslt-ruby] Fix #521991 FTBFS and update some packaging stuff


Added: packages/libxslt-ruby/trunk/debian/README.source
===================================================================

--- packages/libxslt-ruby/trunk/debian/README.source	                        (rev 0)
+++ packages/libxslt-ruby/trunk/debian/README.source	2009-07-30 14:58:13 UTC (rev 3856)
@@ -0,0 +1,39 @@
+This package uses CDBS (and therefore simple-patchsys.mk) in order to 
+apply patches to the upstream source. Patches are stored in 
+debian/patches and their filenames usually end in .patch or .diff .
+For further details, see the man page for cdbs-edit-patch.
+
+All commands described below should be run from the top directory of the 
+package source tree, unless otherwise stated.
+
+ * To generate the fully patched source, in a form ready for
+   editing, that would be built to create Debian packages, run: 
+
+     make -f debian/rules apply-patches
+
+   Note: It has been proposed that, in future, this should happen 
+   automatically when you run dpkg-source -x on a CDBS 
+   simple-patchsys.mk source package.  However, this proposal has 
+   apparently not yet been implemented, so for now you have to do 
+   it yourself like this.
+
+ * To modify the source and save those modifications so that
+   they will be applied when building the package, pick a
+   suitably informative patch file name, for example
+   01_add_README.source_file.patch, and then run:
+
+     cdbs-edit-patch 01_add_README.source_file.patch
+
+   This will place you in a new shell in a temporary copy of the 
+   source tree.  Make your desired modifications to it, and then 
+   exit the shell to create the patch file containing them (this 
+   file will appear in debian/patches).
+
+ * To remove source modifications that are currently being
+   applied when building the package, run:
+
+     make -f debian/rules reverse-patches
+
+[This text was taken from https://wiki.ubuntu.com/README.sourceHowTo.]
+
+ -- Michael Schutte <michi at uiae.at>  Thu, 30 Jul 2009 16:45:40 +0200

Modified: packages/libxslt-ruby/trunk/debian/changelog
===================================================================
--- packages/libxslt-ruby/trunk/debian/changelog	2009-07-30 12:35:15 UTC (rev 3855)
+++ packages/libxslt-ruby/trunk/debian/changelog	2009-07-30 14:58:13 UTC (rev 3856)
@@ -1,9 +1,27 @@
 libxslt-ruby (0.9.2-5) UNRELEASED; urgency=low
 
+  [ Paul van Tilburg ]
   * NOT RELEASED YET
 
- -- Paul van Tilburg <paulvt at debian.org>  Sat, 19 Jan 2008 12:05:42 +0100
+  [ Michael Schutte ]
+  * Make the linker find /usr/lib/libxslt.so instead of ./libxslt.so
+    (which it is just trying to build at that moment) by replacing a
+    $LIBPATH.push with an $DEFLIBPATH.unshift call in extconf.rb.  The
+    library no longer fails to build this way, closes: #521991.
+  * Add a proper copyright notice.
+  * Move the package to the “ruby” section.
+  * Add ${misc:Depends} to the binary packages so debhelper can add
+    possibly necessary packages.
+  * Copy the simple-patchsys explanation from
+    https://wiki.ubuntu.com/README.sourceHowTo and upgrade
+    Standards-Version to 3.8.2.
+  * Distinguish between -ruby and -ruby1.8 in the short descriptions.
+  * Upgrade debian/compat and build-deps to require debhelper 5.  The
+    4.*.* series has been deprecated.
+  * Add myself to Uploaders.
 
+ -- Michael Schutte <michi at uiae.at>  Thu, 30 Jul 2009 16:53:25 +0200
+
 libxslt-ruby (0.9.2-4) unstable; urgency=low
 
   [ Lucas Nussbaum ]

Modified: packages/libxslt-ruby/trunk/debian/compat
===================================================================
--- packages/libxslt-ruby/trunk/debian/compat	2009-07-30 12:35:15 UTC (rev 3855)
+++ packages/libxslt-ruby/trunk/debian/compat	2009-07-30 14:58:13 UTC (rev 3856)
@@ -1 +1 @@
-4
+5

Modified: packages/libxslt-ruby/trunk/debian/control
===================================================================
--- packages/libxslt-ruby/trunk/debian/control	2009-07-30 12:35:15 UTC (rev 3855)
+++ packages/libxslt-ruby/trunk/debian/control	2009-07-30 14:58:13 UTC (rev 3856)
@@ -1,17 +1,17 @@
 Source: libxslt-ruby
-Section: admin
+Section: ruby
 Priority: optional
 Maintainer: Filipe Lautert <filipe at icewall.org>
-Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Paul van Tilburg <paulvt at debian.org>
-Build-Depends: debhelper (>> 4.1.0), cdbs, ruby-pkg-tools (>= 0.8), ruby, ruby1.8-dev, libxml2-dev, libxslt1-dev, zlib1g-dev
-Standards-Version: 3.7.3
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Paul van Tilburg <paulvt at debian.org>, Michael Schutte <michi at uiae.at>
+Build-Depends: debhelper (>> 5.0.0), cdbs, ruby-pkg-tools (>= 0.8), ruby, ruby1.8-dev, libxml2-dev, libxslt1-dev, zlib1g-dev
+Standards-Version: 3.8.2
 Homepage: http://greg.rubyfr.net/pub/packages/ruby-xslt
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libxslt-ruby/trunk/
 Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/libxslt-ruby/trunk/
 
 Package: libxslt-ruby
 Architecture: all
-Depends: libxslt-ruby1.8
+Depends: libxslt-ruby1.8, ${misc:Depends}
 Description: Ruby interface to libxslt
  libxslt-ruby is a simple ruby interface for processing XSLT. 
  It's based on libxml (xmlsoft.org) and libxslt (xmlsoft.org/XSLT),
@@ -22,8 +22,8 @@
 
 Package: libxslt-ruby1.8
 Architecture: any
-Depends: ${shlibs:Depends}, libxml-ruby1.8
-Description: Ruby interface to libxslt
+Depends: ${shlibs:Depends}, libxml-ruby1.8, ${misc:Depends}
+Description: Ruby interface to libxslt (for Ruby 1.8)
  libxslt-ruby is a simple ruby interface for processing XSLT. 
  It's based on libxml (xmlsoft.org) and libxslt (xmlsoft.org/XSLT),
  including EXSLT support and passing parameters to stylesheets.

Modified: packages/libxslt-ruby/trunk/debian/copyright
===================================================================
--- packages/libxslt-ruby/trunk/debian/copyright	2009-07-30 12:35:15 UTC (rev 3855)
+++ packages/libxslt-ruby/trunk/debian/copyright	2009-07-30 14:58:13 UTC (rev 3856)
@@ -1,5 +1,7 @@
 Copyright:
 
+    Copyright (C) 2003-2005 Gregoire Lejeune <gregoire.lejeune at free.fr>
+
     xslt-ruby is copyrighted free software of Gregoire Lejeune and distributed
     under the GPL.
 

Modified: packages/libxslt-ruby/trunk/debian/patches/001-configure_extconf_rb.patch
===================================================================
--- packages/libxslt-ruby/trunk/debian/patches/001-configure_extconf_rb.patch	2009-07-30 12:35:15 UTC (rev 3855)
+++ packages/libxslt-ruby/trunk/debian/patches/001-configure_extconf_rb.patch	2009-07-30 14:58:13 UTC (rev 3856)
@@ -1,5 +1,15 @@
---- extconf.rb	2006-11-01 00:57:08.613064254 -0300
-+++ /home/lautert/tmp/ruby-xslt/extconf.rb	2006-11-01 00:56:42.022663140 -0300
+diff -Nur -x '*.orig' -x '*~' libxslt-ruby-0.9.2/extconf.rb libxslt-ruby-0.9.2.new/extconf.rb
+--- libxslt-ruby-0.9.2/extconf.rb	2005-11-14 23:47:04.000000000 +0100
++++ libxslt-ruby-0.9.2.new/extconf.rb	2009-07-30 15:51:04.000000000 +0200
+@@ -44,7 +44,7 @@
+   $CFLAGS += " -DUSE_ERROR_HANDLER"
+ end
+ 
+-$LIBPATH.push(Config::CONFIG['libdir'])
++$DEFLIBPATH.unshift(Config::CONFIG['libdir'])
+ 
+ def crash(str)
+   printf(" extconf failure: %s\n", str)
 @@ -88,7 +88,7 @@
  puts
  


