[Pkg-mono-svn-commits] rev 2632 - in non-group/beagle/trunk/debian: . patches

Jose Carlos Garcia Sogo jsogo at costa.debian.org
Thu Jul 20 20:42:07 UTC 2006


Author: jsogo
Date: 2006-07-20 20:42:04 +0000 (Thu, 20 Jul 2006)
New Revision: 2632

Modified:
   non-group/beagle/trunk/debian/changelog
   non-group/beagle/trunk/debian/control
   non-group/beagle/trunk/debian/patches/00list
   non-group/beagle/trunk/debian/patches/usebash.dpatch
   non-group/beagle/trunk/debian/rules
Log:
New upstream version
Fixed some bugs


Modified: non-group/beagle/trunk/debian/changelog
===================================================================
--- non-group/beagle/trunk/debian/changelog	2006-07-16 12:22:48 UTC (rev 2631)
+++ non-group/beagle/trunk/debian/changelog	2006-07-20 20:42:04 UTC (rev 2632)
@@ -1,3 +1,17 @@
+beagle (0.2.7-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * Bump dependency on mono-mcs to >= 1.1.13.5 (Closes: #367955)
+  * Add build-dependency on libwv-dev
+  * Exclude .xpi files from being compressed (Closes: #375586)
+  * debian/patches:
+     + beagled-manpage: included upstream
+     + usebash: add beagle-search, beagle-extract-content and
+     beagle-index-url to scripts that should use bash because
+     they call exec -a (Closes: #376969, #369644, #369223)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Thu, 20 Jul 2006 22:41:21 +0200
+
 beagle (0.2.6-2) unstable; urgency=low
 
   * Version 0.2.6 fixes CVE-2006-1865. (Closes: #365371)

Modified: non-group/beagle/trunk/debian/control
===================================================================
--- non-group/beagle/trunk/debian/control	2006-07-16 12:22:48 UTC (rev 2631)
+++ non-group/beagle/trunk/debian/control	2006-07-20 20:42:04 UTC (rev 2632)
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>= 4.1.0), intltool, mono-mcs (>= 1.0) | c-sharp-compiler, libmono-dev (>= 1.0), libgnome2.0-cil, libgmime2.1-cil (>= 2.1.19), libevolution-cil, libgtk2.0-dev, libexif-dev, libsqlite0-dev, libmono-sqlite1.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago-cil, cli-common-dev (>= 0.4.0), dpatch, autotools-dev, python2.4-dev, python2.4-gtk2, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libxss-dev, libmono-sharpzip0.6-cil
+Build-Depends: debhelper (>= 4.1.0), intltool, mono-mcs (>= 1.1.13.5) | c-sharp-compiler, libmono-dev (>= 1.0), libgnome2.0-cil, libgmime2.1-cil (>= 2.1.19), libevolution-cil, libgtk2.0-dev, libexif-dev, libsqlite0-dev, libmono-sqlite1.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago-cil, cli-common-dev (>= 0.4.0), dpatch, autotools-dev, python2.4-dev, python2.4-gtk2, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libxss-dev, libmono-sharpzip0.6-cil, libwv-dev
 Standards-Version: 3.7.2
 
 Package: beagle

Modified: non-group/beagle/trunk/debian/patches/00list
===================================================================
--- non-group/beagle/trunk/debian/patches/00list	2006-07-16 12:22:48 UTC (rev 2631)
+++ non-group/beagle/trunk/debian/patches/00list	2006-07-20 20:42:04 UTC (rev 2632)
@@ -1,4 +1,3 @@
-beagled-manpage.dpatch
 beagle-settings.dpatch
 beagle-status_watch.dpatch
 usebash.dpatch

Modified: non-group/beagle/trunk/debian/patches/usebash.dpatch
===================================================================
--- non-group/beagle/trunk/debian/patches/usebash.dpatch	2006-07-16 12:22:48 UTC (rev 2631)
+++ non-group/beagle/trunk/debian/patches/usebash.dpatch	2006-07-20 20:42:04 UTC (rev 2632)
@@ -5,48 +5,64 @@
 ## DP: Force scripts using "exec -a" to use bash
 
 @DPATCH@
-diff -urNad beagle-0.2.1~/beagled/beagled.in beagle-0.2.1/beagled/beagled.in
---- beagle-0.2.1~/beagled/beagled.in	2005-12-06 22:17:29.000000000 +0100
-+++ beagle-0.2.1/beagled/beagled.in	2006-02-04 13:40:59.000000000 +0100
+diff -urNad beagle-0.2.7~/ImLogViewer/beagle-imlogviewer.in beagle-0.2.7/ImLogViewer/beagle-imlogviewer.in
+--- beagle-0.2.7~/ImLogViewer/beagle-imlogviewer.in	2006-04-07 18:15:56.000000000 +0200
++++ beagle-0.2.7/ImLogViewer/beagle-imlogviewer.in	2006-07-16 12:47:30.000000000 +0200
 @@ -1,4 +1,4 @@
--#!@bash@
+-#!/bin/sh
 +#!/bin/bash
  
- if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-     echo "*** Running uninstalled @target@ ***"
-diff -urNad beagle-0.2.1~/beagled/beagled-index-helper.in beagle-0.2.1/beagled/beagled-index-helper.in
---- beagle-0.2.1~/beagled/beagled-index-helper.in	2005-11-03 18:54:47.000000000 +0100
-+++ beagle-0.2.1/beagled/beagled-index-helper.in	2006-02-04 13:40:59.000000000 +0100
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+diff -urNad beagle-0.2.7~/beagled/beagled-index-helper.in beagle-0.2.7/beagled/beagled-index-helper.in
+--- beagle-0.2.7~/beagled/beagled-index-helper.in	2006-04-07 18:15:57.000000000 +0200
++++ beagle-0.2.7/beagled/beagled-index-helper.in	2006-07-16 12:47:30.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!@bash@
 +#! /bin/bash
  
- if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-     echo "*** Running uninstalled @target@ ***"
-diff -urNad beagle-0.2.1~/ImLogViewer/beagle-imlogviewer.in beagle-0.2.1/ImLogViewer/beagle-imlogviewer.in
---- beagle-0.2.1~/ImLogViewer/beagle-imlogviewer.in	2005-01-25 21:13:58.000000000 +0100
-+++ beagle-0.2.1/ImLogViewer/beagle-imlogviewer.in	2006-02-04 13:40:59.000000000 +0100
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+diff -urNad beagle-0.2.7~/beagled/beagled.in beagle-0.2.7/beagled/beagled.in
+--- beagle-0.2.7~/beagled/beagled.in	2006-04-07 18:15:58.000000000 +0200
++++ beagle-0.2.7/beagled/beagled.in	2006-07-16 12:47:30.000000000 +0200
 @@ -1,4 +1,4 @@
+-#!@bash@
++#!/bin/bash
+ 
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+diff -urNad beagle-0.2.7~/search/beagle-search.in beagle-0.2.7/search/beagle-search.in
+--- beagle-0.2.7~/search/beagle-search.in	2006-03-24 22:55:23.000000000 +0100
++++ beagle-0.2.7/search/beagle-search.in	2006-07-16 12:48:01.000000000 +0200
+@@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  
- if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-     echo "*** Running uninstalled @target@ ***"
-diff -urNad beagle-0.2.1~/tools/beagle-index-info beagle-0.2.1/tools/beagle-index-info
---- beagle-0.2.1~/tools/beagle-index-info	2005-05-16 18:05:53.000000000 +0200
-+++ beagle-0.2.1/tools/beagle-index-info	2006-02-04 13:40:59.000000000 +0100
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+@@ -21,4 +21,4 @@
+    echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
+ fi
+ 
+-exec -a beagle-search $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+\ No newline at end of file
++exec -a beagle-search $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+diff -urNad beagle-0.2.7~/tools/beagle-index-info beagle-0.2.7/tools/beagle-index-info
+--- beagle-0.2.7~/tools/beagle-index-info	2006-04-07 18:16:02.000000000 +0200
++++ beagle-0.2.7/tools/beagle-index-info	2006-07-16 12:47:30.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  
- if [ -x "./beagle-info" ]; then
-     CMD="./beagle-info"
-diff -urNad beagle-0.2.1~/tools/beagle-ping beagle-0.2.1/tools/beagle-ping
---- beagle-0.2.1~/tools/beagle-ping	2005-05-16 18:05:53.000000000 +0200
-+++ beagle-0.2.1/tools/beagle-ping	2006-02-04 13:40:59.000000000 +0100
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+diff -urNad beagle-0.2.7~/tools/beagle-ping beagle-0.2.7/tools/beagle-ping
+--- beagle-0.2.7~/tools/beagle-ping	2006-04-07 18:16:02.000000000 +0200
++++ beagle-0.2.7/tools/beagle-ping	2006-07-16 12:47:30.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  
- if [ -x "./beagle-info" ]; then
-     CMD="./beagle-info"
+ # This line will be automatically uncommented when you "make install"
+ #installed=1

Modified: non-group/beagle/trunk/debian/rules
===================================================================
--- non-group/beagle/trunk/debian/rules	2006-07-16 12:22:48 UTC (rev 2631)
+++ non-group/beagle/trunk/debian/rules	2006-07-20 20:42:04 UTC (rev 2632)
@@ -98,7 +98,7 @@
 #	dh_makeclilibs -m 1.0 -i
 	dh_link -i
 	dh_strip -i
-	dh_compress -i
+	dh_compress -i -X.xpi
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_shlibdeps -i
@@ -119,7 +119,7 @@
 	dh_makeclilibs -a -V
 	dh_link -a
 	dh_strip -a
-	dh_compress -a
+	dh_compress -a -X.xpi
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a




More information about the Pkg-mono-svn-commits mailing list