[pkg-fso-commits] [SCM] freesmartphone.org demo GUI branch, debian, updated. debian/0-git20090610-2-8-g0ff8fb3

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit c303e8023e88a848f7b21071485a6ce9d8a24685
Merge: 1241736523636437047595fd40ca79f846aa3ca3 4defa636cdf8f9209a06f92db2dca27d6c987de3
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Sep 11 16:54:50 2009 +0200

    Merge commit 'alioth/debian' into debian
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 320c77d,dbca3e3..0d3997b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,12 +1,20 @@@
- zhone (0-git20090610-3) UNRELEASED; urgency=low
++zhone (0-git20090610-4) UNRELEASED; urgency=low
 +
 +  * Break circular dependency Fix (Closes: #546196)
- 
-  -- Joachim Breitner <nomeata at debian.org>  Fri, 11 Sep 2009 16:52:03 +0200
- 
- zhone (0-git20090610-3~fso.1) pkg-fso; urgency=low
- 
 +  * Remove apm dependency, zhone has not causes suspends for several
 +    months now
 +
 + -- Joachim Breitner <nomeata at debian.org>  Fri, 24 Jul 2009 20:06:25 +0200
 +
+ zhone (0-git20090610-3) unstable; urgency=low
+ 
+   * Rename libevas-svn-02-engines-x -> libevas-svn-03-engines-x in
+     zhone Depends.
+   * Bump Standards-Version to 3.8.3, no changes needed. 
+   * Upload to unstable, since python-EFL-libs are now there.
+ 
+  -- Nikita V. Youshchenko <yoush at debian.org>  Sat, 05 Sep 2009 21:25:25 +0400
+ 
  zhone (0-git20090610-2) experimental; urgency=low
  
    [ Luca Capello ] 
diff --combined debian/control
index 3a9d815,2e9c0f4..56462cc
--- a/debian/control
+++ b/debian/control
@@@ -7,7 -7,7 +7,7 @@@ Uploaders: Joachim Breitner <nomeata at de
   Luca Capello <luca at pca.it>
  Build-Depends: debhelper (>= 7), python-dev, python-support (>= 0.5.3),
   python-setuptools, cython, libedje-bin, libecore-dev
- Standards-Version: 3.8.0
+ Standards-Version: 3.8.3
  Homepage: http://freesmartphone.org/
  Vcs-Git: git://git.debian.org/git/pkg-fso/zhone.git
  Vcs-Browser: http://git.debian.org/?p=pkg-fso/zhone.git;a=summary
@@@ -17,7 -17,7 +17,7 @@@ Provides: ${python:Provides
  Architecture: all
  Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-edbus,
   python-ecore, python-edje, python-evas, python-dbus, python-cairo,
-  libevas-svn-02-engines-x, dbus, zhone-illume-glue
 - libevas-svn-03-engines-x, dbus, zhone-illume-glue, apmd
++ libevas-svn-03-engines-x, dbus, zhone-illume-glue
  Description: freesmartphone.org demo GUI
   This is the demonstration user interfae to the freesmartphone.org software
   strack, providing a dialer, an SMS tool, access to the SIM-based address book
@@@ -29,7 -29,7 +29,7 @@@
  Package: zhone-illume-glue
  Provides: ${python:Provides}
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, zhone
 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
  Description: freesmartphone.org demo GUI - Illume interaction
   This package contains the architecture dependent parts of the zhone
   package and is not useful on it’s own.

-- 
freesmartphone.org demo GUI