Bug#580586: Patch for the debian package
Hi. Attached is a patch for svn://svn.debian.org/svn/pkg-gnome/packages/unstable/emerillon/ which should fix this issue -- Łukasz [DeeJay1] Jernaś Index: debian/control === --- debian/control (wersja 24505) +++ debian/control (kopia robocza) @@ -29,7 +29,7 @@ gnome-pkg-tools, libgeoclue-dev Standards-Version: 3.8.4 -Homepage: http://www.novopia.com/emerillon/ +Homepage: http://projects.gnome.org/emerillon/ Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/emerillon/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/emerillon/ Index: debian/control.in === --- debian/control.in (wersja 24505) +++ debian/control.in (kopia robocza) @@ -24,7 +24,7 @@ gnome-pkg-tools, libgeoclue-dev Standards-Version: 3.8.4 -Homepage: http://www.novopia.com/emerillon/ +Homepage: http://projects.gnome.org/emerillon/ Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/emerillon/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/emerillon/ Index: debian/copyright === --- debian/copyright (wersja 24505) +++ debian/copyright (kopia robocza) @@ -1,7 +1,7 @@ Format-Specification: http://dep.debian.net/deps/dep5/ Name: emerillon Maintainer: Pierre-Luc Beaudoin pierre-luc.beaud...@novopia.com -Source: http://www.novopia.com/emerillon/ +Source: http://projects.gnome.org/emerillon/ Files: cut-paste/empathy-cell-renderer-activatable.* Copyright: 2007, Raphael Slinckx raph...@slinckx.net signature.asc Description: To jest część wiadomości podpisana cyfrowo
Bug#585126: Update libchamplain to 0.4.6
Package: libchamplain
Hello.
Attached is a patch which allows updating the package to the recently
released 0.4.6. It also partially fixes #561638 by adding Vala and
Python bindings.
Regards,
--
Łukasz [DeeJay1] Jernaś
Index: debian/python-champlain-0.4.install
===
--- debian/python-champlain-0.4.install (wersja 0)
+++ debian/python-champlain-0.4.install (wersja 0)
@@ -0,0 +1,2 @@
+usr/lib/python2.6/dist-packages/champlain.a
+usr/lib/python2.6/dist-packages/champlain.so
Index: debian/control
===
--- debian/control (wersja 24505)
+++ debian/control (kopia robocza)
@@ -18,12 +18,18 @@
libclutter-1.0-dev,
libclutter-gtk-0.10-dev,
libcairo2-dev (= 1.4),
+ libgconf2-dev,
libsqlite3-dev,
gobject-introspection (= 0.6.5-4~),
libgirepository1.0-dev (= 0.6.3),
gir-repository-dev,
gir1.0-gtk-2.0,
- gir1.0-clutter-1.0
+ gir1.0-clutter-1.0,
+ python-clutter-dev,
+ python-clutter-gtk-dev,
+ python-gobject-dev,
+ python-gtk2-dev,
+ valac
Standards-Version: 3.8.4
Homepage: http://projects.gnome.org/libchamplain/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libchamplain
@@ -174,3 +180,41 @@
OpenStreetMap (default), OpenArialMap and Maps for free.
.
This package contains the GObject introspection file for libchamplain-gtk.
+
+Package: python-champlain-0.4
+Architecture: any
+Depends: ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Python-Depends: python-gobject,
+python-clutter
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: C library providing ClutterActor to display maps (Python bindings)
+ Libchamplain is a C library providing a ClutterActor to
+ display maps.
+ .
+ It supports numerous free map sources such as
+ OpenStreetMap (default), OpenArialMap and Maps for free.
+ .
+ This package contains the Python bindings for libchamplain.
+
+Package: python-champlain-gtk-0.4
+Architecture: any
+Depends: ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Python-Depends: python-gobject,
+python-clutter,
+python-clutter-gtk
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: A Gtk+ widget to display maps (Python bindings)
+ Libchamplain-gtk is a C library aimed to provide a Gtk+ widget
+ to display rasterized maps and markers.
+ .
+ It supports numerous free map sources such as
+ OpenStreetMap (default), OpenArialMap and Maps for free.
+ .
+ This package contains the python bindings for libchamplain-gtk.
+
Index: debian/control.in
===
--- debian/control.in (wersja 24505)
+++ debian/control.in (kopia robocza)
@@ -13,12 +13,18 @@
libclutter-1.0-dev,
libclutter-gtk-0.10-dev,
libcairo2-dev (= 1.4),
+ libgconf2-dev,
libsqlite3-dev,
gobject-introspection (= 0.6.5-4~),
libgirepository1.0-dev (= 0.6.3),
gir-repository-dev,
gir1.0-gtk-2.0,
- gir1.0-clutter-1.0
+ gir1.0-clutter-1.0,
+ python-clutter-dev,
+ python-clutter-gtk-dev,
+ python-gobject-dev,
+ python-gtk2-dev,
+ valac
Standards-Version: 3.8.4
Homepage: http://projects.gnome.org/libchamplain/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libchamplain
@@ -169,3 +175,41 @@
OpenStreetMap (default), OpenArialMap and Maps for free.
.
This package contains the GObject introspection file for libchamplain-gtk.
+
+Package: python-champlain-0.4
+Architecture: any
+Depends: ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Python-Depends: python-gobject,
+python-clutter
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: C library providing ClutterActor to display maps (Python bindings)
+ Libchamplain is a C library providing a ClutterActor to
+ display maps.
+ .
+ It supports numerous free map sources such as
+ OpenStreetMap (default), OpenArialMap and Maps for free.
+ .
+ This package contains the Python bindings for libchamplain.
+
+Package: python-champlain-gtk-0.4
+Architecture: any
+Depends: ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Python-Depends: python-gobject,
+python-clutter,
+python-clutter-gtk
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: A Gtk+ widget to display maps (Python bindings)
+ Libchamplain-gtk is a C library aimed to
Bug#580788:
Attached is a patch by Simon Wenner which should fix the FTBFS. It will
be included in the next upstream release.
--
Łukasz Jernaś
Index: memphis/ruleset.c
===
--- memphis/ruleset.c (Revision 225)
+++ memphis/ruleset.c (Arbeitskopie)
@@ -86,16 +86,18 @@
while (*atts != NULL) {
if(strcmp((char *) *(atts), background) == 0) {
+unsigned int r, g, b, a;
if(sscanf((char *) *(atts+1),#%2x%2x%2x%2x,
-(unsigned int *)ruleset-background[0],
-(unsigned int *)ruleset-background[1],
-(unsigned int *)ruleset-background[2],
-(unsigned int *)ruleset-background[3])
+r, g, b, a)
4)
{
// Default background alpha value
-ruleset-background[3] = 255;
+a = 255;
}
+ruleset-background[0] = r;
+ruleset-background[1] = g;
+ruleset-background[2] = b;
+ruleset-background[3] = a;
}
atts+=2;
}
@@ -183,10 +185,11 @@
while (*atts != NULL) {
if(strcmp((char *) *(atts), color) == 0) {
-sscanf((char *) *(atts+1),#%2x%2x%2x,
-(unsigned int *)new-color[0],
-(unsigned int *)new-color[1],
-(unsigned int *)new-color[2]);
+unsigned int r, g, b;
+sscanf((char *) *(atts+1),#%2x%2x%2x, r, g, b);
+new-color[0] = r;
+new-color[1] = g;
+new-color[2] = b;
} else if(strcmp((char *) *(atts), width) == 0) {
sscanf((char *) *(atts+1),%f,new-width);
} else if(strcmp((char *) *(atts), pattern) == 0) {
signature.asc
Description: To jest część wiadomości podpisana cyfrowo
Bug#583357: Update libchamplain to version 0.6
Package: libchamplain
Attached is a patch for
svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libchamplain which
should update the Debian package to version 0.6 of libchamplain which
came out a few days ago.
Regards,
--
Łukasz [DeeJay1] Jernaś
Index: control
===
--- control (wersja 24408)
+++ control (kopia robocza)
@@ -18,18 +18,20 @@
libclutter-1.0-dev,
libclutter-gtk-0.10-dev,
libcairo2-dev (= 1.4),
+ libmemphis-0.2-dev,
libsqlite3-dev,
gobject-introspection (= 0.6.5-4~),
libgirepository1.0-dev (= 0.6.3),
gir-repository-dev,
gir1.0-gtk-2.0,
- gir1.0-clutter-1.0
+ gir1.0-clutter-1.0,
+ gir1.0-memphis-0.2
Standards-Version: 3.8.4
Homepage: http://projects.gnome.org/libchamplain/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libchamplain
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libchamplain/
-Package: libchamplain-0.4-0
+Package: libchamplain-0.6-0
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -54,13 +56,14 @@
.
This package contains the documentary for this package.
-Package: libchamplain-0.4-dev
+Package: libchamplain-0.6-dev
Section: libdevel
Architecture: any
-Depends: libchamplain-0.4-0 (= ${binary:Version}),
+Depends: libchamplain-0.6-0 (= ${binary:Version}),
${misc:Depends},
libglib2.0-dev,
- libclutter-1.0-dev
+ libclutter-1.0-dev,
+ libmemphis-0.2-dev
Suggests: libchamplain-doc
Description: C library providing ClutterActor to display maps (development files)
Libchamplain is a C library providing a ClutterActor to
@@ -72,11 +75,11 @@
This package contains the header files required if you wish
to develop software that uses libchamplain.
-Package: libchamplain-0.4-dbg
+Package: libchamplain-0.6-dbg
Architecture: any
Priority: extra
Section: debug
-Depends: libchamplain-0.4-0 (= ${binary:Version}),
+Depends: libchamplain-0.6-0 (= ${binary:Version}),
${misc:Depends}
Description: C library providing ClutterActor to display maps (debug symbols)
Libchamplain is a C library providing a ClutterActor to
@@ -87,7 +90,7 @@
.
This package contains debugging symbols for libchamplain
-Package: gir1.0-champlain-0.4
+Package: gir1.0-champlain-0.6
Architecture: any
Priority: extra
Depends: ${gir:Depends},
@@ -101,7 +104,7 @@
.
This package contains the GObject introspection file for libchamplain.
-Package: libchamplain-gtk-0.4-0
+Package: libchamplain-gtk-0.6-0
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -112,15 +115,15 @@
It supports numerous free map sources such as
OpenStreetMap (default), OpenArialMap and Maps for free.
-Package: libchamplain-gtk-0.4-dev
+Package: libchamplain-gtk-0.6-dev
Architecture: any
Section: libdevel
-Depends: libchamplain-gtk-0.4-0 (= ${binary:Version}),
+Depends: libchamplain-gtk-0.6-0 (= ${binary:Version}),
${misc:Depends},
libgtk2.0-dev,
libglib2.0-dev,
libclutter-1.0-dev,
- libchamplain-0.4-dev (= ${binary:Version}),
+ libchamplain-0.6-dev (= ${binary:Version}),
libclutter-gtk-0.10-dev
Description: A Gtk+ widget to display maps (development files)
Libchamplain-gtk is a C library aimed to provide a Gtk+ widget
@@ -145,11 +148,11 @@
.
This package contains documentation for libchamplain-gtk.
-Package: libchamplain-gtk-0.4-dbg
+Package: libchamplain-gtk-0.6-dbg
Architecture: any
Priority: extra
Section: debug
-Depends: libchamplain-gtk-0.4-0 (= ${binary:Version}),
+Depends: libchamplain-gtk-0.6-0 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Description: A Gtk+ widget to display maps (debug symbols)
@@ -161,7 +164,7 @@
.
This package contains debugging symbols for libchamplain-gtk.
-Package: gir1.0-gtkchamplain-0.4
+Package: gir1.0-gtkchamplain-0.6
Architecture: any
Priority: extra
Depends: ${gir:Depends},
Index: libchamplain-0.4-0.install
===
--- libchamplain-0.4-0.install (wersja 24408)
+++ libchamplain-0.4-0.install (kopia robocza)
@@ -1 +0,0 @@
-usr/lib/libchamplain-0.4.so.*
Index: control.in
===
--- control.in (wersja 24408)
+++ control.in (kopia robocza)
@@ -13,18 +13,20 @@
libclutter-1.0-dev,
libclutter-gtk-0.10-dev,
libcairo2-dev (= 1.4),
+ libmemphis-0.2-dev,
libsqlite3-dev,
gobject-introspection (= 0.6.5-4~),
libgirepository1.0-dev (= 0.6.3),
gir-repository-dev,
gir1.0-gtk-2.0,
- gir1.0-clutter-1.0
+
Bug#580788: Endiannes issue
This is an endiannes issue, backtrace from SPARC:
Reading symbols from
/home/deejay1/packaging/memphis-0.2.2/tests/.libs/lt-unit-tests...done.
(gdb) r
Starting program:
/home/deejay1/packaging/memphis-0.2.2/tests/.libs/lt-unit-tests
[Thread debugging using libthread_db enabled]
/map/new: OK
/map/free: OK
/map/load_data: OK
/map/load_file: OK
/rule/new: OK
/rule_set/new: OK
/rule_set/free: OK
/rule_set/load_data:
Program received signal SIGBUS, Bus error.
0xf7b2ceec in _IO_vfscanf () from /lib/libc.so.6
(gdb) bt
#0 0xf7b2ceec in _IO_vfscanf () from /lib/libc.so.6
#1 0xf7b31fd4 in __isoc99_vsscanf () from /lib/libc.so.6
#2 0xf7b31f2c in __isoc99_sscanf () from /lib/libc.so.6
#3 0xf7c80f90 in cfgStartElement (userData=0x6, name=0x5ca40
rules, atts=0x2dee8) at ruleset.c:89
#4 0xf7ca5b08 in doContent (parser=0x62200, startTagLevel=0, enc=0xf7cd42a4,
s=0x2ec30 rules version=\0.1\ autor=\MariusRieder\
background=\#f0f0f0\ rule e=\way\ k=\highway\ v=\*\
line color=\#00\ width=\1.0\/ /rule /rules,
end=0x2ecd9 , nextPtr=0x62218, haveMore=1 '\001')
at ../lib/xmlparse.c:2360
#5 0xf7ca6b90 in contentProcessor (parser=0x62200, start=0x2ec30
rules version=\0.1\ autor=\MariusRieder\ background=\#f0f0f0\
rule e=\way\ k=\highway\ v=\*\ line
color=\#00\ width=\1.0\/ /rule /rules,
end=0x2ecd9 , endPtr=0x62218) at ../lib/xmlparse.c:2022
#6 0xf7ca8368 in doProlog (parser=0x62200, enc=0xf7cd42a4, s=0x2ec30
rules version=\0.1\ autor=\MariusRieder\ background=\#f0f0f0\
rule e=\way\ k=\highway\ v=\*\ line
color=\#00\ width=\1.0\/ /rule /rules,
end=0x2ecd9 , tok=29, next=0x2ec30 rules version=\0.1\
autor=\MariusRieder\ background=\#f0f0f0\ rule e=\way\
k=\highway\ v=\*\ line color=\#00\
width=\1.0\/ /rule /rules, nextPtr=0x62218, haveMore=1
'\001')
at ../lib/xmlparse.c:3908
#7 0xf7ca89f0 in prologProcessor (parser=0x62200,
s=0x2ec08 ?xml version=\1.0\ encoding=\UTF-8\? rules
version=\0.1\ autor=\MariusRieder\ background=\#f0f0f0\
rule e=\way\ k=\highway\ v=\*\ line
color=\#00\ width=\1.0\/ /rule ..., end=0x2ecd9 ,
nextPtr=0x62218) at ../lib/xmlparse.c:3635
#8 0xf7c9fa8c in XML_ParseBuffer (parser=0x62200, len=value
optimized out, isFinal=0) at ../lib/xmlparse.c:1573
#9 0xf7c80c80 in rulesetRead_from_buffer (
buffer=0xd340 ?xml version=\1.0\ encoding=\UTF-8\?
rules version=\0.1\ autor=\MariusRieder\ background=\#f0f0f0\
rule e=\way\ k=\highway\ v=\*\ line
color=\#00\ width=\1.0\/ /rule ..., size=209,
error=0xd4c4) at ruleset.c:407
#10 0xf7c85520 in memphis_rule_set_load_from_data (rules=value optimized out,
data=0xd340 ?xml version=\1.0\ encoding=\UTF-8\?
rules version=\0.1\ autor=\MariusRieder\ background=\#f0f0f0\
rule e=\way\ k=\highway\ v=\*\ line
color=\#00\ width=\1.0\/ /rule ..., size=209,
error=0xd4c4) at memphis-rule-set.c:170
#11 0x000131e0 in rule_set_load_data () at unit-tests.c:120
#12 0xf7ebcaac in test_case_run (suite=0x2d290, path=0xf7f27398 ) at
/build/buildd-glib2.0_2.24.1-1-sparc-nycaVE/glib2.0-2.24.1/glib/gtestutils.c:1138
#13 g_test_run_suite_internal (suite=0x2d290, path=0xf7f27398 ) at
/build/buildd-glib2.0_2.24.1-1-sparc-nycaVE/glib2.0-2.24.1/glib/gtestutils.c:1187
#14 0xf7ebcc40 in g_test_run_suite_internal (suite=value optimized
out, path=0xf7f27398 ) at
/build/buildd-glib2.0_2.24.1-1-sparc-nycaVE/glib2.0-2.24.1/glib/gtestutils.c:1197
#15 0xf7ebcf90 in IA__g_test_run_suite (suite=0x2d210) at
/build/buildd-glib2.0_2.24.1-1-sparc-nycaVE/glib2.0-2.24.1/glib/gtestutils.c:1238
#16 0x00011564 in main (argc=1, argv=0xd814) at unit-tests.c:540
Offending code part:
if(sscanf((char *) *(atts+1),#%2x%2x%2x%2x,
(unsigned int *)ruleset-background[0],
(unsigned int *)ruleset-background[1],
(unsigned int *)ruleset-background[2],
(unsigned int *)ruleset-background[3])
4)
{
// Default background alpha value
ruleset-background[3] = 255;
}
where atts passed to the function as const char **atts
Ideas on how to fix it are welcome…
--
Łukasz [DeeJay1] Jernaś
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#580586: Homepage URL gives 404
Proper (new) URL is http://projects.gnome.org/emerillon -- Łukasz [DeeJay1] Jernaś -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
