[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/0.80.5.2-1-5-ga9be7ec

Marco Amadori marco.amadori at gmail.com
Thu Jan 14 00:58:05 UTC 2010


The following commit has been merged in the master branch:
commit 1f3db0e737b8eaac054673c1520afbf926a4bddb
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Thu Jan 14 01:38:28 2010 +0100

    Renabled Quilt for including a git upstream licence patch.

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..496a070
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,3 @@
+This package uses quilt to handle patches to upstream sources.
+
+Look at /usr/share/doc/quilt/README.source for more informations.
diff --git a/debian/control b/debian/control
index dc22216..0914f03 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Marco Amadori <marco.amadori at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~),
+ quilt (>= 0.40),
  cmake,
  asciidoc,
  docbook-xsl,
diff --git a/debian/patches/0001-Clarify-GML-license-as-per-request.patch b/debian/patches/0001-Clarify-GML-license-as-per-request.patch
new file mode 100644
index 0000000..1130b5e
--- /dev/null
+++ b/debian/patches/0001-Clarify-GML-license-as-per-request.patch
@@ -0,0 +1,147 @@
+From 46850e9463d2a4e5505299501a9765696d31797b Mon Sep 17 00:00:00 2001
+From: zerver <mr at zerver.net>
+Date: Mon, 11 Jan 2010 22:06:48 +0200
+Subject: [PATCH] Clarify GML license as per request
+
+---
+ rts/lib/gml/gml.cpp  |    5 +++--
+ rts/lib/gml/gml.h    |    5 +++--
+ rts/lib/gml/gmlcls.h |    5 +++--
+ rts/lib/gml/gmlcnt.h |    5 +++--
+ rts/lib/gml/gmldef.h |    5 +++--
+ rts/lib/gml/gmlfun.h |    5 +++--
+ rts/lib/gml/gmlimp.h |    5 +++--
+ rts/lib/gml/gmlsrv.h |    5 +++--
+ 8 files changed, 24 insertions(+), 16 deletions(-)
+
+diff --git a/rts/lib/gml/gml.cpp b/rts/lib/gml/gml.cpp
+index 3a0a7f7..c0a21da 100644
+--- a/rts/lib/gml/gml.cpp
++++ b/rts/lib/gml/gml.cpp
+@@ -3,8 +3,9 @@
+ // Author: Mattias "zerver" Radeskog
+ // (C) Ware Zerver Tech. http://zerver.net
+ // Ware Zerver Tech. licenses this library
+-// to be used freely for any purpose, as
+-// long as this notice remains unchanged
++// to be used, distributed and modified 
++// freely for any purpose, as long as 
++// this notice remains unchanged
+ 
+ // GML works by "patching" all OpenGL calls. It is injected via a #include "gml.h" statement located in myGL.h.
+ // All files that need GL should therefore include myGL.h. INCLUDING gl.h, glu.h, glext.h ... IS FORBIDDEN.
+diff --git a/rts/lib/gml/gml.h b/rts/lib/gml/gml.h
+index 2c933ae..7dfa9c7 100644
+--- a/rts/lib/gml/gml.h
++++ b/rts/lib/gml/gml.h
+@@ -3,8 +3,9 @@
+ // Author: Mattias "zerver" Radeskog
+ // (C) Ware Zerver Tech. http://zerver.net
+ // Ware Zerver Tech. licenses this library
+-// to be used freely for any purpose, as
+-// long as this notice remains unchanged
++// to be used, distributed and modified 
++// freely for any purpose, as long as 
++// this notice remains unchanged
+ 
+ #ifndef GML_H
+ #define GML_H
+diff --git a/rts/lib/gml/gmlcls.h b/rts/lib/gml/gmlcls.h
+index bc7cb88..927d041 100644
+--- a/rts/lib/gml/gmlcls.h
++++ b/rts/lib/gml/gmlcls.h
+@@ -3,8 +3,9 @@
+ // Author: Mattias "zerver" Radeskog
+ // (C) Ware Zerver Tech. http://zerver.net
+ // Ware Zerver Tech. licenses this library
+-// to be used freely for any purpose, as
+-// long as this notice remains unchanged
++// to be used, distributed and modified 
++// freely for any purpose, as long as 
++// this notice remains unchanged
+ 
+ #ifndef GMLCLASSES_H
+ #define GMLCLASSES_H
+diff --git a/rts/lib/gml/gmlcnt.h b/rts/lib/gml/gmlcnt.h
+index a7e1833..f04fa66 100644
+--- a/rts/lib/gml/gmlcnt.h
++++ b/rts/lib/gml/gmlcnt.h
+@@ -3,8 +3,9 @@
+ // Author: Mattias "zerver" Radeskog
+ // (C) Ware Zerver Tech. http://zerver.net
+ // Ware Zerver Tech. licenses this library
+-// to be used freely for any purpose, as
+-// long as this notice remains unchanged
++// to be used, distributed and modified 
++// freely for any purpose, as long as 
++// this notice remains unchanged
+ 
+ // This code is largely based on boost::detail::atomic_count
+ //
+diff --git a/rts/lib/gml/gmldef.h b/rts/lib/gml/gmldef.h
+index c29d28f..a43e4c2 100644
+--- a/rts/lib/gml/gmldef.h
++++ b/rts/lib/gml/gmldef.h
+@@ -3,8 +3,9 @@
+ // Author: Mattias "zerver" Radeskog
+ // (C) Ware Zerver Tech. http://zerver.net
+ // Ware Zerver Tech. licenses this library
+-// to be used freely for any purpose, as
+-// long as this notice remains unchanged
++// to be used, distributed and modified 
++// freely for any purpose, as long as 
++// this notice remains unchanged
+ 
+ #undef glDisable
+ #undef glEnable
+diff --git a/rts/lib/gml/gmlfun.h b/rts/lib/gml/gmlfun.h
+index 56fcae3..5b4f9b6 100644
+--- a/rts/lib/gml/gmlfun.h
++++ b/rts/lib/gml/gmlfun.h
+@@ -3,8 +3,9 @@
+ // Author: Mattias "zerver" Radeskog
+ // (C) Ware Zerver Tech. http://zerver.net
+ // Ware Zerver Tech. licenses this library
+-// to be used freely for any purpose, as
+-// long as this notice remains unchanged
++// to be used, distributed and modified 
++// freely for any purpose, as long as 
++// this notice remains unchanged
+ 
+ #ifndef GMLFUN_H
+ #define GMLFUN_H
+diff --git a/rts/lib/gml/gmlimp.h b/rts/lib/gml/gmlimp.h
+index b3e7cf9..11bbfcf 100644
+--- a/rts/lib/gml/gmlimp.h
++++ b/rts/lib/gml/gmlimp.h
+@@ -3,8 +3,9 @@
+ // Author: Mattias "zerver" Radeskog
+ // (C) Ware Zerver Tech. http://zerver.net
+ // Ware Zerver Tech. licenses this library
+-// to be used freely for any purpose, as
+-// long as this notice remains unchanged
++// to be used, distributed and modified 
++// freely for any purpose, as long as 
++// this notice remains unchanged
+ 
+ #undef glAccum
+ #undef glActiveStencilFaceEXT
+diff --git a/rts/lib/gml/gmlsrv.h b/rts/lib/gml/gmlsrv.h
+index 2eeb621..738fe22 100644
+--- a/rts/lib/gml/gmlsrv.h
++++ b/rts/lib/gml/gmlsrv.h
+@@ -3,8 +3,9 @@
+ // Author: Mattias "zerver" Radeskog
+ // (C) Ware Zerver Tech. http://zerver.net
+ // Ware Zerver Tech. licenses this library
+-// to be used freely for any purpose, as
+-// long as this notice remains unchanged
++// to be used, distributed and modified 
++// freely for any purpose, as long as 
++// this notice remains unchanged
+ 
+ #ifndef GMLSRV_H
+ #define GMLSRV_H
+-- 
+1.6.6
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7b8bf3c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Clarify-GML-license-as-per-request.patch
diff --git a/debian/rules b/debian/rules
index 2b8b77c..5860b24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,5 +43,6 @@ override_dh_auto_clean:
 	$(MAKE) -C debian/manpages clean
 
 %:
-	+dh $@
+	+dh --with quilt $@
+
 

-- 
advanced 3D real time strategy game engine



More information about the Pkg-games-commits mailing list