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

raof-guest at users.alioth.debian.org raof-guest at users.alioth.debian.org
Mon Feb 23 06:13:16 UTC 2009 

Author: raof-guest
Date: Mon Feb 23 06:13:15 2009
New Revision: 4548

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4548
Log:
Update for new upstream bugfix release.
Still needs the DllMaps fixed, though.

Modified:
    packages/beagle/trunk/debian/changelog
    packages/beagle/trunk/debian/patches/00list
    packages/beagle/trunk/debian/patches/beagle_secure_scripts.dpatch

Modified: packages/beagle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/changelog?rev=4548&op=diff
==============================================================================
--- packages/beagle/trunk/debian/changelog (original)
+++ packages/beagle/trunk/debian/changelog Mon Feb 23 06:13:15 2009
@@ -1,3 +1,14 @@
+beagle (0.3.9-1) UNRELEASED; urgency=low
+
+  * New upstream bugfix release
+  * debian/patches/beagle_secure_scripts:
+    + Update for new upstream changes
+    + Add informative header
+  * debian/patches/enhanced_logging_support:
+    + Remove.  Upstream now handles --debug passed to daemon
+
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Mon, 23 Feb 2009 13:51:57 +1100
+
 beagle (0.3.8-2) experimental; urgency=low
 
   * Group Policy:

Modified: packages/beagle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/00list?rev=4548&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/00list (original)
+++ packages/beagle/trunk/debian/patches/00list Mon Feb 23 06:13:15 2009
@@ -2,7 +2,7 @@
 beagle_secure_scripts
 crawl-rules
 icedove
-enhanced_logging_support
+#enhanced_logging_support
 fix_UiUtil.dll.config
 fix_Util.dll.config
 fix_beagle-build-index-manpage

Modified: packages/beagle/trunk/debian/patches/beagle_secure_scripts.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/beagle_secure_scripts.dpatch?rev=4548&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/beagle_secure_scripts.dpatch (original)
+++ packages/beagle/trunk/debian/patches/beagle_secure_scripts.dpatch Mon Feb 23 06:13:15 2009
@@ -2,12 +2,14 @@
 ## beagle_secure_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.
+## DP: Secure shell scripts by removing the 'uninstalled' logic
+## DP: This prevents running the beagle scripts with various important
+## DP: paths set relative to the current directory.
 
 @DPATCH@
-diff -urNad beagle-0.3.4~/ImLogViewer/beagle-imlogviewer.in beagle-0.3.4/ImLogViewer/beagle-imlogviewer.in
---- beagle-0.3.4~/ImLogViewer/beagle-imlogviewer.in	2007-11-27 02:49:57.000000000 +0100
-+++ beagle-0.3.4/ImLogViewer/beagle-imlogviewer.in	2008-03-24 23:57:04.000000000 +0100
+diff -urNad beagle-0.3.9~/ImLogViewer/beagle-imlogviewer.in beagle-0.3.9/ImLogViewer/beagle-imlogviewer.in
+--- beagle-0.3.9~/ImLogViewer/beagle-imlogviewer.in	2007-11-27 12:49:57.000000000 +1100
++++ beagle-0.3.9/ImLogViewer/beagle-imlogviewer.in	2009-02-23 13:16:23.000346909 +1100
 @@ -1,18 +1,11 @@
 -#!@bash@
 +#!/bin/bash
@@ -28,9 +30,9 @@
  
  MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS --debug $THIS_EXE "$@"
  
-diff -urNad beagle-0.3.4~/beagled/beagled-index-helper.in beagle-0.3.4/beagled/beagled-index-helper.in
---- beagle-0.3.4~/beagled/beagled-index-helper.in	2008-02-10 03:40:46.000000000 +0100
-+++ beagle-0.3.4/beagled/beagled-index-helper.in	2008-03-24 23:57:04.000000000 +0100
+diff -urNad beagle-0.3.9~/beagled/beagled-index-helper.in beagle-0.3.9/beagled/beagled-index-helper.in
+--- beagle-0.3.9~/beagled/beagled-index-helper.in	2008-02-10 13:40:46.000000000 +1100
++++ beagle-0.3.9/beagled/beagled-index-helper.in	2009-02-23 13:16:23.000346909 +1100
 @@ -1,22 +1,10 @@
 -#!@bash@
 +#!/bin/bash
@@ -55,9 +57,9 @@
  
  if [ -n "$_GET_ON_THE_HEAP_BUDDY_BANDWAGON" ]; then
     n=1
-diff -urNad beagle-0.3.4~/beagled/beagled.in beagle-0.3.4/beagled/beagled.in
---- beagle-0.3.4~/beagled/beagled.in	2008-01-03 10:22:37.000000000 +0100
-+++ beagle-0.3.4/beagled/beagled.in	2008-03-24 23:57:33.000000000 +0100
+diff -urNad beagle-0.3.9~/beagled/beagled.in beagle-0.3.9/beagled/beagled.in
+--- beagle-0.3.9~/beagled/beagled.in	2008-01-03 20:22:37.000000000 +1100
++++ beagle-0.3.9/beagled/beagled.in	2009-02-23 13:16:23.000346909 +1100
 @@ -1,35 +1,8 @@
 -#!@bash@
 +#!/bin/bash
@@ -117,9 +119,9 @@
  
  if [ $monogrind -eq 1 ]; then
      export GC_DONT_GC=1
