[Pkg-cli-apps-commits] r3843 - in /packages/beagle/trunk/debian: changelog patches/00list patches/fix_system-scripts.dpatch

[jsogo at users.alioth.debian.org]

Author: jsogo
Date: Mon Mar 24 23:18:07 2008
New Revision: 3843

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3843
Log:
beagle:
 + Make cron scripts exit gracefully (#468086)

Added:
    packages/beagle/trunk/debian/patches/fix_system-scripts.dpatch   (with props)
Modified:
    packages/beagle/trunk/debian/changelog
    packages/beagle/trunk/debian/patches/00list

Modified: packages/beagle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/changelog?rev=3843&op=diff
==============================================================================
--- packages/beagle/trunk/debian/changelog (original)
+++ packages/beagle/trunk/debian/changelog Mon Mar 24 23:18:07 2008
@@ -9,10 +9,12 @@
     + beagle_secure_scripts: force using bash where needed (Closes: #464494)
     + crawl-rules: location for config files has changed, and Beagle does not
     index when on battery by default now.
+    + fix_system-scripts: new; do not emit an error if beagle was removed but 
+    not purged when running cron scripts. (Closes: #468086)
   * Bump build-dependencies, Mono >=1.2.6 and gmime-sharp >=2.2.16 are now
     needed to build the package.
 
- -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Mon, 24 Mar 2008 23:58:47 +0100
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Tue, 25 Mar 2008 00:09:55 +0100
 
 beagle (0.3.3-3) unstable; urgency=low
 

Modified: packages/beagle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/00list?rev=3843&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/00list (original)
+++ packages/beagle/trunk/debian/patches/00list Mon Mar 24 23:18:07 2008
@@ -5,4 +5,4 @@
 fix_UiUtil.dll.config
 fix_Util.dll.config
 fix_beagle-build-index-manpage.dpatch
-#glib-sharp-2.0-support.dpatch
+fix_system-scripts.dpatch

Added: packages/beagle/trunk/debian/patches/fix_system-scripts.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/fix_system-scripts.dpatch?rev=3843&op=file
==============================================================================
--- packages/beagle/trunk/debian/patches/fix_system-scripts.dpatch (added)
+++ packages/beagle/trunk/debian/patches/fix_system-scripts.dpatch Mon Mar 24 23:18:07 2008
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_system-scripts.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad beagle-0.3.4~/tools/beagle-crawl-system.in beagle-0.3.4/tools/beagle-crawl-system.in
+--- beagle-0.3.4~/tools/beagle-crawl-system.in	2008-01-03 10:22:37.000000000 +0100
++++ beagle-0.3.4/tools/beagle-crawl-system.in	2008-03-25 00:06:16.000000000 +0100
+@@ -34,7 +34,9 @@
+     if [ "$DEBUG" = "1" ]; then
+ 	echo "$0: @sbindir@/beagle-build-index not found.  Exiting."
+     fi
+-    exit 1
++    # In Debian, if the above script does not exist, we can be confident 
++    # that the package was removed, but not purged.
++    exit 0
+ fi
+ 
+ CRAWL_USER=beagleindex

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