[Pkg-mono-svn-commits] rev 3406 - in beagle/trunk/debian: . patches
Mirco Bauer
meebey-guest at alioth.debian.org
Sun Oct 21 19:07:02 UTC 2007
Author: meebey-guest
Date: 2007-10-21 19:07:02 +0000 (Sun, 21 Oct 2007)
New Revision: 3406
Added:
beagle/trunk/debian/BeagleDaemonLib.dll.config
beagle/trunk/debian/DocExtractor.exe.config
beagle/trunk/debian/IndexHelper.exe.config
beagle/trunk/debian/Search.exe.config
beagle/trunk/debian/libbeagle-dev.links
beagle/trunk/debian/patches/fix_UiUtil.dll.config.dpatch
beagle/trunk/debian/patches/fix_Util.dll.config.dpatch
Modified:
beagle/trunk/debian/changelog
beagle/trunk/debian/control
beagle/trunk/debian/patches/00list
beagle/trunk/debian/rules
Log:
- mainly fixes and cleanups, not well tested yet though
Added: beagle/trunk/debian/BeagleDaemonLib.dll.config
===================================================================
--- beagle/trunk/debian/BeagleDaemonLib.dll.config (rev 0)
+++ beagle/trunk/debian/BeagleDaemonLib.dll.config 2007-10-21 19:07:02 UTC (rev 3406)
@@ -0,0 +1,4 @@
+<configuration>
+ <dllmap dll="sqlite" target="libsqlite.so.0"/>
+ <dllmap dll="sqlite3" target="libsqlite3.so.0"/>
+</configuration>
Added: beagle/trunk/debian/DocExtractor.exe.config
===================================================================
--- beagle/trunk/debian/DocExtractor.exe.config (rev 0)
+++ beagle/trunk/debian/DocExtractor.exe.config 2007-10-21 19:07:02 UTC (rev 3406)
@@ -0,0 +1,3 @@
+<configuration>
+ <dllmap dll="libbeagleglue" target="/usr/lib/beagle/libbeagleglue.so"/>
+</configuration>
Added: beagle/trunk/debian/IndexHelper.exe.config
===================================================================
--- beagle/trunk/debian/IndexHelper.exe.config (rev 0)
+++ beagle/trunk/debian/IndexHelper.exe.config 2007-10-21 19:07:02 UTC (rev 3406)
@@ -0,0 +1,3 @@
+<configuration>
+ <dllmap dll="libc" target="libc.so.6"/>
+</configuration>
Added: beagle/trunk/debian/Search.exe.config
===================================================================
--- beagle/trunk/debian/Search.exe.config (rev 0)
+++ beagle/trunk/debian/Search.exe.config 2007-10-21 19:07:02 UTC (rev 3406)
@@ -0,0 +1,3 @@
+<configuration>
+ <dllmap dll="libbeagleuiglue.so" target="/usr/lib/beagle/libbeagleuiglue.so"/>
+</configuration>
Modified: beagle/trunk/debian/changelog
===================================================================
--- beagle/trunk/debian/changelog 2007-10-16 11:18:19 UTC (rev 3405)
+++ beagle/trunk/debian/changelog 2007-10-21 19:07:02 UTC (rev 3406)
@@ -1,11 +1,29 @@
-beagle (0.2.18-2) UNRELEASED; urgency=low
+beagle (0.2.18-2~pre1) UNRELEASED; urgency=low
* NOT RELEASED YET
* debian/control:
- - Moved iceweasel from Depends to Recommends for iceweasel-beagle, as iceweasel
+ + Moved iceweasel from Depends to Recommends for iceweasel-beagle, as iceweasel
uses the plugin and not the other way around.
- - Added beagle to Recommends for iceweasel-beagle.
- - Depend on python-gtk2 instead of python2.4-gtk2 for python-beagle.
+ + Added beagle to Recommends for iceweasel-beagle.
+ + Depend on python-gtk2 instead of python2.4-gtk2 for python-beagle.
+ + Replaced python-all-dev build dependency with python-dev.
+ + Removed python2.4-gtk2 build dependency (python-gtk2-dev sufficient).
+ + Removed libgalago1.0-cil from build-dependencies,
+ disables galago support (abandoned upstream).
+ + Added xdg-utils to build-dependencies and beagle binary dependencies.
+ (xdg-open is more friendly to KDE users)
+ * debian/patches/fix_UiUtil.dll.config.dpatch
+ debian/patches/fix_Util.dll.config.dpatch
+ debian/BeagleDaemonLib.dll.config
+ debian/DocExtractor.exe.config
+ debian/IndexHelper.exe.config
+ debian/Search.exe.config:
+ + Added missing DLL maps, don't rely on MONO_PATH and LD_LIBRARY_PATH hacks
+ in starter scripts.
+ * debian/patches/fix_Util.dll.config.dpatch:
+ + Added missing DLL map. (Closes: #447446)
+ * debian/rules:
+ + Moved symlink creation to *.links files.
-- Mirco Bauer <meebey at debian.org> Sat, 22 Sep 2007 20:25:49 +0200
Modified: beagle/trunk/debian/control
===================================================================
--- beagle/trunk/debian/control 2007-10-16 11:18:19 UTC (rev 3405)
+++ beagle/trunk/debian/control 2007-10-21 19:07:02 UTC (rev 3406)
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.4.4), dpatch, intltool, mono-gmcs (>= 1.2.4-1) | c-sharp-2.0-compiler, libmono-dev (>= 1.0), libmono-cairo2.0-cil, libgnome2.0-cil, libglade2.0-cil, libgconf2.0-cil, libgmime2.2-cil, libevolution3.0-cil (>= 0.13.3-1), libgtk2.0-dev, libexif-dev, libsqlite3-dev, libmono-sqlite2.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago1.0-cil, autotools-dev, python-all-dev (>= 2.3.5-11), python2.4-gtk2, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libmono-sharpzip0.6-cil, libmono-system-runtime2.0-cil, libwv-dev, libgsf0.0-cil, python-support (>= 0.4), unzip, gtk-doc-tools
+Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.4.4), dpatch, intltool, mono-gmcs (>= 1.2.4-1) | c-sharp-2.0-compiler, libmono-dev (>= 1.0), libmono-cairo2.0-cil, libgnome2.0-cil, libglade2.0-cil, libgconf2.0-cil, libgmime2.2-cil, libevolution3.0-cil (>= 0.13.3-1), libgtk2.0-dev, libexif-dev, libsqlite3-dev, libmono-sqlite2.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), autotools-dev, python-dev (>= 2.3.5-11), python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libmono-sharpzip0.6-cil, libmono-system-runtime2.0-cil, libwv-dev, libgsf0.0-cil, python-support (>= 0.4), unzip, gtk-doc-tools, xdg-utils
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/beagle/trunk
Package: beagle
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, bash (>= 3.0), adduser, dbus
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, bash (>= 3.0), adduser, dbus, xdg-utils
Recommends: poppler-utils, mono-gmcs
Suggests: gnumeric, beagle-backend-evolution
Description: indexing and search tool for your personal data
Added: beagle/trunk/debian/libbeagle-dev.links
===================================================================
--- beagle/trunk/debian/libbeagle-dev.links (rev 0)
+++ beagle/trunk/debian/libbeagle-dev.links 2007-10-21 19:07:02 UTC (rev 3406)
@@ -0,0 +1 @@
+usr/share/gtk-doc/html/beagle usr/share/doc/libbeagle-dev/html
Modified: beagle/trunk/debian/patches/00list
===================================================================
--- beagle/trunk/debian/patches/00list 2007-10-16 11:18:19 UTC (rev 3405)
+++ beagle/trunk/debian/patches/00list 2007-10-21 19:07:02 UTC (rev 3406)
@@ -8,3 +8,5 @@
icedove
enhanced_logging_support
fix_GMime.StreamFs.Seek_usage
+fix_UiUtil.dll.config
+fix_Util.dll.config
Added: beagle/trunk/debian/patches/fix_UiUtil.dll.config.dpatch
===================================================================
--- beagle/trunk/debian/patches/fix_UiUtil.dll.config.dpatch (rev 0)
+++ beagle/trunk/debian/patches/fix_UiUtil.dll.config.dpatch 2007-10-21 19:07:02 UTC (rev 3406)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_UiUtil.dll.config.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad beagle-0.2.18~/Util/UiUtil.dll.config beagle-0.2.18/Util/UiUtil.dll.config
+--- beagle-0.2.18~/Util/UiUtil.dll.config 2007-02-07 20:04:12.000000000 +0100
++++ beagle-0.2.18/Util/UiUtil.dll.config 2007-10-21 12:50:37.000000000 +0200
+@@ -1,3 +1,4 @@
+ <configuration>
+ <dllmap dll="libgnomevfs-2" target="libgnomevfs-2.so.0"/>
++ <dllmap dll="libbeagleuiglue" target="/usr/lib/beagle/libbeagleuiglue.so"/>
+ </configuration>
Property changes on: beagle/trunk/debian/patches/fix_UiUtil.dll.config.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: beagle/trunk/debian/patches/fix_Util.dll.config.dpatch
===================================================================
--- beagle/trunk/debian/patches/fix_Util.dll.config.dpatch (rev 0)
+++ beagle/trunk/debian/patches/fix_Util.dll.config.dpatch 2007-10-21 19:07:02 UTC (rev 3406)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_Util.dll.config.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad beagle-0.2.18~/Util/Util.dll.config.in beagle-0.2.18/Util/Util.dll.config.in
+--- beagle-0.2.18~/Util/Util.dll.config.in 2007-02-07 20:04:12.000000000 +0100
++++ beagle-0.2.18/Util/Util.dll.config.in 2007-10-21 12:35:03.000000000 +0200
+@@ -1,3 +1,5 @@
+ <configuration>
+ <dllmap dll="libexif.dll" target="libexif.so. at EXIF_SOVERSION@"/>
++ <dllmap dll="libc" target="libc.so.6"/>
++ <dllmap dll="libbeagleglue" target="/usr/lib/beagle/libbeagleglue.so"/>
+ </configuration>
Property changes on: beagle/trunk/debian/patches/fix_Util.dll.config.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: beagle/trunk/debian/rules
===================================================================
--- beagle/trunk/debian/rules 2007-10-16 11:18:19 UTC (rev 3405)
+++ beagle/trunk/debian/rules 2007-10-21 19:07:02 UTC (rev 3406)
@@ -31,10 +31,17 @@
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man \
--sysconfdir=/etc --localstatedir=/var \
--infodir=\$${prefix}/share/info --enable-libbeagle --enable-python \
- --enable-webservices=no --enable-thunderbird --enable-gtk-doc
+ --enable-thunderbird --enable-gtk-doc \
+ --enable-webservices=no
touch configure-stamp
+# --enable-webservices=no
+# <meebey> should the webservices of beagle be used?
+# <bheekling> Probably not yet, they'll be ready for use when 0.3 comes out
+# <meebey> broken, too buggy or insecure?
+# <bheekling> buggy and insecure, don't know about broken :)
+
build: build-stamp
build-stamp: configure-stamp
@@ -72,6 +79,7 @@
find debian/beagle debian/python-beagle -name '*.a' -delete
find debian/beagle debian/python-beagle debian/libbeagle-dev -name '*.la' -delete
+
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
find debian/ -type f -name "*.mdb" -delete
endif
@@ -84,9 +92,12 @@
# Remove settings menu item.
rm $(CURDIR)/debian/beagle/usr/share/applications/beagle-settings.desktop
-# Install link from gtk-doc to /usr/share/doc
- mkdir -p debian/libbeagle-dev/usr/share/doc/libbeagle-dev/
- ln -s ../../gtk-doc/html/beagle/ debian/libbeagle-dev/usr/share/doc/libbeagle-dev/html
+# Install missing DLL maps
+ cp debian/BeagleDaemonLib.dll.config \
+ debian/DocExtractor.exe.config \
+ debian/IndexHelper.exe.config \
+ debian/Search.exe.config \
+ $(CURDIR)/debian/beagle/usr/lib/beagle/
install-indep:
dh_testdir
More information about the Pkg-mono-svn-commits
mailing list