[SCM] Packaging for ASEPRITE branch, master, updated. upstream/0.9.2-21-g0c0c9b5

[Tobias Hansen]

The following commit has been merged in the master branch:
commit 1ce09a80718f9b31a4678c5da8c40e5f75a7ac2e
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Tue Sep 4 00:28:31 2012 +0200

    Refresh patches.

diff --git a/debian/patches/disable-file-unittest.patch b/debian/patches/disable-file-unittest.patch
index f35e135..a03d8e6 100644
--- a/debian/patches/disable-file-unittest.patch
+++ b/debian/patches/disable-file-unittest.patch
@@ -6,7 +6,7 @@ Author: Tobias Hansen <tobias.han at gmx.de>
 
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -447,7 +447,9 @@
+@@ -467,7 +467,9 @@
  
      string(REGEX MATCH "_ui_unittest" test_requires_ui ${testname})
      if (NOT test_requires_ui STREQUAL "_ui_unittest")
diff --git a/debian/patches/do-not-use-embedded-libloadpng.patch b/debian/patches/do-not-use-embedded-libloadpng.patch
deleted file mode 100644
index 13d63fc..0000000
--- a/debian/patches/do-not-use-embedded-libloadpng.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Do not use the embedded libloadpng
- Add the option to use a shared libloadpng library.
-Author: Tobias Hansen <tobias.han at gmx.de>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,6 +35,7 @@
- option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
- option(USE_SHARED_ZLIB    "Use your installed copy of zlib" off)
- option(USE_SHARED_LIBPNG  "Use your installed copy of libpng" off)
-+option(USE_SHARED_LIBLOADPNG "Use your installed copy of libloadpng" off)
- option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
- option(USE_SHARED_GTEST   "Use your installed copy of gtest" off)
- option(USE_SHARED_ALLEGRO4 "Use shared Allegro 4 library (without resize support)" off)
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -15,8 +15,6 @@
- include_directories(. .. ../third_party)
- 
- # Third-party libraries
--set(libs3rdparty loadpng)
--include_directories(${LOADPNG_DIR})
- 
- if(USE_SHARED_JPEGLIB)
-   find_package(JPEG)
-@@ -73,6 +71,17 @@
-   include_directories(${TINYXML_DIR})
- endif()
- 
-+if(USE_SHARED_LIBLOADPNG)
-+  find_library(LIBLOADPNG_LIBRARY NAMES loadpng)
-+  find_path(LIBLOADPNG_INCLUDE_DIR NAMES loadpng.h)
-+
-+  set(libs3rdparty ${libs3rdparty} ${LIBLOADPNG_LIBRARY})
-+  include_directories(${LIBLOADPNG_INCLUDE_DIR})
-+else()
-+  set(libs3rdparty ${libs3rdparty} loadpng)
-+  include_directories(${LOADPNG_DIR})
-+endif()
-+
- if (CMAKE_USE_PTHREADS_INIT)
-   set(sys_libs ${sys_libs} ${CMAKE_THREAD_LIBS_INIT})
- endif()
---- a/third_party/CMakeLists.txt
-+++ b/third_party/CMakeLists.txt
-@@ -36,4 +36,6 @@
-   add_subdirectory(curl)
- endif()
- 
--add_subdirectory(loadpng)
-+if(NOT USE_SHARED_LIBLOADPNG)
-+ add_subdirectory(loadpng)
-+endif()
diff --git a/debian/patches/find-static-gtest.patch b/debian/patches/find-static-gtest.patch
index 6616e88..ba5dded 100644
--- a/debian/patches/find-static-gtest.patch
+++ b/debian/patches/find-static-gtest.patch
@@ -5,7 +5,7 @@ Author: Tobias Hansen <tobias.han at gmx.de>
 
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -428,7 +428,12 @@
+@@ -443,7 +443,12 @@
      get_filename_component(testname ${testsourcefile} NAME_WE)
  
      add_executable(${testname} ${testsourcefile})
diff --git a/debian/patches/series b/debian/patches/series
index e839ee6..37ebaba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-do-not-use-embedded-libloadpng.patch
 find-static-gtest.patch
 disable-file-unittest.patch

-- 
Packaging for ASEPRITE