Author: christoph Date: 2011-10-11 20:57:30 +0000 (Tue, 11 Oct 2011) New Revision: 12698
Added: packages/trunk/supertux/debian/patches/fix-curl.patch Modified: packages/trunk/supertux/debian/changelog packages/trunk/supertux/debian/control packages/trunk/supertux/debian/patches/series packages/trunk/supertux/debian/rules packages/trunk/supertux/debian/supertux.install Log: Import original -2 that was never commited and merge new changes in Modified: packages/trunk/supertux/debian/changelog =================================================================== --- packages/trunk/supertux/debian/changelog 2011-10-06 09:35:01 UTC (rev 12697) +++ packages/trunk/supertux/debian/changelog 2011-10-11 20:57:30 UTC (rev 12698) @@ -1,10 +1,17 @@ -supertux (0.3.3-2) experimental; urgency=low +supertux (0.3.3-3) experimental; urgency=low * Import patch by Ilya Barygin <[email protected]> to fix building with gcc-4.6 (Closes: #640192) - -- Christoph Egger <[email protected]> Sat, 03 Sep 2011 14:32:03 +0200 + -- Christoph Egger <[email protected]> Tue, 11 Oct 2011 22:33:04 +0200 +supertux (0.3.3-2) experimental; urgency=low + + * Build-depend un libcurl-dev to make add-ons work + * Install the desktop file + + -- Christoph Egger <[email protected]> Wed, 17 Mar 2010 09:43:49 +0100 + supertux (0.3.3-1) experimental; urgency=low [ Jon Dowland ] Modified: packages/trunk/supertux/debian/control =================================================================== --- packages/trunk/supertux/debian/control 2011-10-06 09:35:01 UTC (rev 12697) +++ packages/trunk/supertux/debian/control 2011-10-11 20:57:30 UTC (rev 12698) @@ -15,7 +15,8 @@ autotools-dev, quilt (>= 0.46-7~), libboost-dev, - libglew-dev + libglew-dev, + libcurl4-gnutls-dev Build-Conflicts: nvidia-glx, nvidia-glx-legacy Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/supertux/ Added: packages/trunk/supertux/debian/patches/fix-curl.patch =================================================================== --- packages/trunk/supertux/debian/patches/fix-curl.patch (rev 0) +++ packages/trunk/supertux/debian/patches/fix-curl.patch 2011-10-11 20:57:30 UTC (rev 12698) @@ -0,0 +1,13 @@ +Index: supertux-0.3.3/src/addon/addon_manager.cpp +=================================================================== +--- supertux-0.3.3.orig/src/addon/addon_manager.cpp 2011-10-11 22:51:04.644921887 +0200 ++++ supertux-0.3.3/src/addon/addon_manager.cpp 2011-10-11 22:51:36.693078566 +0200 +@@ -28,8 +28,6 @@ + + #ifdef HAVE_LIBCURL + # include <curl/curl.h> +-# include <curl/easy.h> +-# include <curl/types.h> + #endif + + #include "addon/addon.hpp" Modified: packages/trunk/supertux/debian/patches/series =================================================================== --- packages/trunk/supertux/debian/patches/series 2011-10-06 09:35:01 UTC (rev 12697) +++ packages/trunk/supertux/debian/patches/series 2011-10-11 20:57:30 UTC (rev 12698) @@ -1,2 +1,3 @@ debian-changes-0.3.3-1 gcc-4.6 +fix-curl.patch Modified: packages/trunk/supertux/debian/rules =================================================================== --- packages/trunk/supertux/debian/rules 2011-10-06 09:35:01 UTC (rev 12697) +++ packages/trunk/supertux/debian/rules 2011-10-11 20:57:30 UTC (rev 12698) @@ -9,3 +9,6 @@ %: dh --with quilt $@ +override_dh_install: + rm -f debian/tmp/usr/share/doc/supertux2/COPYING + dh_install --list-missing \ No newline at end of file Modified: packages/trunk/supertux/debian/supertux.install =================================================================== --- packages/trunk/supertux/debian/supertux.install 2011-10-06 09:35:01 UTC (rev 12697) +++ packages/trunk/supertux/debian/supertux.install 2011-10-11 20:57:30 UTC (rev 12698) @@ -1 +1,4 @@ -supertux2 usr/games +usr/games +usr/share/applications/supertux2.desktop +usr/share/doc/supertux2 usr/share/doc/supertux +usr/share/pixmaps _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
