Hi maintainer,

I have prepared a NMU fixing the three bugs listed, 

diff -Nru googleearth-package-1.1.0/debian/changelog 
googleearth-package-1.1.0+nmu1/debian/changelog
--- googleearth-package-1.1.0/debian/changelog    2013-10-16 22:48:33.000000000 
+0200
+++ googleearth-package-1.1.0+nmu1/debian/changelog    2014-09-08 
12:15:14.000000000 +0200
@@ -1,3 +1,22 @@
+googleearth-package (1.1.0+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  [ Filip Sohajek ]
+  * make-googleearth-package: Now finishes without error (LP: #1335021)
+  [ Samuele Battarra ]
+  * Make googleearth-package work also when the path
+    has special characters inside.
+    (Closes: #757120, #606351)
+  [ Glenn Washburn ]
+  * make the package work with curl (Closes: #702301).
+  * allow resuming interrupted downloads (Closes: #702302).
+  [ Robert Grimm ]
+  * Don't create an empty Suggests field (Closes: #606310).
+  [ Gianfranco Costamagna ]
+  * Bump standard version to 3.9.5, no changes required.
+
+ -- Gianfranco Costamagna <costamagnagianfra...@yahoo.it>  Mon, 08 Sep 2014 
11:51:00 +0200
+
 googleearth-package (1.1.0) unstable; urgency=low
 
   * Removed dependency on ia32-libs package by isolating the
diff -Nru googleearth-package-1.1.0/debian/control 
googleearth-package-1.1.0+nmu1/debian/control
--- googleearth-package-1.1.0/debian/control    2013-09-28 17:15:25.000000000 
+0200
+++ googleearth-package-1.1.0+nmu1/debian/control    2014-09-08 
11:33:11.000000000 +0200
@@ -5,7 +5,7 @@
 Homepage: http://earth.google.com
 Build-Depends: debhelper (>= 9), install-info
 Build-Depends-Indep: asciidoc, docbook2x
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/collab-maint/googleearth-package.git
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=collab-maint/googleearth-package.git
 
diff -Nru googleearth-package-1.1.0/make-googleearth-package 
googleearth-package-1.1.0+nmu1/make-googleearth-package
--- googleearth-package-1.1.0/make-googleearth-package    2013-10-07 
17:20:34.000000000 +0200
+++ googleearth-package-1.1.0+nmu1/make-googleearth-package    2014-09-08 
12:07:28.000000000 +0200
@@ -49,9 +49,9 @@
   local downloader
 
   if [ -x $wget ]; then
-    downloader=$wget
+    downloader="$wget -c"
   elif [ -x $curl ]; then
-    downloader=$curl
+    downloader="$curl -O -C -"
   else
     1>&2
     echo 'Either wget or curl is required to download Google Earth!'
@@ -361,7 +361,13 @@
 Maintainer: $OPT_FULLNAME <${OPT_EMAIL}>
 Architecture: $(dpkg-architecture -qDEB_BUILD_ARCH)
 Depends: fonts-liberation, libfreeimage3, lsb-core, libqtcore4, 
libgl1-mesa-glx, libglu1-mesa $ia32libs
+EOF
+if [ -n "$suggests" ]; then
+  cat <<EOF >>control
 Suggests: $suggests
+EOF
+fi
+  cat <<EOF >>control
 Description: Google Earth, a 3D map/planet viewer
  Package built with googleearth-package.
 EOF
@@ -383,13 +389,14 @@
   mkdir "$instdir" "$tmpdir"
 
   ln "$OPT_FILE" "$tmpdir"
-  sh "$OPT_FILE" --tar -xvf -C "$tmpdir" >&2
+  cd "$tmpdir"
+  sh "$OPT_FILE" --tar -xvf >&2
 
   cd "$instdir"
   mkdir -p usr/lib/googleearth
   cd usr/lib/googleearth
-  tar -xf "$tmpdir"/googleearth-linux-x86.tar
-  tar -xf "$tmpdir"/googleearth-data.tar
+  tar -xf "$tmpdir/googleearth-linux-x86.tar"
+  tar -xf "$tmpdir/googleearth-data.tar"
 
   # removed with 0.6.0 
   # Workaround symbol problem in libcrypto
@@ -459,7 +466,7 @@
 
   cd ..
   find "$instdir" -type d -print0 | xargs -0 chmod 755
-  if ( fakeroot dpkg-deb -b "$instdir" . >&2 ; ) ; then
+  if ( fakeroot -- dpkg-deb -b "$instdir" . >&2 ; ) ; then
     rm -rf "$instdir" "$tmpdir"
     return 0
   else





thanks,


Gianfranco

Attachment: debdiff
Description: Binary data

Reply via email to