alanorth

    private static long REPROVISION_RESET = 6 * 7 * 24 * 60 * 60 * 1000;
    private static long LICENSE_EXPIRATION = 3 * 7 * 24 * 60 * 60 * 1000;

alanorth

diff --git a/dspace/config/input-forms.xml b/dspace/config/input-forms.xml
index 6074d63..e01f3aa 100644
--- a/dspace/config/input-forms.xml
+++ b/dspace/config/input-forms.xml
@@ -171,6 +171,7 @@
    <name-map collection-handle="10568/5468" form-name="CCAFS"/>
  </form-map>
 
+ <!--CIFOR submssion form SINCE JAN 2012-->
 

alanorth

diff --git a/dspace/modules/xmlui/src/main/webapp/themes/CGSPACE/lib/xsl/aspect/artifactbrowser/item-view.xsl b/dspace/modules/xmlui/src/main/webapp/themes/CGSPACE/lib/xsl/aspect/artifactbrowser/item-view.xsl
index 95056d3..8136aea 100644
--- a/dspace/modules/xmlui/src/main/webapp/themes/CGSPACE/lib/xsl/aspect/artifactbrowser/item-view.xsl
+++ b/dspace/modules/xmlui/src/main/webapp/themes/CGSPACE/lib/xsl/aspect/artifactbrowser/item-view.xsl
@@ -921,9 +921,35 @@
               </xsl:call-template>
           </xsl:when>
 	
+	 <!-- CIFOR Subject row --> 
+		<xsl:when test="$clause = 30 and (dim:field[@element='cisubject' and @qualifier='ciforsubject'])">

alanorth

diff --git a/dspace/modules/xmlui/src/main/webapp/themes/CGSPACE/lib/xsl/aspect/artifactbrowser/item-view.xsl b/dspace/modules/xmlui/src/main/webapp/themes/CGSPACE/lib/xsl/aspect/artifactbrowser/item-view.xsl
index 95056d3..ea31bfc 100644
--- a/dspace/modules/xmlui/src/main/webapp/themes/CGSPACE/lib/xsl/aspect/artifactbrowser/item-view.xsl
+++ b/dspace/modules/xmlui/src/main/webapp/themes/CGSPACE/lib/xsl/aspect/artifactbrowser/item-view.xsl
@@ -921,9 +921,33 @@
               </xsl:call-template>
           </xsl:when>
        
+       <!-- CIFOR Subject row -->
+       <xsl:when test="$clause = 30 and (dim:field[@element='cisubject' and @qualifier='ciforsubject'])">

alanorth

#!/bin/bash
 
function setenv {
        echo -n "Setting ARM environment..."
        export ARCH=arm
        export CROSS_COMPILE="/home/aorth/src/android-ndk-r7b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-"
        echo " done."
 
        echo -n "Setting other environment variables..."
        # the kernel version we're compiling for

alanorth

diff --git a/drivers/input/touchscreen/melfas_ts.c b/drivers/input/touchscreen/melfas_ts.c
index 2bb5b95..3b6e9c1 100755
--- a/drivers/input/touchscreen/melfas_ts.c
+++ b/drivers/input/touchscreen/melfas_ts.c
@@ -144,7 +144,8 @@
 	input_report_abs(ts->input_dev, ABS_MT_POSITION_X, x);             \
 	input_report_abs(ts->input_dev, ABS_MT_POSITION_Y, y);             \
 	input_report_abs(ts->input_dev, ABS_MT_TOUCH_MAJOR, amplitude);         \
-	input_report_abs(ts->input_dev, ABS_MT_WIDTH_MAJOR, width); \
+	input_report_abs(ts->input_dev, ABS_MT_PRESSURE, amplitude); \

alanorth

diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index 99cc4e0..ec606bf 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/media/libmedia/AudioSystem.cpp
@@ -808,6 +808,11 @@ extern "C" bool _ZN7android11AudioSystem15isLowVisibilityENS0_11stream_typeE(aud
     }
 }

+extern "C" bool _ZN7android11AudioSystem10stopOutputEiNS0_11stream_typeEi(audio_io_handle_t output, audio_stream_type_t stream, int session)
+{

alanorth

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2f54bcf..9a24e93 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -25,3 +25,7 @@ TARGET_OTA_ASSERT_DEVICE := p6200,GT-P6200
 TARGET_PREBUILT_KERNEL := device/samsung/p6200/zImage
 
 TARGET_BOOTANIMATION_NAME := horizontal-1024x600
+
+# RIL

alanorth

    <integer-array name="config_autoBrightnessLevels">
        <item>12</item>
        <item>120</item>
        <item>1200</item>
        <item>12000</item>
        <item>16000</item>
    </integer-array>

    <!-- Array of output values for LCD backlight corresponding to the LUX values
         in the config_autoBrightnessLevels array.  This array should have size one greater

alanorth

# $Id: PKGBUILD 141293 2011-10-28 08:03:28Z tpowa $
# Maintainer: Eric Cyb <cyberic99 _@_ gmail.com>
pkgname=qemu-linaro
ver=2012.05
pkgver=1.0.91_${ver}
pkgrel=1
pkgdesc="Community Improvements on A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
url="https://launchpad.net/qemu-linaro"