r14479 - in software/ui: . debian debian/source src
Miriam Ruiz
miriam at alioth.debian.org
Tue Aug 13 21:43:39 UTC 2013
Author: miriam
Date: 2013-08-13 21:43:39 +0000 (Tue, 13 Aug 2013)
New Revision: 14479
Modified:
software/ui/configure.ac
software/ui/debian/changelog
software/ui/debian/control
software/ui/debian/rules
software/ui/debian/source/format
software/ui/src/goplay.cpp
software/ui/src/pkgbrowser.cpp
Log:
Fix the package so that it builds again
Modified: software/ui/configure.ac
===================================================================
--- software/ui/configure.ac 2013-08-13 07:03:11 UTC (rev 14478)
+++ software/ui/configure.ac 2013-08-13 21:43:39 UTC (rev 14479)
@@ -25,6 +25,10 @@
LIBTAGCOLL2_DEFS
LIBEPT_DEFS
+PKG_CHECK_MODULES([LIBWIBBLE], [libwibble])
+PKG_CHECK_MODULES([LIBEPT], [libept])
+PKG_CHECK_MODULES([LIBTAGCOLL2], [libtagcoll2])
+
dnl Look for apt-get
AC_PATH_PROG(APTGET, apt-get, /usr/bin/apt-get)
AC_SUBST(APTGET)
Modified: software/ui/debian/changelog
===================================================================
--- software/ui/debian/changelog 2013-08-13 07:03:11 UTC (rev 14478)
+++ software/ui/debian/changelog 2013-08-13 21:43:39 UTC (rev 14479)
@@ -1,13 +1,29 @@
-goplay (0.5-2) UNRELEASED; urgency=low
+goplay (0.6-1) UNRELEASED; urgency=low
+ [ Petter Reinholdtsen ]
* Add code to download screen shots from screenshot.debian.net
(Closes: #659846). Add build dependency on libcurl4-gnutls-dev
to get HTTP download support.
* Restructure code, move code to find screen shots to its own
function.
- -- Petter Reinholdtsen <pere at debian.org> Mon, 27 Feb 2012 10:55:24 +0100
+ [ Miriam Ruiz ]
+ * Added dh-autoreconf to Build-Depends and using it in debian/rules
+ * Upgraded Standards-Version from 3.9.2 to 3.9.4
+ -- Miriam Ruiz <miriam at debian.org> Tue, 13 Aug 2013 23:26:18 +0200
+
+goplay (0.5-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Build the convenience library with -fPIC, avoiding issues with
+ relocations (Closes: #664950):
+ + use--fPIC-for-the-convenience-library.diff
+ * Set urgency to “high” for the RC bug fix, needed for the apt
+ transition.
+
+ -- Cyril Brulebois <kibi at debian.org> Tue, 08 May 2012 01:44:14 +0200
+
goplay (0.5-1) unstable; urgency=low
* Acknowledge NMU (Closes: #659534).
Modified: software/ui/debian/control
===================================================================
--- software/ui/debian/control 2013-08-13 07:03:11 UTC (rev 14478)
+++ software/ui/debian/control 2013-08-13 21:43:39 UTC (rev 14479)
@@ -1,20 +1,20 @@
Source: goplay
Section: admin
-Priority: extra
+Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders:
- Miriam Ruiz <little_miry at yahoo.es>,
+ Miriam Ruiz <miriam at debian.org>,
Enrico Zini <enrico at debian.org>,
Jonas Smedegaard <dr at jones.dk>,
Petter Reinholdtsen <pere at debian.org>
-Build-Depends: debhelper (>= 8), pkg-config,
- libept-dev, libwibble-dev, libfltk1.1-dev, libtagcoll2-dev
+Build-Depends: debhelper (>= 8), pkg-config, dh-autoreconf,
+ libept-dev, libwibble-dev, libfltk1.3-dev, libtagcoll2-dev
,imagemagick
,libcurl4-gnutls-dev
#, fluid
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/software/ui/
Vcs-Svn: svn://svn.debian.org/pkg-games/software/ui/
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Package: goplay
Architecture: any
Modified: software/ui/debian/rules
===================================================================
--- software/ui/debian/rules 2013-08-13 07:03:11 UTC (rev 14478)
+++ software/ui/debian/rules 2013-08-13 21:43:39 UTC (rev 14479)
@@ -8,7 +8,7 @@
$(info DEB_BUILD_MAINT_OPTIONS:$(origin DEB_BUILD_MAINT_OPTIONS)=$(DEB_BUILD_MAINT_OPTIONS))
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_build:
convert data/icons/Icon32.png debian/goplay.xpm
Modified: software/ui/debian/source/format
===================================================================
--- software/ui/debian/source/format 2013-08-13 07:03:11 UTC (rev 14478)
+++ software/ui/debian/source/format 2013-08-13 21:43:39 UTC (rev 14479)
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
Modified: software/ui/src/goplay.cpp
===================================================================
--- software/ui/src/goplay.cpp 2013-08-13 07:03:11 UTC (rev 14478)
+++ software/ui/src/goplay.cpp 2013-08-13 21:43:39 UTC (rev 14479)
@@ -28,14 +28,14 @@
#define PACKAGE_VERSION "unknown"
#endif
+#include "Environment.h"
+#include "GamesOptions.h"
+#include "Engine.h"
+
#include "common.h"
#include "ui.h"
#include "filter.h"
-#include "Environment.h"
-#include "GamesOptions.h"
-#include "Engine.h"
-
#include <ept/apt/packagerecord.h>
#include <wibble/regexp.h>
#include <wibble/string.h>
Modified: software/ui/src/pkgbrowser.cpp
===================================================================
--- software/ui/src/pkgbrowser.cpp 2013-08-13 07:03:11 UTC (rev 14478)
+++ software/ui/src/pkgbrowser.cpp 2013-08-13 21:43:39 UTC (rev 14479)
@@ -32,16 +32,16 @@
#include <config.h>
#endif
+#include "Environment.h"
+#include "GamesOptions.h"
+#include "Engine.h"
+#include "URLFetcher.h"
+
#include "pkgbrowser.h"
#include "ui.h"
#include "common.h"
#include "aux.h"
-#include "Environment.h"
-#include "GamesOptions.h"
-#include "Engine.h"
-#include "URLFetcher.h"
-
#include "filter.h"
#include <ept/apt/packagerecord.h>
@@ -50,6 +50,7 @@
#include <string.h>
#include <limits.h>
#include <sys/stat.h>
+#include <unistd.h>
#ifdef USE_GETTEXT
#include <libintl.h>
More information about the Pkg-games-commits
mailing list