[pkg-fso-commits] [SCM] freesmartphone.org demo GUI branch, debian, updated. debian/0-git20090202-3-6-g9394c27

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 1e85f517f004e46324561ad9a1800d580fcced3e
Merge: 45549db8e84894206469edaf29ca0336b29ea947 5332a6a2d9b9d89d3435dca1af0e3e31abf81c51
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Jul 21 12:49:28 2009 +0200

    Merge commit 'upstream/0-git20090610' into debian
    
    Conflicts:
    	setup.py

diff --combined debian/changelog
index 5942f5a,0000000..3ceab4d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,106 -1,0 +1,112 @@@
++zhone (0-git20090610-1) UNRELEASED; urgency=low
++
++  * New upstream release. This is after milestone 5.5 
++
++ -- Joachim Breitner <nomeata at debian.org>  Tue, 21 Jul 2009 12:49:00 +0200
++
 +zhone (0-git20090202-2) pkg-fso; urgency=low
 +
 +  * Depend on libevas-engines (>= 0.9.9.050+svn20090204) instead of
 +    libevas-0.9.9.050a-engines. 
 +
 + -- Nikita V. Youshchenko <yoush at debian.org>  Mon, 09 Mar 2009 22:09:23 +0300
 +
 +zhone (0-git20090202-1) pkg-fso; urgency=low
 +
 +  * New upstream release. This is milestone 5 
 +
 + -- Joachim Breitner <nomeata at debian.org>  Mon, 02 Feb 2009 22:51:28 +0100
 +
 +zhone (0-git20090108-1) pkg-fso; urgency=low
 +
 +  * Depend on libevas-0.9.9.050a-engines instead of libevas-engines.
 +  * Set Maintainer: to Pkg-Fso group, and Uploaders:
 +    to Joachim Breitner and myself.   
 +
 + -- Nikita V. Youshchenko <yoush at debian.org>  Tue, 13 Jan 2009 08:30:03 +0300
 +
 +zhone (0-git20090108-0.1) experimental; urgency=low
 +
 +  * Non-maintainer upload.
 +  * New upstream git snapshot:
 +    + display current timezone
 +    + try unlocking the screen on incoming calls
 +    + enhance the display of GPS data
 +    + do not use ListObjectsByInterface, if not necessary
 +    + stop redrawing on every GPS message
 +
 + -- Nikita V. Youshchenko <yoush at debian.org>  Sat, 10 Jan 2009 00:29:54 +0300
 +
 +zhone (0-git20081127-1) pkg-fso; urgency=low
 +
 +  * New upstream git snapshot:
 +    + Show the name from the phonebook 
 +
 + -- Joachim Breitner <nomeata at debian.org>  Thu, 27 Nov 2008 00:36:49 +0100
 +
 +zhone (0-git20081111-1) pkg-fso; urgency=low
 +
 +  * New upstream release (milestone 4) 
 +
 + -- Joachim Breitner <nomeata at debian.org>  Tue, 18 Nov 2008 16:03:08 +0100
 +
 +zhone (0-git20080909-1) pkg-fso; urgency=low
 +
 +  * New upstream release (milestone 3) 
 +    Fixes: "string index out of range" in comparePhoneNumber when trying
 +    to read SMS (Closes: #496350)
 +
 + -- Joachim Breitner <nomeata at debian.org>  Fri, 12 Sep 2008 00:35:08 +0200
 +
 +zhone (0-git20080809-4) pkg-fso; urgency=low
 +
 +  * Description and copyright file added
 +  * Depend on apmd
 +
 +  Cherry picked patches:
 +  * Handle non-complete phone numbers in the phonebook
 +
 + -- Joachim Breitner <nomeata at debian.org>  Sun, 24 Aug 2008 14:58:39 +0200
 +
 +zhone (0-git20080809-3) pkg-fso; urgency=low
 +
 +  * Separate out binaries to debian-illume-glue
 +  * Vcs-Header added, using git:// url
 +  * Explicitly depend on dbus
 +
 +  Cherry picked paches:
 +  * sms: Replace newlines for list view
 +  * setup.py: Only compile theme on "build"
 +
 + -- Joachim Breitner <nomeata at debian.org>  Mon, 11 Aug 2008 16:33:40 -0300
 +
 +zhone (0-git20080809-2) pkg-fso; urgency=low
 +
 +  * Actually merge the upstream changes into the debian branch 
 +
 + -- Joachim Breitner <nomeata at debian.org>  Sat, 09 Aug 2008 18:24:08 -0300
 +
 +zhone (0-git20080809-1) pkg-fso; urgency=low
 +
 +  New upstream snapshot up to patch ff4c5c02ee9fea489f7a37a6d4bd9e8475f76cc3 
 +
 +  [ Luca Capello ]
 +  * debian/control: depend on libevas-engines
 +
 +  [ Joachim Breitner ]
 +  * setup.py: Only compile theme on "build"
 +  * More build dependencies
 +
 + -- Joachim Breitner <nomeata at debian.org>  Sat, 09 Aug 2008 17:40:02 -0300
 +
 +zhone (0-git20080808-1) pkg-fso; urgency=low
 +
 +  * New upstream image, without automake cruft 
 +
 + -- Joachim Breitner <nomeata at debian.org>  Sat, 09 Aug 2008 00:47:26 -0300
 +
 +zhone (0-git20080731-1) pkg-fso; urgency=low
 +
 +  * Initial release.
 +
 + -- Joachim Breitner <nomeata at debian.org>  Fri, 08 Aug 2008 23:08:17 -0300
diff --combined setup.py
index 3f4feb7,ec73bbc..02d32d3
--- a/setup.py
+++ b/setup.py
@@@ -36,9 -36,10 +36,10 @@@ setup
                   'clean'    : my_clean  },
      scripts = [ "src/zhone" ],
      data_files = [
 -        ( "zhone", ["data/themes/zhone.edj"] ),
 -        ( "zhone/locale/ru/LC_MESSAGES", ["data/locale/ru/LC_MESSAGES/zhone.mo"] ),
 -        ( "zhone/locale/pl/LC_MESSAGES", ["data/locale/pl/LC_MESSAGES/zhone.mo"] ),
 -        ( "pixmaps", ["data/launcher/zhone.png"] ),
 -        ( "applications", ["data/launcher/zhone.desktop"] ),
 +        ( "share/zhone", ["data/themes/zhone.edj"] ),
 +        ( "locale/ru/LC_MESSAGES", ["data/locale/ru/LC_MESSAGES/zhone.mo"] ),
++        ( "locale/ru/LC_MESSAGES", ["data/locale/pl/LC_MESSAGES/zhone.mo"] ),
 +        ( "share/pixmaps", ["data/launcher/zhone.png"] ),
 +        ( "share/applications", ["data/launcher/zhone.desktop"] ),
          ]
  )

-- 
freesmartphone.org demo GUI