[Pkg-gstreamer-commits] [SCM] UNNAMED PROJECT branch, master, updated. debian/0.10.1-2-14-gb0faf14

George Kiagiadakis kiagiadakis.george at gmail.com
Sat May 5 21:12:57 UTC 2012


The following commit has been merged in the master branch:
commit 2aa2686b972343c1a446b4a3ae466df36a4aece2
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sat May 5 23:04:51 2012 +0300

    Also remove 00_no_latex_docs.diff patch.

diff --git a/debian/changelog b/debian/changelog
index b2c0d99..0b0ab72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ qt-gstreamer (0.10.2-1) unstable; urgency=low
 
   * New upstream release.
     - Individual glib headers are no longer used (Closes: #665602)
-  * Remove patches/boost1.48.patch: No longer needed, the fix is upstream.
+  * Remove all patches: No longer needed, the fixes are upstream.
   * Bump versions of (build-)dependencies:
     - cmake >= 2.8.6
     - qt >= 4.7
diff --git a/debian/patches/00_no_latex_docs.diff b/debian/patches/00_no_latex_docs.diff
deleted file mode 100644
index dcdfdc5..0000000
--- a/debian/patches/00_no_latex_docs.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 9a0af57d82b03a8bd37790e968faeee6b7c5a8f3
-Author: George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
-Date:   Sun Apr 10 12:36:02 2011 +0300
-
-    Adjust UseDoxygen.cmake to disable latex output by default and to allow using dot without latex.
-
-diff --git a/cmake/modules/UseDoxygen.cmake b/cmake/modules/UseDoxygen.cmake
-index e1ee6da..283b8d3 100644
---- a/cmake/modules/UseDoxygen.cmake
-+++ b/cmake/modules/UseDoxygen.cmake
-@@ -62,30 +62,38 @@ if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND)
- 	set_property(DIRECTORY APPEND PROPERTY
- 			ADDITIONAL_MAKE_CLEAN_FILES "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_HTML_DIR}")
- 
-+
-+	set(DOXYFILE_DOT "NO")
-+
-+	if(DOXYGEN_DOT_FOUND)
-+		set(DOXYFILE_DOT "YES")
-+	endif()
-+
-+
-+	usedoxygen_set_default(DOXYFILE_ENABLE_LATEX_DOC OFF)
- 	set(DOXYFILE_LATEX "NO")
- 	set(DOXYFILE_PDFLATEX "NO")
--	set(DOXYFILE_DOT "NO")
- 
--	find_package(LATEX)
--	if(LATEX_COMPILER AND MAKEINDEX_COMPILER)
--		set(DOXYFILE_LATEX "YES")
--		usedoxygen_set_default(DOXYFILE_LATEX_DIR "latex")
-+	if (DOXYFILE_ENABLE_LATEX_DOC)
-+		find_package(LATEX)
- 
--		set_property(DIRECTORY APPEND PROPERTY
--				ADDITIONAL_MAKE_CLEAN_FILES
--				"${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
-+		if(LATEX_COMPILER AND MAKEINDEX_COMPILER)
-+			set(DOXYFILE_LATEX "YES")
-+			usedoxygen_set_default(DOXYFILE_LATEX_DIR "latex")
- 
--		if(PDFLATEX_COMPILER)
--			set(DOXYFILE_PDFLATEX "YES")
--		endif()
--		if(DOXYGEN_DOT_EXECUTABLE)
--			set(DOXYFILE_DOT "YES")
--		endif()
-+			set_property(DIRECTORY APPEND PROPERTY
-+					ADDITIONAL_MAKE_CLEAN_FILES
-+					"${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
- 
--		add_custom_command(TARGET doxygen
--			POST_BUILD
--			COMMAND ${CMAKE_MAKE_PROGRAM}
--			WORKING_DIRECTORY "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
-+			if(PDFLATEX_COMPILER)
-+				set(DOXYFILE_PDFLATEX "YES")
-+			endif()
-+
-+			add_custom_command(TARGET doxygen
-+				POST_BUILD
-+				COMMAND ${CMAKE_MAKE_PROGRAM}
-+				WORKING_DIRECTORY "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
-+		endif()
- 	endif()
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f02d583..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00_no_latex_docs.diff

-- 
UNNAMED PROJECT



More information about the Pkg-gstreamer-commits mailing list