Package: boson
Version: 0.13-3
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch
You may find the attached patch useful so we can sync next time.
Thanks and have a nice day :)
Stefan
*** /tmp/tmpgqGMSc
In Ubuntu, we've applied the attached patch to achieve the following:
* Merge from Debian unstable. (LP: #212250) Remaining Ubuntu changes:
- Modify Maintainer value to match Debian-Maintainer-Field Spec
- Added patch ubuntu_ftbfs_fixes to fix FTBFS on amd64 and ia64
(Changed placement in debian/patches/series to work with fix_python
patch from Debian.)
* Added patch ubuntu_fix_desktop_files.diff to fix all .desktop files
in boson/data to be freedesktop compliant
We thought you might be interested in doing the same.
-- System Information:
Debian Release: lenny/sid
APT prefers hardy-updates
APT policy: (500, 'hardy-updates'), (500, 'hardy-security'), (500,
'hardy-proposed'), (500, 'hardy-backports'), (500, 'hardy')
Architecture: i386 (i686)
Kernel: Linux 2.6.24-15-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -u boson-0.13/debian/patches/series boson-0.13/debian/patches/series
--- boson-0.13/debian/patches/series
+++ boson-0.13/debian/patches/series
@@ -1,3 +1,4 @@
+ubuntu_fix_desktop_files.diff
fix_glGetString_with_amd64.diff
boson_0_13_upstream_fixes.diff
fix_gcc-4.2.diff
@@ -8,0 +10 @@
+ubuntu_ftbfs_fixes
diff -u boson-0.13/debian/changelog boson-0.13/debian/changelog
diff -u boson-0.13/debian/control boson-0.13/debian/control
--- boson-0.13/debian/control
+++ boson-0.13/debian/control
@@ -1,7 +1,8 @@
Source: boson
Section: games
Priority: optional
-Maintainer: Debian Games Team <[EMAIL PROTECTED]>
+Maintainer: Ubuntu MOTU Developers <[EMAIL PROTECTED]>
+XSBC-Original-Maintainer: Debian Games Team <[EMAIL PROTECTED]>
Uploaders: Gonéri Le Bouder <[EMAIL PROTECTED]>, Alexander Schmehl <[EMAIL PROTECTED]>, Barry deFreese <[EMAIL PROTECTED]>
Build-Depends: debhelper (>> 5.0.0), libkdegames-dev, wml, libqt3-mt-dev,
kdelibs4-dev, lib3ds-dev, docbook-to-man, kdemultimedia-dev,
only in patch2:
unchanged:
--- boson-0.13.orig/debian/patches/ubuntu_ftbfs_fixes
+++ boson-0.13/debian/patches/ubuntu_ftbfs_fixes
@@ -0,0 +1,30 @@
+Index: boson-0.13/boson/gameengine/script/pythonscript.cpp
+===================================================================
+--- boson-0.13.orig/boson/gameengine/script/pythonscript.cpp 2008-04-05 16:40:52.000000000 +0200
++++ boson-0.13/boson/gameengine/script/pythonscript.cpp 2008-04-05 16:42:28.000000000 +0200
+@@ -688,7 +688,12 @@
+ // variables or submodules dict if possible.
+ PyObject* key;
+ PyObject* value;
++#if defined(__x86_64__) || defined(__ia64__)
++ long pos = 0;
++#else
+ Py_ssize_t pos = 0;
++#endif
++
+ while(PyDict_Next(moduledict, &pos, &key, &value))
+ {
+ // Check if value is any of the known types
+@@ -774,7 +779,12 @@
+ boDebug(700) << k_funcinfo << "Loading and merging " << PyDict_Size(submodules) << " submodules" << endl;
+ PyObject* key;
+ PyObject* value;
++#if defined(__x86_64__) || defined(__ia64__)
++ long pos = 0;
++#else
+ Py_ssize_t pos = 0;
++#endif
++
+ while(PyDict_Next(submodules, &pos, &key, &value))
+ {
+ // Check if current module already has module with this name
only in patch2:
unchanged:
--- boson-0.13.orig/debian/patches/ubuntu_fix_desktop_files.diff
+++ boson-0.13/debian/patches/ubuntu_fix_desktop_files.diff
@@ -0,0 +1,52 @@
+Index: boson-0.13/boson/data/boson-boinfo.desktop
+===================================================================
+--- boson-0.13.orig/boson/data/boson-boinfo.desktop 2008-04-05 16:01:39.000000000 +0200
++++ boson-0.13/boson/data/boson-boinfo.desktop 2008-04-05 16:02:47.000000000 +0200
+@@ -1,12 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
++Version=1.0
+ Name=Boson Info
+ GenericName=Boson System Information
+ Exec=boinfo
+ Icon=boson
+-Path=
+ X-DocPath=boson/index.html
+ Type=Application
+ Terminal=false
+ Categories=Qt;KDE;Game;StrategyGame;
+-
+Index: boson-0.13/boson/data/boson-boson.desktop
+===================================================================
+--- boson-0.13.orig/boson/data/boson-boson.desktop 2008-04-05 16:01:54.000000000 +0200
++++ boson-0.13/boson/data/boson-boson.desktop 2008-04-05 16:03:09.000000000 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Encoding=UTF-8
++Version=1.0
+ Name=Boson
+ Name[de]=Boson
+ Name[fr]=Boson
+@@ -12,6 +12,4 @@
+ X-DocPath=boson/index.html
+ Terminal=false
+ Type=Application
+-Path=
+ Categories=Qt;KDE;Game;StrategyGame;
+-
+Index: boson-0.13/boson/data/boson-bounit.desktop
+===================================================================
+--- boson-0.13.orig/boson/data/boson-bounit.desktop 2008-04-05 16:02:01.000000000 +0200
++++ boson-0.13/boson/data/boson-bounit.desktop 2008-04-05 16:03:29.000000000 +0200
+@@ -1,10 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
++Version=1.0
+ GenericName=Unit Editor for Boson
+ Name=BoUnit
+ Exec=bounit
+ Icon=boson
+-Path=
+ X-DocPath=boson/index.html
+ Type=Application
+ Terminal=false
