r13875 - in packages/trunk/performous/debian: . patches

Miriam Ruiz miriam at alioth.debian.org
Thu Nov 22 18:11:06 UTC 2012 

Author: miriam
Date: 2012-11-22 18:11:06 +0000 (Thu, 22 Nov 2012)
New Revision: 13875

Added:
   packages/trunk/performous/debian/patches/libav0.8.patch
Removed:
   packages/trunk/performous/debian/patches/jpeg-detection.patch
   packages/trunk/performous/debian/patches/libav0.8.diff
   packages/trunk/performous/debian/patches/libav_api_change.patch
Modified:
   packages/trunk/performous/debian/changelog
   packages/trunk/performous/debian/compat
   packages/trunk/performous/debian/control
   packages/trunk/performous/debian/patches/boost_filesystem_v2.patch
   packages/trunk/performous/debian/patches/desktop.patch
   packages/trunk/performous/debian/patches/series
   packages/trunk/performous/debian/rules
Log:
New Upstream Release



Modified: packages/trunk/performous/debian/changelog
===================================================================
--- packages/trunk/performous/debian/changelog	2012-11-22 06:11:07 UTC (rev 13874)
+++ packages/trunk/performous/debian/changelog	2012-11-22 18:11:06 UTC (rev 13875)
@@ -1,3 +1,15 @@
+performous (0.7.0-1) UNRELEASED; urgency=low
+
+  [ Miriam Ruiz ]
+  * New upstream release.
+  * Removed patches: jpeg-detection.patch and libav_api_change.patch
+  * Upgraded debian/compat to 9.
+  * Modified debian/rules to use fortified libc functions.
+    See: http://wiki.debian.org/Hardening
+  * Changed my email address in debian/control to miriam at debian.org
+
+ -- Miriam Ruiz <miriam at debian.org>  Wed, 21 Nov 2012 00:01:41 +0100
+
 performous (0.6.1-6) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/performous/debian/compat
===================================================================
--- packages/trunk/performous/debian/compat	2012-11-22 06:11:07 UTC (rev 13874)
+++ packages/trunk/performous/debian/compat	2012-11-22 18:11:06 UTC (rev 13875)
@@ -1 +1 @@
-5
+9

Modified: packages/trunk/performous/debian/control
===================================================================
--- packages/trunk/performous/debian/control	2012-11-22 06:11:07 UTC (rev 13874)
+++ packages/trunk/performous/debian/control	2012-11-22 18:11:06 UTC (rev 13875)
@@ -1,9 +1,9 @@
 Source: performous
 Section: games
-Priority: extra
+Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 7),
+Uploaders: Miriam Ruiz <miriam at debian.org>
+Build-Depends: debhelper (>= 9),
  cmake (>= 2.6), pkg-config, help2man, gettext,
  libgl1-mesa-dev, libsdl1.2-dev, libcairo2-dev, librsvg2-dev,
  libboost-thread-dev (>= 1.36), libboost-serialization-dev (>= 1.36),

Modified: packages/trunk/performous/debian/patches/boost_filesystem_v2.patch
===================================================================
--- packages/trunk/performous/debian/patches/boost_filesystem_v2.patch	2012-11-22 06:11:07 UTC (rev 13874)
+++ packages/trunk/performous/debian/patches/boost_filesystem_v2.patch	2012-11-22 18:11:06 UTC (rev 13875)
@@ -4,9 +4,11 @@
 Author: Evgeni Golov <evgeni at debian.org>
 Bug-Debian: http://bugs.debian.org/625109
 
