[SCM] Rasmol packaging branch, master, updated. debian/2.7.4.2-5-67-g5e12029
Teemu Ikonen
tpikonen at gmail.com
Sun May 19 20:41:36 UTC 2013
The following commit has been merged in the master branch:
commit 5bf8272f412319e9af5d2ecdbad0e9e58ee10c19
Author: Teemu Ikonen <tpikonen at gmail.com>
Date: Sun May 19 21:44:06 2013 +0200
Refresh debian/patches
diff --git a/debian/patches/01_gtkabout.patch b/debian/patches/01_gtkabout.patch
index 1df5e9a..161fb3d 100644
--- a/debian/patches/01_gtkabout.patch
+++ b/debian/patches/01_gtkabout.patch
@@ -5,7 +5,7 @@ X-git-branch: p/gtkabout
Fix icon in GTK About dialog.
src/gtkwin.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gtkwin.c b/src/gtkwin.c
index f5b70ac..828a94a 100755
diff --git a/debian/patches/02_imakefile.patch b/debian/patches/02_imakefile.patch
index 5e10edf..fc98698 100644
--- a/debian/patches/02_imakefile.patch
+++ b/debian/patches/02_imakefile.patch
@@ -2,11 +2,11 @@ From: Teemu Ikonen <tpikonen at gmail.com>
Subject: Debian changes to Imakefile.
X-git-branch: p/imakefile
- src/Imakefile | 28 ++++++++++++++--------------
- 1 files changed, 14 insertions(+), 14 deletions(-)
+ src/Imakefile | 30 ++++++++++++++++--------------
+ 1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/Imakefile b/src/Imakefile
-index b5a88dd..83dddea 100755
+index b5a88dd..c389b65 100755
--- a/src/Imakefile
+++ b/src/Imakefile
@@ -1,8 +1,8 @@
@@ -50,7 +50,7 @@ index b5a88dd..83dddea 100755
#ifndef USE_XFORMSLIB
-@@ -332,23 +332,23 @@ LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \
+@@ -332,26 +332,28 @@ LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \
#
#ifdef HPArchitecture
@@ -80,3 +80,8 @@ index b5a88dd..83dddea 100755
#endif
#endif
++CCOPTIONS = $(shell dpkg-buildflags --get CFLAGS)
++LOCAL_LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+
+ ComplexProgramTarget(rasmol)
+ MakeDirectories(install,$(RASMOLDIR))
diff --git a/debian/patches/03_intwidth.patch b/debian/patches/03_intwidth.patch
index 817d740..f1951a2 100644
--- a/debian/patches/03_intwidth.patch
+++ b/debian/patches/03_intwidth.patch
@@ -3,7 +3,7 @@ Subject: rasmol.h: Use C99 exact-width ints in typedefs.
X-git-branch: p/intwidth
src/rasmol.h | 18 ++++++++----------
- 1 files changed, 8 insertions(+), 10 deletions(-)
+ 1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/rasmol.h b/src/rasmol.h
index 94e3640..b6cde5e 100755
diff --git a/debian/patches/04_spinbuttons.patch b/debian/patches/04_spinbuttons.patch
index 6be3437..bd0c14b 100644
--- a/debian/patches/04_spinbuttons.patch
+++ b/debian/patches/04_spinbuttons.patch
@@ -9,7 +9,7 @@ X-git-branch: p/spinbuttons
src/sizechooser.glade | 29 +++++++++++++++++++----------
- 1 files changed, 19 insertions(+), 10 deletions(-)
+ 1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/sizechooser.glade b/src/sizechooser.glade
index 77b3d99..da8bdbe 100644
diff --git a/debian/patches/05_gtkexport.patch b/debian/patches/05_gtkexport.patch
index b0187db..7e439b1 100644
--- a/debian/patches/05_gtkexport.patch
+++ b/debian/patches/05_gtkexport.patch
@@ -15,7 +15,7 @@ X-git-branch: p/gtkexport
Also, replace int with uintptr_t when casting pointers to ints.
src/gtkwin.c | 425 +++++++++++++++++++++++++++++++---------------------------
- 1 files changed, 226 insertions(+), 199 deletions(-)
+ 1 file changed, 226 insertions(+), 199 deletions(-)
diff --git a/src/gtkwin.c b/src/gtkwin.c
index f5b70ac..2a324b3 100755
diff --git a/debian/patches/06_manfix.patch b/debian/patches/06_manfix.patch
index d8a072d..20ee7f4 100644
--- a/debian/patches/06_manfix.patch
+++ b/debian/patches/06_manfix.patch
@@ -3,7 +3,7 @@ Subject: Rasmol man page fixes.
X-git-branch: p/manfix
doc/rasmol.1 | 22 +++++++++++-----------
- 1 files changed, 11 insertions(+), 11 deletions(-)
+ 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/doc/rasmol.1 b/doc/rasmol.1
index 85df72c..fec7275 100644
diff --git a/debian/patches/08_gtk-tiff-lzw.patch b/debian/patches/08_gtk-tiff-lzw.patch
index fc41d25..1bd40c6 100644
--- a/debian/patches/08_gtk-tiff-lzw.patch
+++ b/debian/patches/08_gtk-tiff-lzw.patch
@@ -3,7 +3,7 @@ Subject: Write TIFFs with LZW compression in GTK version.
X-git-branch: p/gtk-tiff-lzw
src/gtkwin.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/gtkwin.c b/src/gtkwin.c
index f5b70ac..14eddee 100755
diff --git a/debian/patches/09_glibsubheaders.patch b/debian/patches/09_glibsubheaders.patch
new file mode 100644
index 0000000..9fccff4
--- /dev/null
+++ b/debian/patches/09_glibsubheaders.patch
@@ -0,0 +1,26 @@
+From: Teemu Ikonen <tpikonen at gmail.com>
+Subject: Do not include individual glib headers.
+X-git-branch: p/glibsubheaders
+
+Starting with glib 2.32 it is now mandatory to include glib.h instead
+of individual headers, or the compiler will generate an error.
+
+Fixes Debian bug #665605.
+
+
+ src/egg-macros.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/egg-macros.h b/src/egg-macros.h
+index 9a7caad..5a128ff 100644
+--- a/src/egg-macros.h
++++ b/src/egg-macros.h
+@@ -9,7 +9,7 @@
+ #ifndef _EGG_MACROS_H_
+ #define _EGG_MACROS_H_
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
diff --git a/debian/patches/10_format-security.patch b/debian/patches/10_format-security.patch
new file mode 100644
index 0000000..b65941a
--- /dev/null
+++ b/debian/patches/10_format-security.patch
@@ -0,0 +1,49 @@
+From: Teemu Ikonen <tpikonen at gmail.com>
+Subject: Make rasmol compile with -Werror=format-security
+X-git-branch: p/format-security
+
+Fix sprintf calls which fail when compiling with -werror=format-security.
+
+ src/command.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/command.c b/src/command.c
+index 83da7ff..93e38be 100755
+--- a/src/command.c
++++ b/src/command.c
+@@ -1286,7 +1286,7 @@ void ShowRecordCommand( void ) {
+ if (record_on[1]) WriteString("record appearance on\n");
+ else WriteString("record apperance off\n");
+ if (RecordMaxMS == 1.) {
+- sprintf(param,RecordTemplate);
++ sprintf(param, "%s", RecordTemplate);
+ } else{
+ sprintf(param,RecordTemplate,millisec<0?0:millisec);
+ }
+@@ -1381,7 +1381,7 @@ void ShowPlayCommand( void ) {
+ WriteString(param);
+ }
+ if (PlayMaxMS == 1.) {
+- sprintf(param,PlayTemplate);
++ sprintf(param, "%s", PlayTemplate);
+ } else{
+ sprintf(param,PlayTemplate,millisec<0?0:millisec);
+ }
+@@ -1469,7 +1469,7 @@ void WriteMovieFrame( void ) {
+ RecordPause = True;
+ } else {
+ if (RecordMaxMS == 1.) {
+- sprintf(param,RecordTemplate);
++ sprintf(param, "%s", RecordTemplate);
+ } else{
+ sprintf(param,RecordTemplate,millisec);
+ }
+@@ -1505,7 +1505,7 @@ static int PlayMovieFrame( void ) {
+ for (play_frame[1] = 0;play_frame[1]<=millisec; play_frame[1]++)
+ {
+ if (RecordMaxMS == 1.) {
+- sprintf(param,PlayTemplate);
++ sprintf(param, "%s", PlayTemplate);
+ } else{
+ sprintf(param,PlayTemplate,millisec-play_frame[1]);
+ }
diff --git a/debian/patches/09_RESOLUTION.patch b/debian/patches/11_RESOLUTION.patch
similarity index 100%
rename from debian/patches/09_RESOLUTION.patch
rename to debian/patches/11_RESOLUTION.patch
diff --git a/debian/patches/series b/debian/patches/series
index ab93f57..47724ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,6 @@
06_manfix.patch
07_CONFLICTS_IN_gtk-tiff-lzw.patch
08_gtk-tiff-lzw.patch
-09_RESOLUTION.patch
+09_glibsubheaders.patch
+10_format-security.patch
+11_RESOLUTION.patch
--
Rasmol packaging
More information about the debian-science-commits
mailing list