-diff -urNad beagle-0.3.4~/beagled/wrapper.in beagle-0.3.4/beagled/wrapper.in
---- beagle-0.3.4~/beagled/wrapper.in	2008-01-03 10:22:37.000000000 +0100
-+++ beagle-0.3.4/beagled/wrapper.in	2008-03-24 23:57:04.000000000 +0100
+diff -urNad beagle-0.3.9~/beagled/wrapper.in beagle-0.3.9/beagled/wrapper.in
+--- beagle-0.3.9~/beagled/wrapper.in	2008-01-03 20:22:37.000000000 +1100
++++ beagle-0.3.9/beagled/wrapper.in	2009-02-23 13:16:23.000346909 +1100
 @@ -1,29 +1,13 @@
 -#!@bash@
 +#!/bin/bash
@@ -151,9 +153,9 @@
  
  MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a @wrapper@ mono $MONO_EXTRA_ARGS $THIS_EXE "$@"
  
-diff -urNad beagle-0.3.4~/search/beagle-search.in beagle-0.3.4/search/beagle-search.in
---- beagle-0.3.4~/search/beagle-search.in	2008-02-10 21:24:20.000000000 +0100
-+++ beagle-0.3.4/search/beagle-search.in	2008-03-24 23:57:04.000000000 +0100
+diff -urNad beagle-0.3.9~/search/beagle-search.in beagle-0.3.9/search/beagle-search.in
+--- beagle-0.3.9~/search/beagle-search.in	2008-02-11 07:24:20.000000000 +1100
++++ beagle-0.3.9/search/beagle-search.in	2009-02-23 13:16:23.004346300 +1100
 @@ -1,24 +1,11 @@
 -#!@bash@
 +#!/bin/bash
@@ -180,9 +182,9 @@
 -fi
  
  exec -a beagle-search $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"
-diff -urNad beagle-0.3.4~/tools/beagle-index-info beagle-0.3.4/tools/beagle-index-info
---- beagle-0.3.4~/tools/beagle-index-info	2007-11-28 15:38:16.000000000 +0100
-+++ beagle-0.3.4/tools/beagle-index-info	2008-03-24 23:57:04.000000000 +0100
+diff -urNad beagle-0.3.9~/tools/beagle-index-info beagle-0.3.9/tools/beagle-index-info
+--- beagle-0.3.9~/tools/beagle-index-info	2007-11-29 01:38:16.000000000 +1100
++++ beagle-0.3.9/tools/beagle-index-info	2009-02-23 13:16:23.004346300 +1100
 @@ -3,10 +3,4 @@
  # This line will be automatically uncommented when you "make install"
  #installed=1
@@ -195,9 +197,9 @@
 -
 -exec -a beagle-index-info $CMD --index-info
 +exec -a beagle-index-info beagle-info --index-info
-diff -urNad beagle-0.3.4~/tools/beagle-ping beagle-0.3.4/tools/beagle-ping
---- beagle-0.3.4~/tools/beagle-ping	2007-11-28 15:38:43.000000000 +0100
-+++ beagle-0.3.4/tools/beagle-ping	2008-03-24 23:57:04.000000000 +0100
+diff -urNad beagle-0.3.9~/tools/beagle-ping beagle-0.3.9/tools/beagle-ping
+--- beagle-0.3.9~/tools/beagle-ping	2007-11-29 01:38:43.000000000 +1100
++++ beagle-0.3.9/tools/beagle-ping	2009-02-23 13:16:23.004346300 +1100
 @@ -3,10 +3,4 @@
  # This line will be automatically uncommented when you "make install"
  #installed=1
@@ -210,24 +212,29 @@
 -
 -exec -a beagle-ping $CMD --daemon-version
 +exec -a beagle-ping beagle-info --daemon-version
-diff -urNad beagle-0.3.4~/tools/beagle-status beagle-0.3.4/tools/beagle-status
---- beagle-0.3.4~/tools/beagle-status	2007-11-28 15:38:24.000000000 +0100
-+++ beagle-0.3.4/tools/beagle-status	2008-03-24 23:57:04.000000000 +0100
-@@ -3,10 +3,4 @@
- # This line will be automatically uncommented when you "make install"
- #installed=1
- 
+diff -urNad beagle-0.3.9~/tools/beagle-status beagle-0.3.9/tools/beagle-status
+--- beagle-0.3.9~/tools/beagle-status	2008-07-18 22:39:29.000000000 +1000
++++ beagle-0.3.9/tools/beagle-status	2009-02-23 13:19:11.604354895 +1100
+@@ -1,14 +1,8 @@
+-#!/usr/bin/env bash
++#!/bin/bash
+ 
+ # This line will be automatically uncommented when you "make install"
+-#installed=1
+-
 -if [ -z $installed ]; then
 -    CMD="./beagle-info"
 -else
 -    CMD="beagle-info"
 -fi
--
--watch -n 5 $CMD --status
-+watch -n 5 beagle-info --status
-diff -urNad beagle-0.3.4~/tools/wrapper.in beagle-0.3.4/tools/wrapper.in
---- beagle-0.3.4~/tools/wrapper.in	2008-01-03 10:22:37.000000000 +0100
-+++ beagle-0.3.4/tools/wrapper.in	2008-03-24 23:57:04.000000000 +0100
+ 
++CMD="beagle-info"
+ while true; do
+     clear
+     echo -n "beagle-status at "
+diff -urNad beagle-0.3.9~/tools/wrapper.in beagle-0.3.9/tools/wrapper.in
+--- beagle-0.3.9~/tools/wrapper.in	2008-01-03 20:22:37.000000000 +1100
++++ beagle-0.3.9/tools/wrapper.in	2009-02-23 13:16:23.004346300 +1100
 @@ -3,36 +3,11 @@
  # This line will be automatically uncommented when you "make install"
  #installed=1

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