[gli] 02/05: Update patch queue.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Mon Nov 21 17:04:15 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository gli.

commit 9239607b1639839b2d287887bf4cb7ebcbfa1c88
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Nov 16 15:05:41 2016 +0000

    Update patch queue.
    
    - Drop patch Discard-readme-from-docs.patch, applied upstream.
    - New patch Fix-path-to-project-logo.patch.
    - New patch Fix-project-version.patch.
    
    Gbp-Dch: full
---
 debian/patches/Discard-readme-from-docs.patch | 25 -------------------------
 debian/patches/Fix-path-to-project-logo.patch | 21 +++++++++++++++++++++
 debian/patches/Fix-project-version.patch      | 21 +++++++++++++++++++++
 debian/patches/series                         |  3 ++-
 4 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/debian/patches/Discard-readme-from-docs.patch b/debian/patches/Discard-readme-from-docs.patch
deleted file mode 100644
index 8a1e3f3..0000000
--- a/debian/patches/Discard-readme-from-docs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Mon, 3 Oct 2016 14:55:45 +0100
-Subject: Discard readme from docs.
-
-The content of the readme.md file is redundant with the documentation's main
-page. It also triggers a privacy-breach-generic lintian error due to remote
-fetching of the project logo. Better just discard it from the documentation.
----
- man.doxy | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/man.doxy b/man.doxy
-index cfe97cc..a793b74 100644
---- a/man.doxy
-+++ b/man.doxy
-@@ -779,8 +779,7 @@ INPUT                  = gli \
-                          releases.md \
-                          sample-convert.md \
-                          sample-creating-texture-object.md \
--                         copying.md \
--                         readme.md
-+                         copying.md
- 
- # This tag can be used to specify the character encoding of the source files
- # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/debian/patches/Fix-path-to-project-logo.patch b/debian/patches/Fix-path-to-project-logo.patch
new file mode 100644
index 0000000..62744c3
--- /dev/null
+++ b/debian/patches/Fix-path-to-project-logo.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Wed, 16 Nov 2016 15:37:05 +0000
+Subject: Fix path to project logo.
+
+---
+ doc/man.doxy | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/man.doxy b/doc/man.doxy
+index 82a470d..42bebbe 100644
+--- a/doc/man.doxy
++++ b/doc/man.doxy
+@@ -51,7 +51,7 @@ PROJECT_BRIEF          =
+ # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+ # the logo to the output directory.
+ 
+-PROJECT_LOGO           = G:/Source/G-Truc/gli/doc/logo.png
++PROJECT_LOGO           = logo.png
+ 
+ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+ # into which the generated documentation will be written. If a relative path is
diff --git a/debian/patches/Fix-project-version.patch b/debian/patches/Fix-project-version.patch
new file mode 100644
index 0000000..4ba77b0
--- /dev/null
+++ b/debian/patches/Fix-project-version.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Wed, 16 Nov 2016 15:08:51 +0000
+Subject: Fix project version.
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07c3af5..ffe7f29 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,7 +5,7 @@ if (NOT CMAKE_VERSION VERSION_LESS "3.1")
+ endif()
+ 
+ project(gli)
+-set(GLI_VERSION "0.8.1")
++set(GLI_VERSION "0.8.2")
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b544dd7..3c2b2ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Use-system-glm.patch
-Discard-readme-from-docs.patch
+Fix-path-to-project-logo.patch
+Fix-project-version.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gli.git



More information about the debian-science-commits mailing list