Package: oocairo
Followup-For: Bug #636060
Even the second patch is wrong, because the lua5.1/oocairo.so symlink is
pointing nowhere. Nevertheless the package in the archive is wrong too
since the symlink points to liboocairo.so and not liboocairo.so.0.0.0
and this makes 'require "oocairo"' from the lua interpreter to fail if
the -dev package is not installed. The attached patch fixed all issues.
diff -Nru oocairo-1.3/debian/changelog oocairo-1.3/debian/changelog
--- oocairo-1.3/debian/changelog 2011-07-01 19:58:22.000000000 +0200
+++ oocairo-1.3/debian/changelog 2011-07-30 18:55:03.000000000 +0200
@@ -1,3 +1,13 @@
+oocairo (1.3-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Multi-Arch support
+ * Tight dependency of the -dev on the lib package
+ * oocairo.so symlink to the .so.0.0.0 file, and not the .so, so that the
+ -dev package is not needed to require oocairo from the lua interpreter
+
+ -- Enrico Tassi <gareuselesi...@debian.org> Sat, 30 Jul 2011 18:54:23 +0200
+
oocairo (1.3-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru oocairo-1.3/debian/control oocairo-1.3/debian/control
--- oocairo-1.3/debian/control 2011-05-09 14:55:17.000000000 +0200
+++ oocairo-1.3/debian/control 2011-07-30 18:23:35.000000000 +0200
@@ -10,6 +10,8 @@
Package: liblua5.1-oocairo0
Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: provides Lua with full access to the Cairo vector graphics API
Provides Lua with full access to the Cairo vector graphics API. It can be
@@ -20,7 +22,8 @@
Package: liblua5.1-oocairo-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, liblua5.1-oocairo0
+Multi-Arch: same
+Depends: ${misc:Depends}, liblua5.1-oocairo0 (= ${binary:Version})
Description: Cairo vector graphics API for Lua - development files
Provides Lua with full access to the Cairo vector graphics API. It can be
used for drawing onto bitmap images and saving the resulting files in PNG
diff -Nru oocairo-1.3/debian/liblua5.1-oocairo0.install
oocairo-1.3/debian/liblua5.1-oocairo0.install
--- oocairo-1.3/debian/liblua5.1-oocairo0.install 2010-11-04
11:32:54.000000000 +0100
+++ oocairo-1.3/debian/liblua5.1-oocairo0.install 2011-07-30
18:15:09.000000000 +0200
@@ -1,4 +1,4 @@
-usr/lib/liboocairo.so.0.0.0
-usr/lib/liboocairo.so.0
-usr/lib/lua
-usr/share/man
\ No newline at end of file
+usr/lib/*/liboocairo.so.0.0.0
+usr/lib/*/liboocairo.so.0
+usr/lib/*/lua
+usr/share/man
diff -Nru oocairo-1.3/debian/liblua5.1-oocairo-dev.install
oocairo-1.3/debian/liblua5.1-oocairo-dev.install
--- oocairo-1.3/debian/liblua5.1-oocairo-dev.install 2011-07-01
19:52:56.000000000 +0200
+++ oocairo-1.3/debian/liblua5.1-oocairo-dev.install 2011-07-30
18:41:54.000000000 +0200
@@ -1,3 +1,3 @@
usr/include
usr/lib/pkgconfig
-usr/lib/liboocairo.so
+usr/lib/*/liboocairo.so
diff -Nru oocairo-1.3/debian/patches/debian-changes-1.3-2.2
oocairo-1.3/debian/patches/debian-changes-1.3-2.2
--- oocairo-1.3/debian/patches/debian-changes-1.3-2.2 1970-01-01
01:00:00.000000000 +0100
+++ oocairo-1.3/debian/patches/debian-changes-1.3-2.2 2011-07-30
18:55:10.000000000 +0200
@@ -0,0 +1,115 @@
+Description: Upstream changes introduced in version 1.3-2.2
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ oocairo (1.3-2.2) unstable; urgency=low
+ .
+ * Non-maintainer upload.
+ * Multi-Arch support
+ * Tight dependency of the -dev on the lib package
+ * oocairo.so symlink to the .so.0.0.0 file, and not the .so, so that the
+ -dev package is not needed to require oocairo from the lua interpreter
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Enrico Tassi <gareuselesi...@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- oocairo-1.3.orig/Makefile.am
++++ oocairo-1.3/Makefile.am
+@@ -51,7 +51,7 @@ MOSTLYCLEANFILES = $(manpages)
+ install-exec-hook:
+ $(MKDIR_P) $(DESTDIR)$(lualibdir)
+ -rm -f $(DESTDIR)$(lualibdir)/oocairo.so
+- $(LN_S) $(libdir)/liboocairo.so $(DESTDIR)$(lualibdir)/oocairo.so
++ $(LN_S) ../../liboocairo.so.0.0.0 $(DESTDIR)$(lualibdir)/oocairo.so
+ uninstall-local:
+ -rm -f $(DESTDIR)$(lualibdir)/oocairo.so
+
diff -Nru oocairo-1.3/debian/rules oocairo-1.3/debian/rules
--- oocairo-1.3/debian/rules 2010-11-04 11:32:54.000000000 +0100
+++ oocairo-1.3/debian/rules 2011-07-30 18:40:46.000000000 +0200
@@ -15,3 +15,7 @@
override_dh_auto_configure:
autoreconf --install
dh_auto_configure
+
+override_dh_install:
+ cp -a debian/tmp/usr/lib/*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
+ dh_install
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
Enrico Tassi
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
