[SCM] earth3d branch, master, updated. 935d9c5238f61846445cc2a464f5503b8ea4045c

[Aron Xu]

The following commit has been merged in the master branch:
commit 048027a38aaea7f08dffb8ce889bb206ee423967
Author: Aron Xu <aron at debian.org>
Date:   Sun Jun 26 12:38:44 2011 +0800

    First round of cleaning up old stuff.

diff --git a/debian/changelog b/debian/changelog
index a0c3f20..b53ae27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+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)
+
+ -- Aron Xu <aron at debian.org>  Sun, 26 Jun 2011 12:29:58 +0800
+
 earth3d (1.0.5-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 6868cd6..29b8a99 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
 Source: earth3d
 Section: utils
 Priority: optional
-Maintainer: Petter Reinholdtsen <pere at debian.org>
-Uploaders: Dominique Andre Gunia <webmaster at earth3d.org>, Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpatch, libqt3-mt-dev, libqt3-headers, qt3-dev-tools, imagemagick
-Standards-Version: 3.7.2
+Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Uploaders: Petter Reinholdtsen <pere at debian.org>, Dominique Andre Gunia <webmaster at earth3d.org>
+Build-Depends: debhelper, libqt3-mt-dev, libqt3-headers, qt3-dev-tools, imagemagick
+Standards-Version: 3.9.2
 
 Package: earth3d
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index fe58976..3399448 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,4 +12,4 @@ the Free Software Foundation; either version 2, or (at your option) any
 later version.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index c23fc00..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/doc/earth3d
diff --git a/debian/earth3d.desktop b/debian/earth3d.desktop
index 0e88866..d86598a 100644
--- a/debian/earth3d.desktop
+++ b/debian/earth3d.desktop
@@ -4,6 +4,6 @@ Encoding=UTF-8
 Icon=earth
 Exec=earth3d
 DocPath=
-Comment=eart3d - 3D Model of the earth
+Comment=earth3d - 3D Model of the earth
 Name=earth3d
 Categories=Qt;Education;Science
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 09dd052..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# List of patches to apply.
-#
-#10_texture_compr
diff --git a/debian/patches/10_texture_compr.dpatch b/debian/patches/10_texture_compr.dpatch
deleted file mode 100644
index 020ce4f..0000000
--- a/debian/patches/10_texture_compr.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /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.
-
- at 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
new file mode 100644
index 0000000..2647f0c
--- /dev/null
+++ b/debian/patches/10_texture_compr.patch
@@ -0,0 +1,11 @@
+--- 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/series b/debian/patches/series
new file mode 100644
index 0000000..f44b8c1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_texture_compr.patch

-- 
earth3d for Debian