Merge lp:~clint-fewbar/ubuntu/maverick/googleearth-package/add-lsb-core into lp:ubuntu/maverick/googleearth-package

[Clint Byrum]

Adds lsb-core, backporting the fix from 0.6.0

[Stefano Rivera (stefanor)]

FTBFS:

dh_gencontrol
dpkg-gencontrol: error: the Depends field contains an arch-specific dependency but the package is architecture all
dh_gencontrol: dpkg-gencontrol -ldebian/changelog -Tdebian/googleearth-package.substvars -Pdebian/googleearth-package returned exit code 255
make: *** [binary-indep] Error 9
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

Stefano you got to this before I could try building it myself, thanks, and sorry for wasting any of your time!

I just pushed up a change to debian/control that fixes this, and still produces useful packages.

[lp:~clint-fewbar/ubuntu/maverick/googleearth-package/add-lsb-core]

9. By Clint Byrum on 2010-12-12

debian/control: fixing FTBFS, removing arch specific deps and
adding shlibs:Depends and misc:Depends.

[Stefano Rivera (stefanor)]

Uploaded to maverick-proposed

review: Approve

Unmerged revisions

9. By Clint Byrum on 2010-12-12

debian/control: fixing FTBFS, removing arch specific deps and
adding shlibs:Depends and misc:Depends.

8. By Clint Byrum on 2010-12-12

Adding lsb-core to depends of generated package (LP: #682934)

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-05 19:56:48 +0000
+++ debian/changelog	2010-12-12 15:00:41 +0000
@@ -1,3 +1,11 @@
+googleearth-package (0.5.7ubuntu0.1) maverick-proposed; urgency=low
+
+  * Adding lsb-core to depends of generated package (LP: #682934)
+  * debian/control: fixing FTBFS, removing arch specific deps and
+    adding shlibs:Depends and misc:Depends.
+
+ -- Clint Byrum <[e-mail]>  Sun, 12 Dec 2010 06:49:52 -0800
+
 googleearth-package (0.5.7) unstable; urgency=high
  
   * Workaround symbol problem in libcrypto prevents googleearth from 

=== modified file 'debian/control'
--- debian/control	2009-12-05 19:56:48 +0000
+++ debian/control	2010-12-12 15:00:41 +0000
@@ -1,7 +1,8 @@
 Source: googleearth-package
 Section: contrib/misc
 Priority: optional
-Maintainer: Adnan Hodzic <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Adnan Hodzic <[e-mail]>
 Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: asciidoc, docbook2x
 Standards-Version: 3.8.3
@@ -10,7 +11,7 @@
 
 Package: googleearth-package
 Architecture: all
-Depends: wget | curl, dpkg-dev, fakeroot, bzip2, file, x11-common, x11-utils, ia32-libs [amd64 ia64], ia32-libs-gtk [amd64 ia64], lib32nss-mdns [amd64]
+Depends: wget | curl, dpkg-dev, fakeroot, bzip2, file, x11-common, x11-utils, ${shlibs:Depends}, ${misc:Depends}
 Description: utility to automatically build a Debian package of Google Earth
  Google Earth is a 3D planet viewer that lets you interactively navigate
  satellite imagery, maps, terrain, and so forth.

=== modified file 'make-googleearth-package'
--- make-googleearth-package	2009-12-05 19:56:48 +0000
+++ make-googleearth-package	2010-12-12 15:00:41 +0000
@@ -350,7 +350,7 @@
 Priority: optional
 Maintainer: $OPT_FULLNAME <${OPT_EMAIL}>
 Architecture: $(dpkg-architecture -qDEB_BUILD_ARCH)
-Depends: ttf-dejavu | ttf-bitstream-vera | msttcorefonts, $depends $ia32libs
+Depends: ttf-dejavu | ttf-bitstream-vera | msttcorefonts, lsb-core, $depends $ia32libs
 Description: Google Earth, a 3D map/planet viewer
  Package built with googleearth-package.
 EOF