Package: beagle
Version: 0.3.9-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu lucid ubuntu-patch

Due to the -cil-dev package splits and the Mono 2.4.2 transition, the
following patch was applied in Ubuntu. These changes should be
applicable to the Debian package as well.

   * debian/control:
    - Add misc-depends for beagle-dev, thunderbird-beagle, and mozilla-beagle.
    - Ensure minimum mono-devel version is 2.4.2
    - Build depend on libndesk-dbus1.0-cil-dev, libndesk-dbus-glib1.0-cil-dev,
      libgtk2.0-cil-dev, libglade2.0-cil-dev, libgconf2.0-cil-dev,
      libgnome2.0-cil-dev, libgnome-vfs2.0-cil-dev, libtaglib-cil-dev, and
      libavahi-cil-dev due to -cil-dev split.
   * debian/patches/fix_build_system.dpatch:
    - Set compiler to mono-csc for Mono 2.4.2 transition

diff -u beagle-0.3.9/debian/control beagle-0.3.9/debian/control
--- beagle-0.3.9/debian/control
+++ beagle-0.3.9/debian/control
@@ -16,23 +16,24 @@
  unzip,
  gtk-doc-tools,
  xdg-utils,
- mono-devel (>= 2.0.1),
+ mono-devel (>= 2.4.2),
  libmono-dev (>= 2.0.1),
  libmono-system-runtime2.0-cil,
  libmono-sharpzip2.84-cil,
  libmono-sqlite2.0-cil,
  libmono-cairo2.0-cil,
- libgtk2.0-cil (>= 2.4),
- libglade2.0-cil,
- libgconf2.0-cil,
- libgnome2.24-cil,
+ libgtk2.0-cil-dev (>= 2.4),
+ libglade2.0-cil-dev,
+ libgconf2.0-cil-dev,
+ libgnome2.0-cil-dev,
+ libgnome-vfs2.0-cil-dev,
  libgmime2.2a-cil,
  libevolution5.0-cil,
  libgsf0.0-cil (>= 0.6),
- libndesk-dbus-glib1.0-cil,
- libndesk-dbus1.0-cil (>= 0.5.2),
- libavahi1.0-cil (>= 0.6.10),
- libtaglib2.0-cil,
+ libndesk-dbus-glib1.0-cil-dev,
+ libndesk-dbus1.0-cil-dev (>= 0.5.2),
+ libavahi-cil-dev (>= 0.6.10),
+ libtaglib-cil-dev,
  monodoc-base,
  libgnome-desktop-dev,
  libgtk2.0-dev (>= 2.10),
@@ -72,7 +73,7 @@

 Package: mozilla-beagle
 Architecture: all
-Depends: beagle (>= ${source:Version}), beagle (<<
${source:Version}.1~), firefox | abrowser
+Depends: beagle (>= ${source:Version}), beagle (<<
${source:Version}.1~), firefox | abrowser, ${misc:Depends}
 Description: Beagle extension for Firefox
  Extension that allows Beagle indexing webpages visited by the user.
  .
@@ -82,7 +83,7 @@

 Package: thunderbird-beagle
 Architecture: all
-Depends: beagle (>= ${source:Version}), beagle (<<
${source:Version}.1~), thunderbird
+Depends: beagle (>= ${source:Version}), beagle (<<
${source:Version}.1~), thunderbird, ${misc:Depends}
 Description: Beagle extension for Thunderbird
  Extension that allows Beagle indexing mails read by the user.
  .
@@ -93,7 +94,7 @@
 Package: beagle-dev
 Architecture: any
 Section: gnome
-Depends: beagle (= ${binary:Version})
+Depends: beagle (= ${binary:Version}), ${misc:Depends}
 Description: library for accessing beagle (C# development files)
  This library allow programmers accessing Beagle daemon and
performing searches,
  and this package contains needed files for developing with it using C#.
diff -u beagle-0.3.9/debian/patches/fix_build_system.dpatch
beagle-0.3.9/debian/patches/fix_build_system.dpatch
--- beagle-0.3.9/debian/patches/fix_build_system.dpatch
+++ beagle-0.3.9/debian/patches/fix_build_system.dpatch
@@ -13,7 +13,7 @@
  fi

 -AC_PATH_PROG(MCS, gmcs, no)
-+AC_PATH_PROG(MCS, csc, no)
++AC_PATH_PROG(MCS, mono-csc, no)
  if test "x$MCS" = "xno"; then
 -      AC_MSG_ERROR([You need to install the Mono gmcs compiler])
 +      AC_MSG_ERROR([You need to install the Mono csc compiler])

Attachment: diff
Description: Binary data

Reply via email to