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

[Patrick Matthäi]

Author: pmatthaei
Date: 2012-11-12 18:24:55 +0000 (Mon, 12 Nov 2012)
New Revision: 13846

Removed:
   packages/trunk/libphysfs/debian/patches/remove_unused_variable.diff
Modified:
   packages/trunk/libphysfs/debian/changelog
   packages/trunk/libphysfs/debian/patches/series
Log:
* New upstream release.
  Closes: #691867
   - Remove merged patch remove_unused_variable.


Modified: packages/trunk/libphysfs/debian/changelog
===================================================================
--- packages/trunk/libphysfs/debian/changelog	2012-11-12 18:21:53 UTC (rev 13845)
+++ packages/trunk/libphysfs/debian/changelog	2012-11-12 18:24:55 UTC (rev 13846)
@@ -1,5 +1,8 @@
-libphysfs (2.0.2-8) UNRELEASED; urgency=low
+libphysfs (2.0.3-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+    Closes: #691867
+    - Remove merged patch remove_unused_variable.
   * 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.

Deleted: packages/trunk/libphysfs/debian/patches/remove_unused_variable.diff
===================================================================
--- packages/trunk/libphysfs/debian/patches/remove_unused_variable.diff	2012-11-12 18:21:53 UTC (rev 13845)
+++ packages/trunk/libphysfs/debian/patches/remove_unused_variable.diff	2012-11-12 18:24:55 UTC (rev 13846)
@@ -1,16 +0,0 @@
-# Remove unused variable to fix a FTBFS with hardened flags enabled.
-
-Index: physfs-2.0.2/archivers/wad.c
-===================================================================
---- physfs-2.0.2.orig/archivers/wad.c	2011-07-19 17:39:16.975095896 +0200
-+++ physfs-2.0.2/archivers/wad.c	2011-07-19 17:39:51.163265424 +0200
-@@ -245,9 +245,6 @@
-     PHYSFS_uint32 fileCount;
-     PHYSFS_uint32 directoryOffset;
-     WADentry *entry;
--    char lastDirectory[9];
--
--    lastDirectory[8] = 0; /* Make sure lastDirectory stays null-terminated. */
- 
-     BAIL_IF_MACRO(!wad_open(name, forWriting, &fh, &fileCount,&directoryOffset), NULL, 0);
-     info->entryCount = fileCount;

Modified: packages/trunk/libphysfs/debian/patches/series
===================================================================
--- packages/trunk/libphysfs/debian/patches/series	2012-11-12 18:21:53 UTC (rev 13845)
+++ packages/trunk/libphysfs/debian/patches/series	2012-11-12 18:24:55 UTC (rev 13846)
@@ -1,2 +1 @@
-remove_unused_variable.diff
 do_not_link_against_curses.diff