---- performous-0.6.1.orig/CMakeLists.txt
-+++ performous-0.6.1/CMakeLists.txt
-@@ -12,6 +12,8 @@ include(cmake/performous-packaging.cmake
+Index: performous-0.7.0/CMakeLists.txt
+===================================================================
+--- performous-0.7.0.orig/CMakeLists.txt	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0/CMakeLists.txt	2012-11-20 23:57:00.000000000 +0100
+@@ -15,6 +15,8 @@
  
  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
  

Modified: packages/trunk/performous/debian/patches/desktop.patch
===================================================================
--- packages/trunk/performous/debian/patches/desktop.patch	2012-11-22 06:11:07 UTC (rev 13874)
+++ packages/trunk/performous/debian/patches/desktop.patch	2012-11-22 18:11:06 UTC (rev 13875)
@@ -1,8 +1,10 @@
 # Copyright (C) 2009  Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the game. See debian/copyright.
 
---- Performous-0.5.0-Source.orig/data/performous.desktop
-+++ Performous-0.5.0-Source/data/performous.desktop
+Index: performous-0.7.0/data/performous.desktop
+===================================================================
+--- performous-0.7.0.orig/data/performous.desktop	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0/data/performous.desktop	2012-11-20 23:56:58.000000000 +0100
 @@ -10,7 +10,7 @@
  Comment[ro]=Un joc de tip karaoke
  Comment[se]=Ett karaoke-spel

Deleted: packages/trunk/performous/debian/patches/jpeg-detection.patch
===================================================================
--- packages/trunk/performous/debian/patches/jpeg-detection.patch	2012-11-22 06:11:07 UTC (rev 13874)
+++ packages/trunk/performous/debian/patches/jpeg-detection.patch	2012-11-22 18:11:06 UTC (rev 13875)
@@ -1,16 +0,0 @@
-Description: fix jpeg library detection
- Check for jpeglib.h which is actually included instead of jconfig.h.
- The latter is installed in multiarch location.
-Author: Ilya Barygin <randomaction at ubuntu.com>
-
---- performous-0.6.1.orig/cmake/Modules/FindJpeg.cmake
-+++ performous-0.6.1/cmake/Modules/FindJpeg.cmake
-@@ -13,7 +13,7 @@ include(LibFindMacros)
- libfind_pkg_check_modules(Jpeg_PKGCONF jpeg)
- 
- find_path(Jpeg_INCLUDE_DIR
--  NAMES jconfig.h
-+  NAMES jpeglib.h
-   PATHS ${Jpeg_PKGCONF_INCLUDE_DIRS}
- )
- 

Deleted: packages/trunk/performous/debian/patches/libav0.8.diff
===================================================================
--- packages/trunk/performous/debian/patches/libav0.8.diff	2012-11-22 06:11:07 UTC (rev 13874)
+++ packages/trunk/performous/debian/patches/libav0.8.diff	2012-11-22 18:11:06 UTC (rev 13875)
@@ -1,16 +0,0 @@
-Subject: Add missing include
-From: Ansgar Burchardt <ansgar at debian.org>
-Date: Sun, 15 Jan 2012 22:42:32 +0100
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/654221
-
---- performous.orig/game/ffmpeg.cc
-+++ performous/game/ffmpeg.cc
-@@ -8,6 +8,7 @@
- 
- extern "C" {
- #include AVCODEC_INCLUDE
-+#include <libavutil/mathematics.h>
- #include AVFORMAT_INCLUDE
- #include SWSCALE_INCLUDE
- }

Copied: packages/trunk/performous/debian/patches/libav0.8.patch (from rev 13871, packages/trunk/performous/debian/patches/libav0.8.diff)
===================================================================
--- packages/trunk/performous/debian/patches/libav0.8.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/libav0.8.patch	2012-11-22 18:11:06 UTC (rev 13875)
@@ -0,0 +1,18 @@
+Subject: Add missing include
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Sun, 15 Jan 2012 22:42:32 +0100
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/654221
+
+Index: performous-0.7.0/game/ffmpeg.cc
+===================================================================
+--- performous-0.7.0.orig/game/ffmpeg.cc	2012-11-12 23:14:08.000000000 +0100
++++ performous-0.7.0/game/ffmpeg.cc	2012-11-21 00:00:16.000000000 +0100
+@@ -8,6 +8,7 @@
+ 
+ extern "C" {
+ #include AVCODEC_INCLUDE
++#include <libavutil/mathematics.h>
+ #include AVFORMAT_INCLUDE
+ #include SWSCALE_INCLUDE
+ }

Deleted: packages/trunk/performous/debian/patches/libav_api_change.patch
===================================================================
--- packages/trunk/performous/debian/patches/libav_api_change.patch	2012-11-22 06:11:07 UTC (rev 13874)
+++ packages/trunk/performous/debian/patches/libav_api_change.patch	2012-11-22 18:11:06 UTC (rev 13875)
@@ -1,16 +0,0 @@
-libav 0.7 API change
-Index: performous-0.6.1/game/ffmpeg.cc
-===================================================================
---- performous-0.6.1.orig/game/ffmpeg.cc	2011-08-08 09:36:02.596685105 -0400
-+++ performous-0.6.1/game/ffmpeg.cc	2011-08-08 09:37:24.380685064 -0400
-@@ -60,8 +60,8 @@
- 	for (unsigned int i=0; i<pFormatCtx->nb_streams; i++) {
- 		AVCodecContext* cc = pFormatCtx->streams[i]->codec;
- 		cc->workaround_bugs = FF_BUG_AUTODETECT;
--		if (videoStream == -1 && cc->codec_type==CODEC_TYPE_VIDEO) videoStream = i;
--		if (audioStream == -1 && cc->codec_type==CODEC_TYPE_AUDIO) audioStream = i;
-+		if (videoStream == -1 && cc->codec_type==AVMEDIA_TYPE_VIDEO) videoStream = i;
-+		if (audioStream == -1 && cc->codec_type==AVMEDIA_TYPE_AUDIO) audioStream = i;
- 	}
- 	if (videoStream == -1 && decodeVideo) throw std::runtime_error("No video stream found");
- 	if (audioStream == -1 && decodeAudio) throw std::runtime_error("No audio stream found");

Modified: packages/trunk/performous/debian/patches/series
===================================================================
--- packages/trunk/performous/debian/patches/series	2012-11-22 06:11:07 UTC (rev 13874)
+++ packages/trunk/performous/debian/patches/series	2012-11-22 18:11:06 UTC (rev 13875)
@@ -1,5 +1,4 @@
 desktop.patch
 boost_filesystem_v2.patch
-libav_api_change.patch
-libav0.8.diff
-jpeg-detection.patch
+libav0.8.patch
+

Modified: packages/trunk/performous/debian/rules
===================================================================
--- packages/trunk/performous/debian/rules	2012-11-22 06:11:07 UTC (rev 13874)
+++ packages/trunk/performous/debian/rules	2012-11-22 18:11:06 UTC (rev 13875)
@@ -3,6 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -24,17 +29,20 @@
 		-DLibDA_PLUGIN_PORTAUDIO:BOOL=ON \
 		-DLibDA_PLUGIN_PULSE:BOOL=ON \
 		-DLibDA_PLUGIN_TESTING:BOOL=OFF \
-		-DCMAKE_C_FLAGS:STRING="$(CFLAGS)"
+		-DCMAKE_C_FLAGS:STRING="$(CXXFLAGS) $(CPPFLAGS)"
 	touch $@
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 	cd $(BUILD_TREE); $(MAKE)
 	touch $@
 
+build-indep: build-stamp
+
+build-arch: build-stamp
+
+build: build-arch build-indep
+
 clean:
 	dh_testdir
 	dh_testroot

More information about the Pkg-games-commits mailing list