[Pkg-cli-apps-commits] r3597 - in /packages/beagle/trunk/debian: changelog control patches/00list patches/compile_fix_mono_1.2.6.dpatch patches/relibtoolize.dpatch rules

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Sun Dec 23 15:48:46 UTC 2007 

Author: meebey
Date: Sun Dec 23 15:48:46 2007
New Revision: 3597

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3597
Log:
- build fixes


Added:
    packages/beagle/trunk/debian/patches/compile_fix_mono_1.2.6.dpatch   (with props)
Removed:
    packages/beagle/trunk/debian/patches/relibtoolize.dpatch
Modified:
    packages/beagle/trunk/debian/changelog
    packages/beagle/trunk/debian/control
    packages/beagle/trunk/debian/patches/00list
    packages/beagle/trunk/debian/rules

Modified: packages/beagle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/changelog?rev=3597&op=diff
==============================================================================
--- packages/beagle/trunk/debian/changelog (original)
+++ packages/beagle/trunk/debian/changelog Sun Dec 23 15:48:46 2007
@@ -1,3 +1,14 @@
+beagle (0.3.1-2~pre1) unstable; urgency=low
+
+  * debian/control:
+    + Made build-deps versioned and added all libary packages explicitly, as
+      defined/checked in configure.in
+    + Added monodoc-base to build dependencies, fixes FTFBS. (Closes: #457556)
+  * debian/patches/compile_fix_mono_1.2.6.dpatch:
+    + Fixed an ambiguous method call for the Mono 1.2.6 compiler.
+
+ -- Mirco Bauer <meebey at debian.org>  Sun, 23 Dec 2007 16:26:51 +0100
+
 beagle (0.3.1-1) unstable; urgency=low
 
   [ Mirco Bauer ]

Modified: packages/beagle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/control?rev=3597&op=diff
==============================================================================
--- packages/beagle/trunk/debian/control (original)
+++ packages/beagle/trunk/debian/control Sun Dec 23 15:48:46 2007
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team 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), autotools-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libmono-sharpzip0.6-cil, libmono-system-runtime2.0-cil, libwv-dev, libgsf0.0-cil, unzip, gtk-doc-tools, xdg-utils
+Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.4.4), dpatch, intltool, mono-gmcs (>= 1.2.4) | c-sharp-2.0-compiler, libmono-dev (>= 1.2.4), libmono-cairo2.0-cil, libgtk2.0-cil (>= 2.4), libgnome2.0-cil, libglade2.0-cil, libgconf2.0-cil, libgmime2.2-cil, libevolution3.0-cil (>= 0.13.3), libgtk2.0-dev (>= 2.6), libexif-dev, libsqlite3-dev, libmono-sqlite2.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), autotools-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libmono-sharpzip0.6-cil, libmono-system-runtime2.0-cil, libwv-dev, libgsf0.0-cil (>= 0.6), unzip, gtk-doc-tools, xdg-utils, monodoc-base
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/beagle/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/
 Homepage: http://www.beagle-project.org/
 
 Package: beagle

Modified: packages/beagle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/00list?rev=3597&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/00list (original)
+++ packages/beagle/trunk/debian/patches/00list Sun Dec 23 15:48:46 2007
@@ -1,12 +1,9 @@
 beagle-crawl-safely
 beagle_secure_scripts
-#fix_desktop_files
 crawl-rules
-#usebash
-#use-python2.4
-#relibtoolize
 icedove
 enhanced_logging_support
 fix_GMime.StreamFs.Seek_usage
 fix_UiUtil.dll.config
 fix_Util.dll.config
+compile_fix_mono_1.2.6

Added: packages/beagle/trunk/debian/patches/compile_fix_mono_1.2.6.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/compile_fix_mono_1.2.6.dpatch?rev=3597&op=file
==============================================================================
--- packages/beagle/trunk/debian/patches/compile_fix_mono_1.2.6.dpatch (added)
+++ packages/beagle/trunk/debian/patches/compile_fix_mono_1.2.6.dpatch Sun Dec 23 15:48:46 2007
@@ -1,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## compile_fix_mono_1.2.6.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.3.1~/tools/Settings.cs beagle-0.3.1/tools/Settings.cs
+--- beagle-0.3.1~/tools/Settings.cs	2007-12-23 16:24:25.000000000 +0100
++++ beagle-0.3.1/tools/Settings.cs	2007-12-23 16:25:17.000000000 +0100
+@@ -887,14 +887,14 @@
+ 			column.Title = Catalog.GetString ("Name");
+ 			CellRendererText renderer = new CellRendererText ();
+ 			column.PackStart (renderer, true);
+-			column.SetCellDataFunc (renderer, NameCellFunc);
++			column.SetCellDataFunc (renderer, (TreeCellDataFunc) NameCellFunc);
+ 			AppendColumn (column);
+ 
+                         column = new TreeViewColumn ();
+                         column.Title = Catalog.GetString ("Address");
+                         renderer = new CellRendererText ();
+                         column.PackStart (renderer, true);
+-                        column.SetCellDataFunc (renderer, AddressCellFunc);
++                        column.SetCellDataFunc (renderer, (TreeCellDataFunc) AddressCellFunc);
+                         AppendColumn (column);
+ 		
+ 		}

Propchange: packages/beagle/trunk/debian/patches/compile_fix_mono_1.2.6.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/beagle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/rules?rev=3597&op=diff
==============================================================================
--- packages/beagle/trunk/debian/rules (original)
+++ packages/beagle/trunk/debian/rules Sun Dec 23 15:48:46 2007
@@ -11,7 +11,6 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
 
 CFLAGS = -Wall -g
 
@@ -33,10 +32,12 @@
 		--infodir=\$${prefix}/share/info \
 		--enable-thunderbird --enable-gtk-doc
 
+# broken/missing in beagle 0.3.1
+#		--enable-avahi
+
 	touch configure-stamp
 
 build: build-stamp
-
 build-stamp:  configure-stamp
 	dh_testdir
 	$(MAKE)
@@ -134,4 +135,5 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
+
 .PHONY: build clean binary-indep binary-arch binary install configure patch unpatch

More information about the Pkg-cli-apps-commits mailing list