[maemo-commits] [maemo-commits] r17561 - projects/haf/trunk/sapwood/debian

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-03-02 12:00:47 +0200 (Mon, 02 Mar 2009)
New Revision: 17561

Added:
   projects/haf/trunk/sapwood/debian/gtk2-engines-sapwood.xsession
Modified:
   projects/haf/trunk/sapwood/debian/changelog
   projects/haf/trunk/sapwood/debian/control
   projects/haf/trunk/sapwood/debian/rules
Log:
sapwood (3.1.1-2) unstable; urgency=low

  * NB#103359: File /etc/X11/Xsession.d/03sapwood should be part of the
    sapwood package; follow instructions from NB#103318

 -- Sven Herzberg <sven at lanedo.com>  Mon,  2 Mar 2009 09:53:55 +0100


Modified: projects/haf/trunk/sapwood/debian/changelog
===================================================================
--- projects/haf/trunk/sapwood/debian/changelog	2009-03-02 09:08:50 UTC (rev 17560)
+++ projects/haf/trunk/sapwood/debian/changelog	2009-03-02 10:00:47 UTC (rev 17561)
@@ -1,3 +1,10 @@
+sapwood (3.1.1-2) unstable; urgency=low
+
+  * NB#103359: File /etc/X11/Xsession.d/03sapwood should be part of the
+    sapwood package; follow instructions from NB#103318
+
+ -- Sven Herzberg <sven at lanedo.com>  Mon,  2 Mar 2009 09:53:55 +0100
+
 sapwood (3.1.1-1) unstable; urgency=low
 
   * Fixes: NB#91010: shadowcolor option for labels (Daniel Borgmann)

Modified: projects/haf/trunk/sapwood/debian/control
===================================================================
--- projects/haf/trunk/sapwood/debian/control	2009-03-02 09:08:50 UTC (rev 17560)
+++ projects/haf/trunk/sapwood/debian/control	2009-03-02 10:00:47 UTC (rev 17561)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Tommi Komulainen <tommi.komulainen at nokia.com>
 Standards-Version: 3.6.0
-Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.8.0)
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.8.0), upstart-dev
 
 Package: gtk2-engines-sapwood
 Architecture: any

Added: projects/haf/trunk/sapwood/debian/gtk2-engines-sapwood.xsession
===================================================================
--- projects/haf/trunk/sapwood/debian/gtk2-engines-sapwood.xsession	2009-03-02 09:08:50 UTC (rev 17560)
+++ projects/haf/trunk/sapwood/debian/gtk2-engines-sapwood.xsession	2009-03-02 10:00:47 UTC (rev 17561)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# NB#22173 memory saving hack, depends on modified gtk+
+export GDK_DISABLE_XSHM=1
+/usr/sbin/dsmetool -t /usr/lib/sapwood/sapwood-server
+unset GDK_DISABLE_XSHM


Property changes on: projects/haf/trunk/sapwood/debian/gtk2-engines-sapwood.xsession
___________________________________________________________________
Name: svn:executable
   + *

Modified: projects/haf/trunk/sapwood/debian/rules
===================================================================
--- projects/haf/trunk/sapwood/debian/rules	2009-03-02 09:08:50 UTC (rev 17560)
+++ projects/haf/trunk/sapwood/debian/rules	2009-03-02 10:00:47 UTC (rev 17561)
@@ -77,6 +77,7 @@
 	dh_installdocs -a
 	dh_installchangelogs -a ChangeLog
 #	dh_installexamples -a
+	dh_installxsession -u 'pre 03'
 	dh_strip -a --dbg-package=gtk2-engines-sapwood
 	dh_compress -a
 	dh_fixperms -a
@@ -87,7 +88,7 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
-source diff:                                                                  
+source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch