[SCM] Packaging for ASEPRITE branch, master, updated. upstream/0.9.5-26-g2fea517

[Tobias Hansen]

The following commit has been merged in the master branch:
commit a26b3614f49de60943ea9fd74257875d527f5388
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Tue Sep 25 01:31:44 2012 +0200

    Refresh patches

diff --git a/debian/patches/disable-file-unittest.patch b/debian/patches/disable-file-unittest.patch
index a03d8e6..cd0e0fd 100644
--- a/debian/patches/disable-file-unittest.patch
+++ b/debian/patches/disable-file-unittest.patch
@@ -7,13 +7,13 @@ Author: Tobias Hansen <tobias.han at gmx.de>
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -467,7 +467,9 @@
- 
-     string(REGEX MATCH "_ui_unittest" test_requires_ui ${testname})
-     if (NOT test_requires_ui STREQUAL "_ui_unittest")
--      set(local_non_ui_runs ${local_non_ui_runs} run_${testname})
-+      if (NOT ${testname} STREQUAL "file_unittest")
-+        set(local_non_ui_runs ${local_non_ui_runs} run_${testname})
-+      endif()
-     endif()
-   endforeach()
-   set(all_runs ${all_runs} ${local_runs} PARENT_SCOPE)
+ 
+     string(REGEX MATCH "_ui_unittest" test_requires_ui ${testname})
+     if (NOT test_requires_ui STREQUAL "_ui_unittest")
+-      set(local_non_ui_runs ${local_non_ui_runs} run_${testname})
++      if (NOT ${testname} STREQUAL "file_unittest")
++        set(local_non_ui_runs ${local_non_ui_runs} run_${testname})
++      endif()
+     endif()
+   endforeach()
+   set(all_runs ${all_runs} ${local_runs} PARENT_SCOPE)
diff --git a/debian/patches/find-static-gtest.patch b/debian/patches/find-static-gtest.patch
index ba5dded..7457137 100644
--- a/debian/patches/find-static-gtest.patch
+++ b/debian/patches/find-static-gtest.patch
@@ -6,16 +6,16 @@ Author: Tobias Hansen <tobias.han at gmx.de>
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -443,7 +443,12 @@
-     get_filename_component(testname ${testsourcefile} NAME_WE)
- 
-     add_executable(${testname} ${testsourcefile})
--    target_link_libraries(${testname} gtest ${ARGV})
-+    if(USE_SHARED_GTEST)
-+      target_link_libraries(${testname} -L${CMAKE_BINARY_DIR}/gtest gtest ${ARGV})
-+    else()
-+      target_link_libraries(${testname} gtest ${ARGV})
-+    endif()
-+
-     if(LIBALLEGRO4_LINK_FLAGS)
-       set_target_properties(${testname}
- 	PROPERTIES LINK_FLAGS ${LIBALLEGRO4_LINK_FLAGS})
+     get_filename_component(testname ${testsourcefile} NAME_WE)
+ 
+     add_executable(${testname} ${testsourcefile})
+-    target_link_libraries(${testname} gtest ${ARGV})
++    if(USE_SHARED_GTEST)
++      target_link_libraries(${testname} -L${CMAKE_BINARY_DIR}/gtest gtest ${ARGV})
++    else()
++      target_link_libraries(${testname} gtest ${ARGV})
++    endif()
++
+     if(LIBALLEGRO4_LINK_FLAGS)
+       set_target_properties(${testname}
+ 	PROPERTIES LINK_FLAGS ${LIBALLEGRO4_LINK_FLAGS})

-- 
Packaging for ASEPRITE