Merge lp:~arky/ubuntu/karmic/qemulator/fix-257233 into lp:ubuntu/karmic/qemulator

[arky]

[arky (arky)]

fixes bug 257233

[Daniel Holbach (dholbach)]

The patch is generally fine, just a few things:
 - I changed karmic to lucid
 - I made use of cdbs patch instead of directly patching it (basically: bzr diff -r4 usr/local/lib/qemulator/qemulator.glade > debian/patches/untranslate_button_text.patch)
 - ran update-maintainer from ubuntu-dev-tools to adhere to https://wiki.ubuntu.com/DebianMaintainerField

I pushed my changes to lp:~dholbach/ubuntu/lucid/qemulator/fix-257233 you can easily merge them.

The only problem I see right now is that the current version does not build on lucid:

f [ "debian/stamp-patched" != "reverse-patches" ]; then touch debian/stamp-patched; fi
if [ "debian/stamp-patched" != "reverse-patches" ] ; then \
  /usr/bin/make -f debian/rules update-config ; \
 fi
make[1]: Entering directory `/tmp/buildd/qemulator-0.5'
make[1]: Nothing to be done for `update-config'.
make[1]: Leaving directory `/tmp/buildd/qemulator-0.5'
 fakeroot debian/rules binary
test -x debian/rules
dh_testroot
dh_clean -k
dh_installdirs -A
mkdir -p "."
dh_installdirs -pqemulator
mkdir -p debian/qemulator/usr/share
cp -a usr/local/share/* debian/qemulator/usr/share
cp -a usr/local/lib/qemulator/* debian/qemulator/usr/share/qemulator
chmod +x debian/qemulator/usr/share/qemulator/qml_imagecreation.py \
  debian/qemulator/usr/share/qemulator/qml_machinesetup.py \
  debian/qemulator/usr/share/qemulator/qml_filehandlers.py \
  debian/qemulator/usr/share/qemulator/qml_configuration.py \
  debian/qemulator/usr/share/qemulator/qml_tools.py \
  debian/qemulator/usr/share/qemulator/qml_installwizzard.py \
  debian/qemulator/usr/share/qemulator/qml_style.py
chmod -x debian/qemulator/usr/share/qemulator/icons/mac.png
convert -resize 32x32 usr/local/share/pixmaps/qemulator.svg qemulator.xpm
sh: wmf2eps: not found
convert: Delegate failed `"wmf2eps" -o "%o" "%i"' @ delegate.c/InvokeDelegate/1060.
convert: unable to open image `/tmp/magick-XXWNvBDO': No such file or directory @ blob.c/OpenBlob/2480.
convert: unable to open file `/tmp/magick-XXWNvBDO': No such file or directory @ constitute.c/ReadImage/569.
convert: missing an image filename `qemulator.xpm' @ convert.c/ConvertImageCommand/2838.
make: *** [install/qemulator] Error 1
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2
E: Failed autobuilding of package
I: unmounting dev/pts filesystem
I: unmounting proc filesystem
I: cleaning the build env

review: Needs Fixing

Unmerged revisions

5. By arky on 2009-09-10

changed 'Datei auswählen' to 'Select File' (LP: #257233)

=== modified file 'debian/changelog'
--- debian/changelog	2007-09-16 21:23:56 +0000
+++ debian/changelog	2009-09-10 09:50:23 +0000
@@ -1,3 +1,9 @@
+qemulator (0.5-3ubuntu1) karmic; urgency=low
+
+  * changed 'Datei auswählen' to 'Select File' (LP: #257233)
+
+ -- Rakesh 'arky' Ambati <[e-mail]>  Thu, 10 Sep 2009 15:18:29 +0530
+
 qemulator (0.5-3) unstable; urgency=low
 
   * debian/patches/fix_python_dir.patch: fixed to avoid patching of

=== modified file 'usr/local/lib/qemulator/qemulator.glade'
--- usr/local/lib/qemulator/qemulator.glade	2007-06-20 16:11:22 +0000
+++ usr/local/lib/qemulator/qemulator.glade	2009-09-10 09:50:23 +0000
@@ -14407,7 +14407,7 @@
 		      <child>
 			<widget class="GtkFileChooserButton" id="filechooserbutton_jobmon_cdrom">
 			  <property name="visible">True</property>
-			  <property name="title" translatable="yes">Datei auswählen</property>
+			  <property name="title" translatable="yes">Select File</property>
 			  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
 			  <property name="local_only">True</property>
 			  <property name="show_hidden">False</property>
@@ -14426,7 +14426,7 @@
 		      <child>
 			<widget class="GtkFileChooserButton" id="filechooserbutton_jobmon_fda">
 			  <property name="visible">True</property>
-			  <property name="title" translatable="yes">Datei auswählen</property>
+			  <property name="title" translatable="yes">Select File</property>
 			  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
 			  <property name="local_only">True</property>
 			  <property name="show_hidden">False</property>
@@ -14446,7 +14446,7 @@
 		      <child>
 			<widget class="GtkFileChooserButton" id="filechooserbutton_jobmon_fdb">
 			  <property name="visible">True</property>
-			  <property name="title" translatable="yes">Datei auswählen</property>
+			  <property name="title" translatable="yes">Select File</property>
 			  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
 			  <property name="local_only">True</property>
 			  <property name="show_hidden">False</property>