The following commit has been merged in the master branch:
commit a51393fc5a86c2ac0de87c774fef39c77b99efb4
Author: Aron Xu <a...@debian.org>
Date: Mon Jun 27 17:29:04 2011 +0800
Update various fields to make lintian calm.
diff --git a/debian/changelog b/debian/changelog
index b14f9c2..6646257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,19 @@
earth3d (1.0.5-2) UNRELEASED; urgency=low
* Team upload by Debian GIS Project.
- * Use 3.0 (quilt) format, convert patch to quilt.
- * debian/compact: Use 7 instead of ancient 4.
- * debian/copyright: Reference to GPL-2 instead of obsolete GPL.
- * debian/dirs: Removed, useless.
- * debian/earth3d.desktop: Fix typo (Closes: 550034).
+ * Use 3.0 (quilt) format, dh compact 7.
+ * debian/copyright:
+ - Reference to GPL-2 instead of obsolete GPL.
+ - Add valid copyright info.
+ * debian/earth3d.desktop:
+ - Fix typo (Closes: 550034).
+ - Remove Encoding key.
+ * debian/earth3d.menu:
+ - Move from Apps/Science to Applications/Science/Geoscience.
+ * debian/rules:
+ - Don't ignore clean errors.
+ - Use dh_prep instead of dh_clean -k.
+ * debian/control: Add ${misc:Depends}.
* debian/patches/20_png_library.patch:
Fix FTBFS with binutils-gold by linking to libpng,
Thanks Ilya Barygin (Closes: #554314).
diff --git a/debian/control b/debian/control
index 29b8a99..0a68f08 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: utils
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Petter Reinholdtsen <p...@debian.org>, Dominique Andre Gunia
<webmas...@earth3d.org>
-Build-Depends: debhelper, libqt3-mt-dev, libqt3-headers, qt3-dev-tools,
imagemagick
+Build-Depends: debhelper (>=7), dpatch, libqt3-mt-dev, libqt3-headers,
qt3-dev-tools, imagemagick
Standards-Version: 3.9.2
Package: earth3d
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Map client displaying a 3D model of the world
The map data is fetched from a server on the net, and the client will
display recent satellite images and map data.
diff --git a/debian/copyright b/debian/copyright
index 3399448..8b992b5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ It was downloaded from <URL:http://earth3d.org/>
Upstream Author: Dominique Andre Gunia <webmas...@earth3d.org>
-Copyright:
+Copyright 2005-2008 Dominique Andre Gunia <webmas...@earth3d.org>
These programs are free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/earth3d.desktop b/debian/earth3d.desktop
index d86598a..8fd05c9 100644
--- a/debian/earth3d.desktop
+++ b/debian/earth3d.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Application
-Encoding=UTF-8
Icon=earth
Exec=earth3d
DocPath=
diff --git a/debian/earth3d.menu b/debian/earth3d.menu
index 06987aa..ad158ec 100644
--- a/debian/earth3d.menu
+++ b/debian/earth3d.menu
@@ -1,6 +1,6 @@
?package(earth3d):\
needs="X11"\
- section="Apps/Science"\
+ section="Applications/Science/Geoscience"\
title="Earth3D"\
command="/usr/bin/earth3d"\
icon="/usr/share/pixmaps/earth.xpm"
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..e0a1ebe
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,5 @@
+#
+# List of patches to apply.
+#
+10_texture_compr
+20_png_library
diff --git a/debian/patches/10_texture_compr.dpatch
b/debian/patches/10_texture_compr.dpatch
new file mode 100755
index 0000000..020ce4f
--- /dev/null
+++ b/debian/patches/10_texture_compr.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian/patches/10_texture_compr.dpatch by Petter Reinholdtsen
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable use of compressed textures to get the textures to show
+## DP: up on the maintainers display.
+
+@DPATCH@
+--- earth3d-1.0.3.orig/earth3d.pro
++++ earth3d-1.0.3/earth3d.pro
+@@ -49,7 +49,7 @@
+ DEFINES += QT_THREAD_SUPPORT
+ # DEFINES += DAVE
+ # DEFINES += FORWARD_VIEW_DRAW
+-DEFINES += USE_GL_TEXTURE_COMPRESSION
++# DEFINES += USE_GL_TEXTURE_COMPRESSION
+ # DEFINES += SCREENSHOT_ALWAY_BIND_TEXTURE
+ # DEFINES += DEBUG_SPHERES
+ # # DEFINES += USE_ICON_BLENDING
diff --git a/debian/patches/10_texture_compr.patch
b/debian/patches/10_texture_compr.patch
deleted file mode 100644
index 2647f0c..0000000
--- a/debian/patches/10_texture_compr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/earth3d.pro
-+++ b/earth3d.pro
-@@ -50,7 +50,7 @@
- # DEFINES += NO_MULTITEXTURE
- # DEFINES += DAVE
- # DEFINES += FORWARD_VIEW_DRAW
--DEFINES += USE_GL_TEXTURE_COMPRESSION
-+# DEFINES += USE_GL_TEXTURE_COMPRESSION
- # DEFINES += SCREENSHOT_ALWAY_BIND_TEXTURE
- # DEFINES += DEBUG_SPHERES
- # # DEFINES += USE_ICON_BLENDING
diff --git a/debian/patches/20_png_library.dpatch
b/debian/patches/20_png_library.dpatch
new file mode 100755
index 0000000..5a8e3a8
--- /dev/null
+++ b/debian/patches/20_png_library.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_png_library.dpatch by Ilya Barygin <bary...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Link against PNG library to fix FTBFS.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git'
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
earth3d-1.0.5~/earth3d.pro earth3d-1.0.5/earth3d.pro
+--- earth3d-1.0.5~/earth3d.pro 2005-10-28 05:06:01.000000000 +0400
++++ earth3d-1.0.5/earth3d.pro 2011-01-10 15:30:19.000000000 +0300
+@@ -67,7 +67,7 @@
+ # QMAKE_CXXFLAGS_DEBUG += -D EARTH3DDEBUG -D DEBUG
+ CONFIG += qt thread opengl warn_on release stl
+
+-# LIBS += -lglut
++LIBS += -lpng
+ # DEFINES += STATISTIC_NODECOUNT
+ INCLUDEPATH += /usr/include/libxml2/libxml /usr/include/libxml2
../../network/rubyAgents/c ../../dataserver /sw/include /usr/X11R6/include/
/sw/include/libxml2 geometry/ network/ draw/ tree/ ./
+
diff --git a/debian/patches/20_png_library.patch
b/debian/patches/20_png_library.patch
deleted file mode 100644
index 9d2d2e7..0000000
--- a/debian/patches/20_png_library.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From: Ilya Barygin <bary...@gmail.com>
-Subject: Fix FTBFS with binutils-gold by linking to libpng
-Bug-Debian: 554314
---- a/earth3d.pro
-+++ b/earth3d.pro
-@@ -68,6 +68,7 @@
- CONFIG += qt thread opengl warn_on release stl
-
- # LIBS += -lglut
-+LIBS += -lpng
- # DEFINES += STATISTIC_NODECOUNT
- INCLUDEPATH += /usr/include/libxml2/libxml /usr/include/libxml2
../../network/rubyAgents/c ../../dataserver /sw/include /usr/X11R6/include/
/sw/include/libxml2 geometry/ network/ draw/ tree/ ./
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 257a208..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-10_texture_compr.patch
-20_png_library.patch
diff --git a/debian/rules b/debian/rules
index b56f02e..9b27c82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,8 +49,7 @@ clean: unpatch
rm -f debian/earth.xpm
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
-
+ [ ! -f Makefile ] || $(MAKE) distclean
rm -f Makefile
dh_clean
@@ -59,7 +58,7 @@ install: install-arch #install-indep
install-indep:
dh_testdir
dh_testroot
- dh_clean -k -i
+ dh_prep
dh_installdirs -i
# dh_movefiles -i
@@ -67,7 +66,7 @@ install-indep:
install-arch: debian/earth.xpm
dh_testdir
dh_testroot
- dh_clean -k -a
+ dh_prep
dh_installdirs -a
dh_installman
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
earth3d for Debian
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
