Ubuntu
gcompris package

Merge lp:~ubuntu-branches/ubuntu/oneiric/gcompris/oneiric-201108242027 into lp:ubuntu/oneiric/gcompris

  1. Oneiric (11.10)
  2. oneiric-201108242027
  3. Merge into oneiric
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/gcompris/oneiric-201108242027
Merge into: lp:ubuntu/oneiric/gcompris
Diff against target: 136 lines (+80/-2) (has conflicts)
7 files modified
debian/gcompris-sound-af.files (+1/-0)
debian/gcompris-sound-sl.files (+1/-0)
debian/patches/90-submarine-set-but-unused-variables.patch (+37/-0)
debian/patches/91-dont-translate-nonexisting-files.patch (+24/-0)
debian/patches/series (+2/-0)
debian/source/format (+1/-0)
src/submarine-activity/submarine.c (+14/-2)
Conflict adding file debian/gcompris-sound-af.files.  Moved existing file to debian/gcompris-sound-af.files.moved.
Conflict adding file debian/gcompris-sound-sl.files.  Moved existing file to debian/gcompris-sound-sl.files.moved.
Conflict adding file debian/patches.  Moved existing file to debian/patches.moved.
Conflict adding file debian/source.  Moved existing file to debian/source.moved.
Text conflict in src/submarine-activity/submarine.c
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/gcompris/oneiric-201108242027
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+73899@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/gcompris reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gcompris/oneiric-201108242027. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

48. By Stephane Graber <stgraber@shell01>

releasing version 9.6.1-0ubuntu2

47. By Stephane Graber <stgraber@shell01>

releasing version 9.6.1-0ubuntu1

46. By Stephane Graber <stgraber@shell01>

