[gle-graphics] 19/23: Import Debian changes 4.2.5-3
Christian T. Steigies
cts at moszumanska.debian.org
Tue Oct 31 18:25:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
cts pushed a commit to branch master
in repository gle-graphics.
commit 73a430a854df97151491c0c43230331a4f37b9af
Author: Christian T. Steigies <cts at debian.org>
Date: Sat Mar 26 14:04:07 2016 +0100
Import Debian changes 4.2.5-3
gle-graphics (4.2.5-3) unstable; urgency=medium
* replace today in manual with SOURCE_DATE to build reproducibly
* update watch file
* fix typo: occurred
* use secure URIs in Vcs fields
---
debian/changelog | 9 +++++
debian/control | 4 +--
debian/patches/qmake | 8 +++--
debian/patches/replace-today-in-manual | 19 ++++++++++
debian/patches/series | 2 ++
debian/patches/source_date_epoch | 11 ++++--
debian/patches/typo-occurred | 65 ++++++++++++++++++++++++++++++++++
debian/rules | 10 +++++-
debian/watch | 2 +-
9 files changed, 120 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 663dbc7..68a7fa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gle-graphics (4.2.5-3) unstable; urgency=medium
+
+ * replace today in manual with SOURCE_DATE to build reproducibly
+ * update watch file
+ * fix typo: occurred
+ * use secure URIs in Vcs fields
+
+ -- Christian T. Steigies <cts at debian.org> Sat, 26 Mar 2016 14:04:07 +0100
+
gle-graphics (4.2.5-2) unstable; urgency=medium
* build reproducibly by passing SOURCE_DATE_EPOCH to build
diff --git a/debian/control b/debian/control
index 1435ccb..bbf4537 100644
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,8 @@ Build-Depends: automake,
texlive-latex-extra
Standards-Version: 3.9.7
Homepage: http://glx.sf.net
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gle-graphics.git
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/gle-graphics.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=debian-science/packages/gle-graphics.git
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/gle-graphics.git
Package: gle-graphics
Architecture: any
diff --git a/debian/patches/qmake b/debian/patches/qmake
index 0779e07..f09cf4b 100644
--- a/debian/patches/qmake
+++ b/debian/patches/qmake
@@ -2,9 +2,11 @@ Description: qmake uses LFLAGS not LDFLAGS
Set QMAKE_LFLAGS so that hardening flags are correctly passed on
Author: Christian T. Steigies <cts at debian.org>
Last-Update: 2014-20-21
---- a/src/gui/qgle.pro.in
-+++ b/src/gui/qgle.pro.in
-@@ -182,6 +182,6 @@
+Index: gle-graphics/src/gui/qgle.pro.in
+===================================================================
+--- gle-graphics.orig/src/gui/qgle.pro.in
++++ gle-graphics/src/gui/qgle.pro.in
+@@ -182,6 +182,6 @@ unix {
QMAKE_CXXFLAGS += @QT_CPPFLAGS@
QMAKE_CFLAGS += @QT_CPPFLAGS@
diff --git a/debian/patches/replace-today-in-manual b/debian/patches/replace-today-in-manual
new file mode 100644
index 0000000..d0959aa
--- /dev/null
+++ b/debian/patches/replace-today-in-manual
@@ -0,0 +1,19 @@
+Description: replace \today with source_date
+ To build the LaTeX manual reproducibly the date on the title
+ page is set to the source date from the debian/changelog
+ instead of \today{}
+Author: Christian T. Steigies <cts at debian.org>
+Last-Update: 2016-03-26
+Index: gle-graphics/gle-refman/title/title.tex
+===================================================================
+--- gle-graphics.orig/gle-refman/title/title.tex
++++ gle-graphics/gle-refman/title/title.tex
+@@ -58,7 +58,7 @@ C. Pugmire, St.M. Mundt, V.P. LaBella, J
+
+ \url{http://www.gle-graphics.org/}
+ \vfill
+-\today{}
++\input{title/source_date}
+ \end{center}
+
+ \pagenumbering{roman}
diff --git a/debian/patches/series b/debian/patches/series
index b52f466..82fd50d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
kfreebsd-buildd-has-no-proc
qmake
source_date_epoch
+replace-today-in-manual
+typo-occurred
diff --git a/debian/patches/source_date_epoch b/debian/patches/source_date_epoch
index 4278730..3d3684c 100644
--- a/debian/patches/source_date_epoch
+++ b/debian/patches/source_date_epoch
@@ -1,7 +1,12 @@
-Index: gle-graphics-4.2.5/src/gle/core.cpp
+Description: replace build_date with date from changelog
+ To build reproducibly build_date is set to the source date from
+ the debian/changelog
+Author: Christian T. Steigies <cts at debian.org>
+Last-Update: 2016-03-20
+Index: gle-graphics/src/gle/core.cpp
===================================================================
---- gle-graphics-4.2.5.orig/src/gle/core.cpp
-+++ gle-graphics-4.2.5/src/gle/core.cpp
+--- gle-graphics.orig/src/gle/core.cpp
++++ gle-graphics/src/gle/core.cpp
@@ -176,13 +176,24 @@ void g_get_version(string* version) {
}
diff --git a/debian/patches/typo-occurred b/debian/patches/typo-occurred
new file mode 100644
index 0000000..64adbd9
--- /dev/null
+++ b/debian/patches/typo-occurred
@@ -0,0 +1,65 @@
+Description: use correct spelling of occurred
+ Use the correct spelling of occurred
+Author: Christian T. Steigies <cts at debian.org>
+Last-Update: 2016-03-26
+Index: gle-graphics/src/gle/file_io.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/file_io.cpp
++++ gle-graphics/src/gle/file_io.cpp
+@@ -830,7 +830,7 @@ int GLESystem(const string& cmd, bool wa
+ }
+ int nbytes = write(pin[GLESYS_PIPE_WR], write_buffer+offs_write, to_write);
+ if (nbytes < 0) {
+- /* an error occured */
++ /* an error occurred */
+ if (errno != EAGAIN) {
+ GLECloseFD(pin, GLESYS_PIPE_WR);
+ }
+@@ -844,7 +844,7 @@ int GLESystem(const string& cmd, bool wa
+ while (pout[GLESYS_PIPE_RD] >= 0) {
+ int nbytes = read(pout[GLESYS_PIPE_RD], read_buffer, GLEREAD_BUF);
+ if (nbytes < 0) {
+- /* an error occured */
++ /* an error occurred */
+ if (errno != EAGAIN) {
+ GLECloseFD(pout, GLESYS_PIPE_RD);
+ }
+Index: gle-graphics/src/gui/dialogues.cpp
+===================================================================
+--- gle-graphics.orig/src/gui/dialogues.cpp
++++ gle-graphics/src/gui/dialogues.cpp
+@@ -487,7 +487,7 @@ CrashRecoverDialogue::CrashRecoverDialog
+ setWindowIcon(QIcon(":images/gle_shadow.png"));
+ setWindowTitle(tr("GLE Internal Error"));
+ crashLogLines.append(QString("The following is the error code and memory location of the error."));
+- crashLogLines.append(QString("We use this to find the line in GLE's source code where the error occured."));
++ crashLogLines.append(QString("We use this to find the line in GLE's source code where the error occurred."));
+ crashLogLines.append(QString());
+ QFile myfile(file);
+ if (myfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+Index: gle-graphics/src/gui/gsinc/iapi.h
+===================================================================
+--- gle-graphics.orig/src/gui/gsinc/iapi.h
++++ gle-graphics/src/gui/gsinc/iapi.h
+@@ -208,7 +208,7 @@ GSDLLEXPORT int GSDLLAPI gsapi_init_with
+ * The gsapi_run_* functions are like gs_main_run_* except
+ * that the error_object is omitted.
+ * If these functions return <= -100, either quit or a fatal
+- * error has occured. You then call gsapi_exit() next.
++ * error has occurred. You then call gsapi_exit() next.
+ * The only exception is gsapi_run_string_continue()
+ * which will return e_NeedInput if all is well.
+ */
+Index: gle-graphics/src/gui/main.cpp
+===================================================================
+--- gle-graphics.orig/src/gui/main.cpp
++++ gle-graphics/src/gui/main.cpp
+@@ -197,7 +197,7 @@ LONG WINAPI MyUnhandledExceptionFilter(E
+ if (hLogFile == INVALID_HANDLE_VALUE) {
+ return EXCEPTION_CONTINUE_SEARCH;
+ }
+- // Find out module in which crash occured
++ // Find out module in which crash occurred
+ CONTEXT* Context = info->ContextRecord;
+ char szCrashModulePathName[MAX_PATH*2];
+ strcpy(szCrashModulePathName, "Unknown");
diff --git a/debian/rules b/debian/rules
index 9864245..3ab0d10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,10 @@ endif
SOURCE_DATE_EPOCH=$(shell date -d "$$(dpkg-parsechangelog --count 1 -SDate)" +%s)
export DEB_CPPFLAGS_MAINT_APPEND = -DDEBIAN_EPOCH=$(SOURCE_DATE_EPOCH)
+# source date string for gle-manual
+DATE_FMT = %B %d, %Y
+SOURCE_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)")
+
%:
# dh $@ --with autoreconf
dh $@ --with autotools_dev
@@ -20,12 +24,16 @@ export DEB_CPPFLAGS_MAINT_APPEND = -DDEBIAN_EPOCH=$(SOURCE_DATE_EPOCH)
override_dh_auto_build:
make
+ echo $(SOURCE_DATE) > gle-refman/title/source_date.tex
make doc
override_dh_auto_clean:
[ ! -f Makefile ] || make distclean
# remove files which are updated by autoreconf:
- -rm aclocal.m4 configure
+ [ ! -f aclocal.m4 ] || rm aclocal.m4
+ [ ! -f configure ] || rm configure
+# remove source_date for manual:
+ [ ! -f gle-refman/title/source_date.tex ] || rm gle-refman/title/source_date.tex
override_dh_auto_configure:
-autoreconf -vfi
diff --git a/debian/watch b/debian/watch
index 133d4d5..02a6ef0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://sf.net/glx/(?i:gle)[_-](.+)\.(.+)\.(.+)[_-]src\.zip
+http://sf.net/glx/gle-graphics-([\d\.]+)-src\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gle-graphics.git
More information about the debian-science-commits
mailing list