[Pkg-cli-apps-commits] r4222 - in /packages/beagle/trunk/debian: changelog control patches/00list patches/fix_build_system.dpatch rules

Fri Nov 28 03:26:50 UTC 2008

Author: hanska-guest
Date: Fri Nov 28 03:26:50 2008
New Revision: 4222

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4222
Log:
* debian/rules:
  + updated to re-generate autotools files, and clean them when needed
* debian/patches/:
  + fix_build_system.dpatch added, use csc instead of gmcs
* debian/control:
  + Build-Depends-Indep updated

Added:
    packages/beagle/trunk/debian/patches/fix_build_system.dpatch   (with props)
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=4222&op=diff
==============================================================================

--- packages/beagle/trunk/debian/changelog (original)
+++ packages/beagle/trunk/debian/changelog Fri Nov 28 03:26:50 2008
@@ -2,8 +2,14 @@
 
   * Group Policy:
     + get-orig-source target in debian/rules.
-
- -- David Paleino <d.paleino at gmail.com>  Fri, 28 Nov 2008 03:15:33 +0100
+  * debian/rules:
+    + updated to re-generate autotools files, and clean them when needed
+  * debian/patches/:
+    + fix_build_system.dpatch added, use csc instead of gmcs
+  * debian/control:
+    + Build-Depends-Indep updated
+
+ -- David Paleino <d.paleino at gmail.com>  Fri, 28 Nov 2008 04:26:12 +0100
 
 beagle (0.3.8-1) unstable; urgency=low
 

Modified: packages/beagle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/control?rev=4222&op=diff
==============================================================================
--- packages/beagle/trunk/debian/control (original)
+++ packages/beagle/trunk/debian/control Fri Nov 28 03:26:50 2008
@@ -9,11 +9,13 @@
  pkg-config,
  intltool,
  autotools-dev,
+ autoconf,
+ automake,
  zip,
  unzip,
  gtk-doc-tools,
  xdg-utils,
- mono-gmcs (>= 1.2.6) | c-sharp-2.0-compiler,
+ mono-devel,
  libmono-dev (>= 1.2.6),
  libmono-cairo2.0-cil,
  libgtk2.0-cil (>= 2.4),

Modified: packages/beagle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/00list?rev=4222&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/00list (original)
+++ packages/beagle/trunk/debian/patches/00list Fri Nov 28 03:26:50 2008
@@ -1,3 +1,4 @@
+fix_build_system
 beagle_secure_scripts
 crawl-rules
 icedove

Added: packages/beagle/trunk/debian/patches/fix_build_system.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/fix_build_system.dpatch?rev=4222&op=file
==============================================================================
--- packages/beagle/trunk/debian/patches/fix_build_system.dpatch (added)
+++ packages/beagle/trunk/debian/patches/fix_build_system.dpatch Fri Nov 28 03:26:50 2008
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_build_system.dpatch by David Paleino <d.paleino at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Transition to Mono 2.0
+
+ at DPATCH@
+diff -urNad beagle-0.3.8~/configure.in beagle-0.3.8/configure.in
+--- beagle-0.3.8~/configure.in	2008-06-12 18:06:25.000000000 +0200
++++ beagle-0.3.8/configure.in	2008-11-28 04:18:18.000000000 +0100
+@@ -54,14 +54,14 @@
+ 	AC_MSG_ERROR([You need to install the Mono runtime])
+ fi
+ 
+-AC_PATH_PROG(MCS, gmcs, no)
++AC_PATH_PROG(MCS, 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])
+ fi
+ 
+ AC_MSG_CHECKING([for mono.pc])
+ if test -z `$PKG_CONFIG --variable=prefix mono`; then
+-  AC_MSG_ERROR([missing the mono.pc file, usually found in the mono-devel package])
++  AC_MSG_ERROR([missing the mono.pc file, usually found in the libmono-dev package])
+ else
+   AC_MSG_RESULT([found])
+ fi

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

Modified: packages/beagle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/rules?rev=4222&op=diff
==============================================================================
--- packages/beagle/trunk/debian/rules (original)
+++ packages/beagle/trunk/debian/rules Fri Nov 28 03:26:50 2008
@@ -25,6 +25,12 @@
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
+	
+	libtoolize
+	aclocal
+	autoconf
+	automake --add-missing --copy
+	
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man \
 		--sysconfdir=/etc --localstatedir=/var \
@@ -46,9 +52,10 @@
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
+	find . -name "Makefile.in" | xargs rm -rf
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 	rm -f build-stamp configure-stamp patch-stamp
-	dh_clean 
+	dh_clean configure config.sub config.guess aclocal.m4 ltmain.sh
 
 install: build-stamp install-arch install-indep
 