Merge new upstream release from Jeremy Bicha

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/gcompris-sound-af.files'
2--- debian/gcompris-sound-af.files 1970-01-01 00:00:00 +0000
3+++ debian/gcompris-sound-af.files 2011-09-02 22:56:29 +0000
4@@ -0,0 +1,1 @@
5+usr/share/gcompris/boards/voices/af
6
7=== renamed file 'debian/gcompris-sound-af.files' => 'debian/gcompris-sound-af.files.moved'
8=== added file 'debian/gcompris-sound-sl.files'
9--- debian/gcompris-sound-sl.files 1970-01-01 00:00:00 +0000
10+++ debian/gcompris-sound-sl.files 2011-09-02 22:56:29 +0000
11@@ -0,0 +1,1 @@
12+usr/share/gcompris/boards/voices/sl
13
14=== renamed file 'debian/gcompris-sound-sl.files' => 'debian/gcompris-sound-sl.files.moved'
15=== added directory 'debian/patches'
16=== renamed directory 'debian/patches' => 'debian/patches.moved'
17=== added file 'debian/patches/90-submarine-set-but-unused-variables.patch'
18--- debian/patches/90-submarine-set-but-unused-variables.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/90-submarine-set-but-unused-variables.patch 2011-09-02 22:56:29 +0000
20@@ -0,0 +1,37 @@
21+From e6453013fc33eeb3fe1c75b3db52ea0fc756357c Mon Sep 17 00:00:00 2001
22+From: Bruno Coudoin <bruno.coudoin@free.fr>
23+Date: Sat, 13 Aug 2011 22:05:54 +0000
24+Subject: submarine: fixed comilation issue with newer GCC. Fixed bug https://bugzilla.gnome.org/show_bug.cgi?id=655995
25+
26+---
27+diff --git a/src/submarine-activity/submarine.c b/src/submarine-activity/submarine.c
28+index 489a3be..616f84c 100644
29+--- a/src/submarine-activity/submarine.c
30++++ b/src/submarine-activity/submarine.c
31+@@ -466,7 +466,7 @@ static GooCanvasItem *submarine_create_item(GooCanvasItem *parent) {
32+ GdkPixbuf *pixmap = NULL;
33+ GooCanvasItem *item = NULL;
34+ char s12[12];
35+- int i, w, h;
36++ int i;
37+
38+ GooCanvasItem *rootItem = goo_canvas_group_new (parent, NULL);
39+
40+@@ -535,8 +535,6 @@ static GooCanvasItem *submarine_create_item(GooCanvasItem *parent) {
41+
42+ // DEPTH RUDDERS
43+ pixmap = gc_pixmap_load("submarine/rudder.png");
44+- w = gdk_pixbuf_get_width(pixmap);
45+- h = gdk_pixbuf_get_height(pixmap);
46+ barre_av_item = goo_canvas_image_new (rootItem,
47+ pixmap,
48+ schema_x + BARRE_AV_X,
49+@@ -713,8 +711,6 @@ static GooCanvasItem *submarine_create_item(GooCanvasItem *parent) {
50+
51+ // displays an alert when some parameters are bad
52+ pixmap = gc_pixmap_load("submarine/alert_submarine.png");
53+- w = gdk_pixbuf_get_width(pixmap);
54+- h = gdk_pixbuf_get_height(pixmap);
55+ alert_submarine = goo_canvas_image_new (rootItem,
56+ pixmap,
57+ ALERT_SUBMARINE_X,
58
59=== added file 'debian/patches/91-dont-translate-nonexisting-files.patch'
60--- debian/patches/91-dont-translate-nonexisting-files.patch 1970-01-01 00:00:00 +0000
61+++ debian/patches/91-dont-translate-nonexisting-files.patch 2011-09-02 22:56:29 +0000
62@@ -0,0 +1,24 @@
63+Description: Don't try to translate files that aren't in the source tarball
64+Forwarded: yes
65+Author: Jeremy Bicha <jbicha@ubuntu.com>
66+
67+Index: oneiric/po/POTFILES.in
68+===================================================================
69+--- oneiric.orig/po/POTFILES.in 2011-08-13 20:51:48.223049697 -0400
70++++ oneiric/po/POTFILES.in 2011-08-13 21:03:53.771452857 -0400
71+@@ -30,7 +30,6 @@
72+ boards/strategy.xml.in
73+ gcompris-edit.desktop.in
74+ gcompris.desktop.in
75+-nsis_translations.desktop.in
76+ src/administration-activity/admin/__init__.py
77+ src/administration-activity/admin/board_list.py
78+ src/administration-activity/admin/class_edit.py
79+@@ -232,7 +231,6 @@
80+ src/gcompris/board_config_combo.c
81+ src/gcompris/board_config_wordlist.c
82+ src/gcompris/bonus.c
83+-src/gcompris/cache.c
84+ src/gcompris/config.c
85+ src/gcompris/dbus.c
86+ src/gcompris/dialog.c
87
88=== added file 'debian/patches/series'
89--- debian/patches/series 1970-01-01 00:00:00 +0000
90+++ debian/patches/series 2011-09-02 22:56:29 +0000
91@@ -0,0 +1,2 @@
92+90-submarine-set-but-unused-variables.patch
93+91-dont-translate-nonexisting-files.patch
94
95=== added directory 'debian/source'
96=== renamed directory 'debian/source' => 'debian/source.moved'
97=== added file 'debian/source/format'
98--- debian/source/format 1970-01-01 00:00:00 +0000
99+++ debian/source/format 2011-09-02 22:56:29 +0000
100@@ -0,0 +1,1 @@
101+3.0 (quilt)
102
103=== modified file 'po/POTFILES.in'
104=== modified file 'src/submarine-activity/submarine.c'
105--- src/submarine-activity/submarine.c 2011-08-24 21:25:14 +0000
106+++ src/submarine-activity/submarine.c 2011-09-02 22:56:29 +0000
107@@ -535,7 +535,13 @@
108
109 // DEPTH RUDDERS
110 pixmap = gc_pixmap_load("submarine/rudder.png");
111- barre_av_item = goo_canvas_image_new (rootItem,
112+<<<<<<< TREE
113+ barre_av_item = goo_canvas_image_new (rootItem,
114+=======
115+ w = gdk_pixbuf_get_width(pixmap);
116+ h = gdk_pixbuf_get_height(pixmap);
117+ barre_av_item = goo_canvas_image_new (rootItem,
118+>>>>>>> MERGE-SOURCE
119 pixmap,
120 schema_x + BARRE_AV_X,
121 schema_y + BARRE_AV_Y,
122@@ -711,7 +717,13 @@
123
124 // displays an alert when some parameters are bad
125 pixmap = gc_pixmap_load("submarine/alert_submarine.png");
126- alert_submarine = goo_canvas_image_new (rootItem,
127+<<<<<<< TREE
128+ alert_submarine = goo_canvas_image_new (rootItem,
129+=======
130+ w = gdk_pixbuf_get_width(pixmap);
131+ h = gdk_pixbuf_get_height(pixmap);
132+ alert_submarine = goo_canvas_image_new (rootItem,
133+>>>>>>> MERGE-SOURCE
134 pixmap,
135 ALERT_SUBMARINE_X,
136 ALERT_SUBMARINE_Y,

Subscribers

People subscribed via source and target branches

to all changes: