r13849 - in packages/trunk/libphysfs/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2012-11-12 18:31:34 +0000 (Mon, 12 Nov 2012)
New Revision: 13849

Added:
   packages/trunk/libphysfs/debian/patches/01-do-not-link-against-curses.diff
Removed:
   packages/trunk/libphysfs/debian/patches/do_not_link_against_curses.diff
Modified:
   packages/trunk/libphysfs/debian/changelog
   packages/trunk/libphysfs/debian/patches/series
Log:
- Rename patch do_not_link_against_curses to 01-do-not-link-against-curses
  and also rewrite it.


Modified: packages/trunk/libphysfs/debian/changelog
===================================================================
--- packages/trunk/libphysfs/debian/changelog	2012-11-12 18:30:07 UTC (rev 13848)
+++ packages/trunk/libphysfs/debian/changelog	2012-11-12 18:31:34 UTC (rev 13849)
@@ -3,6 +3,8 @@
   * New upstream release.
     Closes: #691867
     - Remove merged patch remove_unused_variable.
+    - Rename patch do_not_link_against_curses to 01-do-not-link-against-curses
+      and also rewrite it.
   * Bump Standards-Version to 3.9.4 (no changes needed).
   * Switch to xz compression and add a Pre-Depends on dpkg.
   * Update debian/watch: Releases are now bzip2 compressed.

Copied: packages/trunk/libphysfs/debian/patches/01-do-not-link-against-curses.diff (from rev 13848, packages/trunk/libphysfs/debian/patches/do_not_link_against_curses.diff)
===================================================================
--- packages/trunk/libphysfs/debian/patches/01-do-not-link-against-curses.diff	                        (rev 0)
+++ packages/trunk/libphysfs/debian/patches/01-do-not-link-against-curses.diff	2012-11-12 18:31:34 UTC (rev 13849)
@@ -0,0 +1,23 @@
+Description: Do not unnecessarily link against ncurses
+Author: Sven Joachim <svenjoac at gmx.de>,
+		Patrick Matthäi <pmatthaei at debian.org>
+Bug-Debian: http://bugs.debian.org/646146
+Last-Update: <2012-11-12>
+
+diff -Naur physfs-2.0.3.orig/CMakeLists.txt physfs-2.0.3/CMakeLists.txt
+--- physfs-2.0.3.orig/CMakeLists.txt	2012-10-23 05:41:04.000000000 +0200
++++ physfs-2.0.3/CMakeLists.txt	2012-11-12 19:27:50.590920820 +0100
+@@ -305,12 +305,10 @@
+     FIND_PATH(READLINE_H readline/readline.h)
+     FIND_PATH(HISTORY_H readline/history.h)
+     IF(READLINE_H AND HISTORY_H)
+-        FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses)
+-        SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY})
+         FIND_LIBRARY(READLINE_LIBRARY readline)
+         IF(READLINE_LIBRARY)
+             SET(HAVE_SYSTEM_READLINE TRUE)
+-            SET(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY} ${CURSES_LIBRARY})
++            SET(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY})
+             INCLUDE_DIRECTORIES(${READLINE_H} ${HISTORY_H})
+             ADD_DEFINITIONS(-DPHYSFS_HAVE_READLINE=1)
+         ENDIF(READLINE_LIBRARY)

Deleted: packages/trunk/libphysfs/debian/patches/do_not_link_against_curses.diff
===================================================================
--- packages/trunk/libphysfs/debian/patches/do_not_link_against_curses.diff	2012-11-12 18:30:07 UTC (rev 13848)
+++ packages/trunk/libphysfs/debian/patches/do_not_link_against_curses.diff	2012-11-12 18:31:34 UTC (rev 13849)
@@ -1,23 +0,0 @@
-Description: Do not unnecessarily link against ncurses
-Author: Sven Joachim <svenjoac at gmx.de>,
-		Patrick Matthäi <pmatthaei at debian.org>
-Bug-Debian: http://bugs.debian.org/646146
-Last-Update: <2012-11-12>
-
-diff -Naur physfs-2.0.3.orig/CMakeLists.txt physfs-2.0.3/CMakeLists.txt
---- physfs-2.0.3.orig/CMakeLists.txt	2012-10-23 05:41:04.000000000 +0200
-+++ physfs-2.0.3/CMakeLists.txt	2012-11-12 19:27:50.590920820 +0100
-@@ -305,12 +305,10 @@
-     FIND_PATH(READLINE_H readline/readline.h)
-     FIND_PATH(HISTORY_H readline/history.h)
-     IF(READLINE_H AND HISTORY_H)
--        FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses)
--        SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY})
-         FIND_LIBRARY(READLINE_LIBRARY readline)
-         IF(READLINE_LIBRARY)
-             SET(HAVE_SYSTEM_READLINE TRUE)
--            SET(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY} ${CURSES_LIBRARY})
-+            SET(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY})
-             INCLUDE_DIRECTORIES(${READLINE_H} ${HISTORY_H})
-             ADD_DEFINITIONS(-DPHYSFS_HAVE_READLINE=1)
-         ENDIF(READLINE_LIBRARY)

Modified: packages/trunk/libphysfs/debian/patches/series
===================================================================
--- packages/trunk/libphysfs/debian/patches/series	2012-11-12 18:30:07 UTC (rev 13848)
+++ packages/trunk/libphysfs/debian/patches/series	2012-11-12 18:31:34 UTC (rev 13849)
@@ -1 +1 @@
-do_not_link_against_curses.diff
+01-do-not-link-against-curses.diff