[uqm] 11/12: switch to source format 3.0 (quilt)
Andreas Beckmann
anbe at moszumanska.debian.org
Thu Apr 7 15:43:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
anbe pushed a commit to branch master
in repository uqm.
commit a31111fb388f85dd0ecda648eedab12c613d8b1c
Author: Andreas Beckmann <anbe at debian.org>
Date: Thu Apr 7 17:27:05 2016 +0200
switch to source format 3.0 (quilt)
---
debian/changelog | 1 +
debian/control | 3 +-
debian/patches/series | 1 +
debian/patches/uqm.patch | 66 +++++++++++++++++++++++++++++++++++++++++
debian/rules | 2 +-
debian/source/format | 1 +
uqm.6 => debian/uqm.6 | 4 +--
sc2/build.sh | 2 +-
sc2/build.vars.in | 10 +++----
sc2/src/options.c | 6 +---
sc2/src/sc2code/gameopt.c | 2 +-
sc2/src/sc2code/libs/platform.h | 2 +-
12 files changed, 83 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a238bc7..603cf0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
uqm (0.6.2.dfsg-9.2) UNRELEASED; urgency=medium
* Non-maintainer upload.
+ * Switch to source format 3.0 (quilt).
* Switch to debhelper compat level 5. (Closes: #817308, #817709)
* B-D on libmikmod-dev instead of libmikmod2-dev. (Closes: #745094)
* Fix typo in short description. (Closes: #751601)
diff --git a/debian/control b/debian/control
index cd0e28e..5e9541e 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Vcs-Git: https://anonscm.debian.org/git/collab-maint/uqm.git
Package: uqm
Architecture: any
-Depends: ${shlibs:Depends}, uqm-content (>= 0.6.0)
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ uqm-content (>= 0.6.0),
Replaces: uqm-content
Recommends: uqm-music (>= 0.4)
Suggests: uqm-voice (>= 0.4)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b8c125b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+uqm.patch
diff --git a/debian/patches/uqm.patch b/debian/patches/uqm.patch
new file mode 100644
index 0000000..8b9601b
--- /dev/null
+++ b/debian/patches/uqm.patch
@@ -0,0 +1,66 @@
+Description: various changes from the uqm packaging in source format 1.0
+
+--- a/sc2/build.sh
++++ b/sc2/build.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # Build helper
+ # Copyright (c) 2002 Serge van den Boom
+ #
+--- a/sc2/build.vars.in
++++ b/sc2/build.vars.in
+@@ -29,11 +29,11 @@ ECHON='@ECHON@'
+ SED='@SED@'
+ REZ='@REZ@'
+ WINDRES='@WINDRES@'
+-uqm_CFLAGS='@CFLAGS@'
+-uqm_LDFLAGS='@LDFLAGS@'
+-uqm_INSTALL_BINDIR='@INSTALL_BINDIR@'
+-uqm_INSTALL_LIBDIR='@INSTALL_LIBDIR@'
+-uqm_INSTALL_SHAREDIR='@INSTALL_SHAREDIR@'
++uqm_CFLAGS='@CFLAGS@ -g'" $CPPFLAGS"
++uqm_LDFLAGS='@LDFLAGS@ -lm'
++uqm_INSTALL_BINDIR=$DESTDIR'@INSTALL_BINDIR@'
++uqm_INSTALL_LIBDIR=$DESTDIR'@INSTALL_LIBDIR@'
++uqm_INSTALL_SHAREDIR=$DESTDIR'@INSTALL_SHAREDIR@'
+
+ # Exported variables are available from all the Makeinfo files
+ # Non-exported files only where build.vars is explicitely included.
+--- a/sc2/src/options.c
++++ b/sc2/src/options.c
+@@ -393,7 +393,11 @@ mountDirZips (uio_MountHandle *contentHa
+ {
+ if (uio_mountDir (repository, "/", uio_FSTYPE_ZIP,
+ dirHandle, dirList->names[i], "/", autoMount,
+- uio_MOUNT_BELOW | uio_MOUNT_RDONLY,
++ /* since the debian package ships
++ * unpacked files, let zip files
++ * override them, instead of the
++ * other way around */
++ uio_MOUNT_ABOVE | uio_MOUNT_RDONLY,
+ contentHandle) == NULL)
+ {
+ log_add (log_Error, "Warning: Could not mount '%s': %s.",
+--- a/sc2/src/sc2code/gameopt.c
++++ b/sc2/src/sc2code/gameopt.c
+@@ -1149,7 +1149,7 @@ ChangeGameSelection:
+
+ t.baseline.x = r.corner.x + 3;
+ if (((SUMMARY_DESC *)pMS->Extra)[NewState - SHIFT + i].year_index == 0)
+- sprintf (buf, GAME_STRING (SAVEGAME_STRING_BASE + 3)); // "Empty Slot"
++ sprintf (buf, "%s", GAME_STRING (SAVEGAME_STRING_BASE + 3)); // "Empty Slot"
+ else
+ {
+ DateToString (buf2, sizeof buf2,
+--- a/sc2/src/sc2code/libs/platform.h
++++ b/sc2/src/sc2code/libs/platform.h
+@@ -18,7 +18,7 @@
+ #define PLATFORM_H_
+
+ #if defined(USE_PLATFORM_ACCEL)
+-# if defined(__GNUC__) && (defined(i386) || defined(__x86_64__))
++# if defined(__GNUC__) && (defined(i386))
+ # define MMX_ASM
+ # define GCC_ASM
+ # elif (_MSC_VER >= 1100) && defined(_M_IX86)
diff --git a/debian/rules b/debian/rules
index 214f3f3..2f03d39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ binary-arch: build install
dh_installchangelogs sc2/ChangeLog
dh_installdocs sc2/AUTHORS sc2/README sc2/BUGS \
sc2/WhatsNew sc2/Contributing
- dh_installman uqm.6
+ dh_installman debian/uqm.6
dh_installmenu
dh_link
dh_strip
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/uqm.6 b/debian/uqm.6
similarity index 98%
rename from uqm.6
rename to debian/uqm.6
index 86c368d..d4454a7 100644
--- a/uqm.6
+++ b/debian/uqm.6
@@ -22,7 +22,7 @@ values are 640x480 and 320x240.
.TP
.B \-f, \-\-fullscreen
Uses full screen mode. Pretty straightforward. Usually good to
-combine with -r 320x240.
+combine with -r 320x240.
.TP
.B \-o, \-\-opengl
Use OpenGL drivers. This produces higher-quality graphics, and may be
@@ -79,7 +79,7 @@ Replace \fIaddon\fR by the name of an add-on to enable in the game. May be
specified multiple times.
.TP
.B \-\-sound openal | mixsdl | none
-Specifies which driver/mixer to use. Default is mixsdl.
+Specifies which driver/mixer to use. Default is mixsdl.
openal is only available when it has been compiled in.
It may produce higher-quality sound and will probably be faster,
but it is not very stable on linux platforms, and may not work
diff --git a/sc2/build.sh b/sc2/build.sh
index e450d6f..51d2f1c 100755
--- a/sc2/build.sh
+++ b/sc2/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Build helper
# Copyright (c) 2002 Serge van den Boom
#
diff --git a/sc2/build.vars.in b/sc2/build.vars.in
index 23ecdca..c0c9d32 100644
--- a/sc2/build.vars.in
+++ b/sc2/build.vars.in
@@ -29,11 +29,11 @@ ECHON='@ECHON@'
SED='@SED@'
REZ='@REZ@'
WINDRES='@WINDRES@'
-uqm_CFLAGS='@CFLAGS@ -g'" $CPPFLAGS"
-uqm_LDFLAGS='@LDFLAGS@ -lm'
-uqm_INSTALL_BINDIR=$DESTDIR'@INSTALL_BINDIR@'
-uqm_INSTALL_LIBDIR=$DESTDIR'@INSTALL_LIBDIR@'
-uqm_INSTALL_SHAREDIR=$DESTDIR'@INSTALL_SHAREDIR@'
+uqm_CFLAGS='@CFLAGS@'
+uqm_LDFLAGS='@LDFLAGS@'
+uqm_INSTALL_BINDIR='@INSTALL_BINDIR@'
+uqm_INSTALL_LIBDIR='@INSTALL_LIBDIR@'
+uqm_INSTALL_SHAREDIR='@INSTALL_SHAREDIR@'
# Exported variables are available from all the Makeinfo files
# Non-exported files only where build.vars is explicitely included.
diff --git a/sc2/src/options.c b/sc2/src/options.c
index 71716fe..8891856 100644
--- a/sc2/src/options.c
+++ b/sc2/src/options.c
@@ -393,11 +393,7 @@ mountDirZips (uio_MountHandle *contentHandle, uio_DirHandle *dirHandle)
{
if (uio_mountDir (repository, "/", uio_FSTYPE_ZIP,
dirHandle, dirList->names[i], "/", autoMount,
- /* since the debian package ships
- * unpacked files, let zip files
- * override them, instead of the
- * other way around */
- uio_MOUNT_ABOVE | uio_MOUNT_RDONLY,
+ uio_MOUNT_BELOW | uio_MOUNT_RDONLY,
contentHandle) == NULL)
{
log_add (log_Error, "Warning: Could not mount '%s': %s.",
diff --git a/sc2/src/sc2code/gameopt.c b/sc2/src/sc2code/gameopt.c
index 42936c9..afd89d8 100644
--- a/sc2/src/sc2code/gameopt.c
+++ b/sc2/src/sc2code/gameopt.c
@@ -1149,7 +1149,7 @@ ChangeGameSelection:
t.baseline.x = r.corner.x + 3;
if (((SUMMARY_DESC *)pMS->Extra)[NewState - SHIFT + i].year_index == 0)
- sprintf (buf, "%s", GAME_STRING (SAVEGAME_STRING_BASE + 3)); // "Empty Slot"
+ sprintf (buf, GAME_STRING (SAVEGAME_STRING_BASE + 3)); // "Empty Slot"
else
{
DateToString (buf2, sizeof buf2,
diff --git a/sc2/src/sc2code/libs/platform.h b/sc2/src/sc2code/libs/platform.h
index 72c0151..8ab6919 100644
--- a/sc2/src/sc2code/libs/platform.h
+++ b/sc2/src/sc2code/libs/platform.h
@@ -18,7 +18,7 @@
#define PLATFORM_H_
#if defined(USE_PLATFORM_ACCEL)
-# if defined(__GNUC__) && (defined(i386))
+# if defined(__GNUC__) && (defined(i386) || defined(__x86_64__))
# define MMX_ASM
# define GCC_ASM
# elif (_MSC_VER >= 1100) && defined(_M_IX86)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/uqm.git
More information about the Pkg-games-commits
mailing list