[pkg-fso-commits] [fso-frameworkd] 02/20: Merge remote-tracking branch 'origin/debian' into debian

[Sebastian Reichel]

This is an automated email from the git hooks/post-receive script.

sre pushed a commit to branch debian
in repository fso-frameworkd.

commit 06b1fdf967fa31fd896af16677649d281adaf8d8
Merge: 3cf0b41 1494212
Author: Sebastian Reichel <sre at ring0.de>
Date:   Sun Nov 8 10:21:24 2015 +0100

    Merge remote-tracking branch 'origin/debian' into debian
    
    Conflicts:
    	debian/changelog

 ChangeLog                                          | 6341 ++++++++++++++++++--
 data/frameworkd.service                            |   11 +
 debian/changelog                                   |   12 +
 debian/control                                     |    3 +-
 etc/a780/frameworkd.conf                           |    2 +
 etc/{nokia900 => crespo}/frameworkd.conf           |   15 +-
 etc/eten-m800/frameworkd.conf                      |    3 +
 etc/frameworkd.conf                                |    3 +
 .../oevents/{nokia900 => crespo}/rules.yaml        |   42 +-
 etc/freesmartphone/oevents/nokia900/rules.yaml     |   24 +-
 .../oevents/{nokia900 => om-gta04}/rules.yaml      |   29 +-
 etc/freesmartphone/oevents/palmpre/rules.yaml      |    8 +-
 etc/freesmartphone/oevents/rules.yaml              |   17 +-
 etc/htcdream/frameworkd.conf                       |    3 +
 etc/htcleo/frameworkd.conf                         |    3 +
 etc/magician/frameworkd.conf                       |    3 +
 etc/nexusone/frameworkd.conf                       |    3 +
 etc/nokia900/frameworkd.conf                       |    3 +
 etc/om-gta01/frameworkd.conf                       |    3 +
 etc/om-gta02/frameworkd.conf                       |    3 +
 etc/{nokia900 => om-gta04}/frameworkd.conf         |   31 +-
 etc/palmpre/frameworkd.conf                        |    3 +
 framework/subsystems/oeventsd/action.py            |    5 +
 framework/subsystems/oeventsd/filter.py            |    4 +
 framework/subsystems/oeventsd/fso_triggers.py      |   35 +
 framework/subsystems/oeventsd/rule.py              |    2 +-
 framework/subsystems/ogpsd/__init__.py             |    0
 framework/subsystems/ogpsd/om.py                   |    5 +-
 .../subsystems/ogsmd/modems/abstract/calling.py    |   39 +-
 .../subsystems/ogsmd/modems/abstract/mediator.py   |   10 +
 .../ogsmd/modems/ti_calypso/unsolicited.py         |   40 +-
 framework/subsystems/ophoned/headset.py            |   27 +-
 framework/subsystems/ophoned/ophoned.py            |    5 +-
 framework/subsystems/opimd/domain_manager.py       |    3 +-
 framework/subsystems/otimed/otimed.py              |    5 +-
 framework/subsystems/testing/testing.py            |    6 +-
 setup.py                                           |    2 +-
 37 files changed, 6233 insertions(+), 520 deletions(-)

diff --cc debian/changelog
index 47aba43,4fe79da..aa94f9d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ fso-frameworkd (0.10.1-2) UNRELEASED; urgency=medium
+ 
+   * Remove myself from uploaders
+ 
+  -- Joachim Breitner <nomeata at debian.org>  Thu, 18 Jun 2015 21:22:12 +0200
+ 
+ fso-frameworkd (0.10.1-1) unstable; urgency=low
+ 
+   * new release 0.10.1
+ 
+  -- Rico Rommel <rico at bierrommel.de>  Sun, 13 May 2012 17:26:15 +0200
+ 
 +fso-frameworkd (0.9.5.9+git20110512-5) unstable; urgency=high
 +
 +  * Fix DBus permissions (Closes: CVE-2014-8156)
 +
 + -- Sebastian Reichel <sre at debian.org>  Tue, 20 Jan 2015 14:58:02 +0100
 +
  fso-frameworkd (0.9.5.9+git20110512-4) unstable; urgency=low
  
    * make fso-frameworkd-gta01 and fso-frameworkd-gta02 armel only,

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/fso-frameworkd.git