WiiCan

Merge lp://staging/~fontanon/wiican/karmic into lp://staging/~wiicanteam/wiican/wiican-dev

  1. karmic
  2. Merge into wiican-dev
Proposed by J. Félix Ontañón
Status: Merged
Approved by: J. Félix Ontañón
Approved revision: not available
Merged at revision: not available
Proposed branch: lp://staging/~fontanon/wiican/karmic
Merge into: lp://staging/~wiicanteam/wiican/wiican-dev
Diff against target: 157 lines (+51/-21)
7 files modified
about.glade (+13/-13)
debian/changelog (+19/-0)
debian/control (+5/-5)
debian/copyright (+1/-1)
debian/install (+0/-1)
debian/upstart (+12/-0)
po/es.po (+1/-1)
To merge this branch: bzr merge lp://staging/~fontanon/wiican/karmic
Reviewer Review Type Date Requested Status
J. Félix Ontañón Pending
Review via email: mp+16628@code.staging.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'about.glade'
2--- about.glade 2009-04-12 22:08:36 +0000
3+++ about.glade 2009-12-28 23:12:21 +0000
4@@ -1,18 +1,18 @@
5-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
6-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
7-<!--*- mode: xml -*-->
8+<?xml version="1.0"?>
9 <glade-interface>
10+ <!-- interface-requires gtk+ 2.12 -->
11+ <!-- interface-naming-policy toplevel-contextual -->
12 <widget class="GtkAboutDialog" id="WiiAboutDialog">
13 <property name="border_width">5</property>
14 <property name="destroy_with_parent">True</property>
15- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
16+ <property name="type_hint">normal</property>
17 <property name="program_name">WiiCan</property>
18- <property name="version">0.1.1</property>
19- <property name="copyright" translatable="yes">2009 J. Félix Ontañón &lt;felixonta@gmail.com&gt;</property>
20+ <property name="version">0.2</property>
21+ <property name="copyright" translatable="yes">2009 J. F&#xE9;lix Onta&#xF1;&#xF3;n &lt;felixonta@gmail.com&gt;</property>
22 <property name="comments" translatable="yes">Yes wii can
23 Wiimote usage assistant and mapping manager</property>
24- <property name="website">http://dev.emergya.info/projects/show/wiican</property>
25- <property name="website_label" translatable="yes">http://dev.emergya.info/projects/show/wiican</property>
26+ <property name="website">http://launchpad.net/wiican</property>
27+ <property name="website_label" translatable="yes">http://launchpad.net/wiican</property>
28 <property name="license" translatable="yes">
29 GNU GENERAL PUBLIC LICENSE
30 Version 3, 29 June 2007
31@@ -689,9 +689,9 @@
32 Public License instead of this License. But first, please read
33 &lt;http://www.gnu.org/philosophy/why-not-lgpl.html&gt;.
34 </property>
35- <property name="authors">J. Félix Ontañón &lt;felixonta@gmail.com&gt;</property>
36+ <property name="authors">J. F&#xE9;lix Onta&#xF1;&#xF3;n &lt;felixonta@gmail.com&gt;</property>
37 <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
38- <property name="artists">J. Félix Ontañon &lt;felixonta@gmail.com&gt;
39+ <property name="artists">J. F&#xE9;lix Onta&#xF1;on &lt;felixonta@gmail.com&gt;
40 Yann Papouin &lt;yann.papouin@gmail.com&gt;</property>
41 <property name="logo_icon_name">wiican</property>
42 <property name="wrap_license">True</property>
43@@ -699,11 +699,11 @@
44 <child internal-child="vbox">
45 <widget class="GtkVBox" id="dialog-vbox1">
46 <child internal-child="action_area">
47- <widget class="GtkHButtonBox" id="dialog-action_area1">
48- </widget>
49+ <widget class="GtkHButtonBox" id="dialog-action_area1"/>
50 <packing>
51 <property name="expand">False</property>
52- <property name="pack_type">GTK_PACK_END</property>
53+ <property name="pack_type">end</property>
54+ <property name="position">0</property>
55 </packing>
56 </child>
57 </widget>
58
59=== modified file 'debian/changelog'
60--- debian/changelog 2009-04-12 22:08:36 +0000
61+++ debian/changelog 2009-12-28 23:12:21 +0000
62@@ -1,3 +1,22 @@
63+wiican (0.2-2) karmic; urgency=low
64+
65+ * Bugfix on upstart job config file
66+
67+ -- J. Félix Ontañón <felixonta@gmail.com> Mon, 28 Dec 2009 23:46:52 +0100
68+
69+wiican (0.2-1) karmic; urgency=low
70+
71+ * Packaged new version
72+
73+ -- J. Félix Ontañón <felixonta@gmail.com> Mon, 28 Dec 2009 22:52:34 +0100
74+
75+wiican (0.1.1-2) karmic; urgency=low
76+
77+ * Ported to karmic
78+ * Added upstart job for loading uinput with right perms
79+
80+ -- J. Félix Ontañón <felixonta@gmail.com> Mon, 28 Dec 2009 13:01:11 +0100
81+
82 wiican (0.1.1-1) unstable; urgency=low
83
84 * Initial release (Closes: #5)
85
86=== modified file 'debian/control'
87--- debian/control 2009-04-29 22:37:13 +0000
88+++ debian/control 2009-12-28 23:12:21 +0000
89@@ -3,14 +3,14 @@
90 Priority: extra
91 Maintainer: J. Félix Ontañón <felixonta@gmail.com>
92 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), python-support (>= 0.5.3),
93- python-all-dev (>= 2.3.5-11), gettext
94-Standards-Version: 3.8.0
95-Homepage: http://dev.emergya.info/projects/show/wiican
96+ python-dev (>= 2.3.5-11), gettext
97+Standards-Version: 3.8.3
98+Homepage: http://launchpad.net/wiican
99
100 Package: wiican
101 Architecture: any
102-Depends: ${misc:Depends}, ${python:Depends}, bluez-gnome, wminput, python-gtk2,
103- python-yaml, python-dbus
104+Depends: ${misc:Depends}, ${python:Depends}, gnome-bluetooth, wminput, python-gtk2,
105+ python-yaml, python-dbus, upstart
106 XB-Python-Version: ${python:Versions}
107 Description: Simple wiimote usage assistant and mapping manager
108 Wiican it's an user-friendly systray application for use
109
110=== modified file 'debian/copyright'
111--- debian/copyright 2009-04-12 22:08:36 +0000
112+++ debian/copyright 2009-12-28 23:12:21 +0000
113@@ -1,7 +1,7 @@
114 This package was debianized by J. Félix Ontañón <felixonta@gmail.com> on
115 Sat, 28 Mar 2009 14:00:45 +0100.
116
117-It was downloaded from http://dev.emergya.info/projects/show/wiican
118+It was downloaded from http://launchpad.net/wiican
119
120 Upstream Author:
121
122
123=== removed file 'debian/install'
124--- debian/install 2009-03-28 19:12:01 +0000
125+++ debian/install 1970-01-01 00:00:00 +0000
126@@ -1,1 +0,0 @@
127-udev-rules/* /etc/udev/rules.d/
128
129=== added file 'debian/upstart'
130--- debian/upstart 1970-01-01 00:00:00 +0000
131+++ debian/upstart 2009-12-28 23:12:21 +0000
132@@ -0,0 +1,12 @@
133+# dmesg - save kernel messages
134+#
135+# This task saves the initial kernel message log.
136+
137+description "loads uinput with read/write for all"
138+
139+start on started udev
140+
141+script
142+ modprobe uinput
143+ chmod 0666 /dev/uinput
144+end script
145
146=== modified file 'po/es.po'
147--- po/es.po 2009-05-05 22:46:15 +0000
148+++ po/es.po 2009-12-28 23:12:21 +0000
149@@ -5,7 +5,7 @@
150 #
151 msgid ""
152 msgstr ""
153-"Project-Id-Version: 0.1.1\n"
154+"Project-Id-Version: 0.2\n"
155 "Report-Msgid-Bugs-To: \n"
156 "POT-Creation-Date: 2009-05-06 00:38+0200\n"
157 "PO-Revision-Date: 2009-04-30 00:09+0200\n"

Subscribers

People subscribed via source and target branches