Package: beagle
Version: 0.2.11-1
Severity: normal
Tags: patch

I talked to the dashboard list and they added a patch to the head of
the cvs tree for beagle. Then I grabbed out this change and made a
dpatch for both the testing and unstable versions of beagle in
debian. The attached dpatch seemed to apply fine to both versions and
I was able to install the packages ater building. Also I can confirm
that for my laprop at least this now behaves correctly.


-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 
'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-rc2-3.0
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)

Versions of packages beagle depends on:
ii  adduser                    3.99          Add and remove users and groups
ii  bash                       3.1-5         The GNU Bourne Again SHell
ii  libatk1.0-0                1.12.3-1      The ATK accessibility toolkit
ii  libc6                      2.3.6.ds1-4   GNU C Library: Shared libraries
ii  libcairo2                  1.2.4-4       The Cairo 2D vector graphics libra
ii  libexif12                  0.6.13-4      library to parse EXIF files
ii  libexpat1                  1.95.8-3.3    XML parsing C library - runtime li
ii  libfontconfig1             2.4.1-2       generic font configuration library
ii  libfreetype6               2.2.1-5       FreeType 2 font engine, shared lib
ii  libgalago1.0-cil           0.5.0-1       CLI bindings for libgalago
ii  libgconf2.0-cil            2.8.3-2       CLI binding for GConf 2.12
ii  libglade2.0-cil            2.8.3-2       CLI binding for the Glade librarie
ii  libglib2.0-0               2.12.4-1      The GLib library of C routines
ii  libglib2.0-cil             2.8.3-2       CLI binding for the GLib utility l
ii  libgmime2.2-cil            2.2.3-1.3     CLI binding for the MIME library, 
ii  libgnome2.0-cil            2.8.3-2       CLI binding for GNOME 2.12
ii  libgnomevfs2-0             2.14.2-2+b1   GNOME virtual file-system (runtime
ii  libgsf-1-114               1.14.2-1      Structured File Library - runtime 
ii  libgsf0.0-cil              0.8-1         CLI bindings for libgsf
ii  libgtk2.0-0                2.8.20-3      The GTK+ graphical user interface 
ii  libgtk2.0-cil              2.8.3-2       CLI binding for the GTK+ toolkit 2
ii  libice6                    1:1.0.1-2     X11 Inter-Client Exchange library
ii  libjpeg62                  6b-13         The Independent JPEG Group's JPEG 
ii  libmono-corlib1.0-cil      1.1.17.1-5    Mono core library (1.0)
ii  libmono-sharpzip0.6-cil    1.1.17.1-5    Mono SharpZipLib library
ii  libmono-sharpzip0.84-cil   1.1.17.1-5    Mono SharpZipLib library
ii  libmono-sqlite1.0-cil      1.1.17.1-5    Mono Sqlite library
ii  libmono-system-data1.0-cil 1.1.17.1-5    Mono System.Data library
ii  libmono-system-runtime1.0- 1.1.17.1-5    Mono System.Runtime library
ii  libmono-system-web1.0-cil  1.1.17.1-5    Mono System.Web library
ii  libmono-system1.0-cil      1.1.17.1-5    Mono System libraries (1.0)
ii  libmono0                   1.1.17.1-5    libraries for the Mono JIT
ii  libmono1.0-cil             1.1.17.1-5    Mono libraries (1.0)
ii  libpango1.0-0              1.14.7-1      Layout and rendering of internatio
ii  libpng12-0                 1.2.8rel-7    PNG library - runtime
ii  librsvg2-2                 2.14.4-2      SAX-based renderer library for SVG
ii  libsm6                     1:1.0.1-3     X11 Session Management library
ii  libsqlite0                 2.8.17-1      SQLite shared library
ii  libsqlite3-0               3.3.8-1       SQLite 3 shared library
ii  libwmf0.2-7                0.2.8.4-2     Windows metafile conversion librar
ii  libwv-1.2-1                1.2.2-1       Library for accessing Microsoft Wo
ii  libx11-6                   2:1.0.3-2     X11 client-side library
ii  libxcursor1                1.1.7-4       X cursor management library
ii  libxext6                   1:1.0.1-2     X11 miscellaneous extension librar
ii  libxfixes3                 1:4.0.1-4     X11 miscellaneous 'fixes' extensio
ii  libxi6                     1:1.0.1-3     X11 Input extension library
ii  libxinerama1               1:1.0.1-4.1   X11 Xinerama extension library
ii  libxml2                    2.6.26.dfsg-4 GNOME XML library
ii  libxrandr2                 2:1.1.0.2-4   X11 RandR extension library
ii  libxrender1                1:0.9.1-3     X Rendering Extension client libra
ii  libxss1                    1:1.1.0-1     X11 Screen Saver extension library
ii  mono-runtime               1.1.17.1-5    Mono runtime
ii  zlib1g                     1:1.2.3-13    compression library - runtime

Versions of packages beagle recommends:
ii  xpdf-utils [poppler-utils]    3.01-9     Portable Document Format (PDF) sui

-- no debconf information


#! /bin/sh /usr/share/dpatch/dpatch-run
## beagle-crawl-safely.dpatch by Ted Percival <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Exit if beagle-build-index is not available. Also exit on errors
## DP: (set -e) and redo option-adding to work with "set -e".

@DPATCH@
diff -urNad beagle-0.2.10~/Util/SystemInformation.cs 
beagle-0.2.10/Util/SystemInformation.cs
--- beagle-0.2.10~/Util/SystemInformation.cs    2006-08-17 11:16:26.000000000 
-0500
+++ beagle-0.2.10/Util/SystemInformation.cs     2006-10-29 19:12:27.000000000 
-0600
@@ -178,8 +178,15 @@
                ///////////////////////////////////////////////////////////////
 
                const double acpi_poll_delay = 30;
-               const string proc_ac_state_filename = 
"/proc/acpi/ac_adapter/AC/state";
                const string ac_present_string = "on-line";
+
+                       private static readonly string[] 
proc_ac_state_filenames = new string[] {
+                       "/proc/acpi/ac_adapter/AC/state",
+                       "/proc/acpi/ac_adapter/AC0/state",
+                       "/proc/acpi/ac_adapter/ADp1/state"
+               };
+          
+               private static string proc_ac_state_filename = null;
                private static bool proc_ac_state_exists = true;
                private static DateTime using_battery_time = DateTime.MinValue;
                private static bool using_battery;
@@ -192,7 +199,17 @@
                        if ((DateTime.Now - using_battery_time).TotalSeconds < 
acpi_poll_delay)
                                return;
 
-                       if (! File.Exists (proc_ac_state_filename)) {
+                       if (proc_ac_state_filename == null) {
+                         foreach (string s in proc_ac_state_filenames) {
+                           if (File.Exists (s)) {
+                             proc_ac_state_filename = s;
+                             break;
+                           }
+                         }
+                       }
+
+                       if ( proc_ac_state_filename == null || 
+                            ! File.Exists (proc_ac_state_filename)) {
                                proc_ac_state_exists = false;
                                using_battery = false;
                                return;


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to