[med-svn] [galileo] 01/01: Some cleanups

Fri May 27 22:08:46 UTC 2016

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

bob.dybian-guest pushed a commit to branch master
in repository galileo.

commit d2f49d55ff4b62437a3a1e9e5dd2afac37c130d1
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Thu May 26 23:34:08 2016 +0200

    Some cleanups
---
 debian/99-fitbit.rules                | 11 ++++++++++-
 debian/TODO                           |  1 -
 debian/control                        | 15 ++++++++-------
 debian/{galileo.docs => docs}         |  0
 debian/examples                       |  5 +++++
 debian/{galileo.install => install}   |  0
 debian/{galileo.manpages => manpages} |  0
 debian/patches/01.Fix_unicode.patch   | 27 +++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 debian/rules                          |  2 +-
 10 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/debian/99-fitbit.rules b/debian/99-fitbit.rules
index 41baf3f..2420a02 100644
--- a/debian/99-fitbit.rules
+++ b/debian/99-fitbit.rules
@@ -1 +1,10 @@
-SUBSYSTEM=="usb", ATTR{idVendor}=="2687", ATTR{idProduct}=="fb01", SYMLINK+="fitbit", MODE="0660"
+# These udev rules are for the Fitbit Bluetooth USB dongle which is used by
+# Galileo to securely synchronize a Fitbit device with the Fitbit web service.
+
+# Please do not activate these rules at the same time!
+
+# Rule for running galileo as a non-privileged user and not as a daemon.
+SUBSYSTEM=="usb", ATTR{idVendor}=="2687", ATTR{idProduct}=="fb01", SYMLINK+="fitbit", MODE="0666"
+
+# Rule for running galileo as a daemon under the "galileo" account.
+#SUBSYSTEM=="usb", ATTR{idVendor}=="2687", ATTR{idProduct}=="fb01", SYMLINK+="fitbit", MODE="0660", OWNER="galileo", GROUP="galileo"
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index dd7401c..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- Switch to python3 when fully supported (probably with the final 5.0)
diff --git a/debian/control b/debian/control
index cc099c9..072b127 100644
--- a/debian/control
+++ b/debian/control
@@ -5,22 +5,23 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Dylan Aïssi <bob.dybian at gmail.com>
 Build-Depends: debhelper (>= 9),
  dh-python,
- python-all,
- python-setuptools,
- python-usb (>= 1.0.0~b2),
- python-requests (>= 2)
+ python3-all,
+ python3-setuptools,
+ python3-usb (>= 1.0.0~b2),
+ python3-requests (>= 2)
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/git/debian-med/galileo.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/galileo.git
 Homepage: https://bitbucket.org/benallard/galileo/
 X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.4
 
 Package: galileo
 Architecture: all
 Depends: ${misc:Depends},
- ${python:Depends},
- python-usb (>= 1.0.0~b2),
- python-requests (>= 2)
+ ${python3:Depends},
+ python3-usb (>= 1.0.0~b2),
+ python3-requests (>= 2)
 Description: Utility to securely synchronize a Fitbit device with the Fitbit web service
  Galileo is a Python utility to securely synchronize a Fitbit device with the
  Fitbit web service. It allows you to browse your data on their website, and
diff --git a/debian/galileo.docs b/debian/docs
similarity index 100%
rename from debian/galileo.docs
rename to debian/docs
diff --git a/debian/examples b/debian/examples
new file mode 100644
index 0000000..9e51112
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1,5 @@
+# Example files to run Galileo as a daemon
+contrib/*
+
+# Example configuration file for Galileo
+galileorc.sample
\ No newline at end of file
diff --git a/debian/galileo.install b/debian/install
similarity index 100%
rename from debian/galileo.install
rename to debian/install
diff --git a/debian/galileo.manpages b/debian/manpages
similarity index 100%
rename from debian/galileo.manpages
rename to debian/manpages
diff --git a/debian/patches/01.Fix_unicode.patch b/debian/patches/01.Fix_unicode.patch
new file mode 100644
index 0000000..b45170b
--- /dev/null
+++ b/debian/patches/01.Fix_unicode.patch
@@ -0,0 +1,27 @@
+Author: Dylan Aïssi <bob.dybian at gmail.com>
+Description: Fix an UnicodeDecodeError with python3.
+# UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 30: ordinal not in range(128)
+# http://python-future.org/compatible_idioms.html
+Forwarded: TODO
+Last-Update: 2015-05-27
+
+--- a/setup.py
++++ b/setup.py
+@@ -4,6 +4,8 @@
+ import re
+ import sys
+ 
++from io import open
++
+ try:
+     from setuptools import setup, find_packages, Command
+ except ImportError:
+@@ -40,7 +42,7 @@
+             if regex.search(content) is None:
+                 raise ValueError('file %s mention the wrong version' % filename)
+ 
+-with open('README.txt') as file:
++with open('README.txt',  encoding='utf8') as file:
+     long_description = file.read()
+ 
+ setup(
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eef8c36
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01.Fix_unicode.patch
diff --git a/debian/rules b/debian/rules
index 95bc444..7906a8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export PYBUILD_NAME=galileo
 
 %:
-	dh $@ --with python2 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_test:
 	echo "Skipping tests: Tests require a Fitbit dongle..."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/galileo.git

