This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libcitygml.
commit 4ada230876aec81349e3bc54f8d190c981b31f5d
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Aug 31 22:46:47 2015 +0200
Drop patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/information-typo.diff | 16 ----------
debian/patches/install-citygmltest.diff | 14 ---------
debian/patches/install-paths.diff | 56 ---------------------------------
debian/patches/pkgconfig-support.diff | 28 -----------------
debian/patches/series | 5 ---
debian/patches/soversion.diff | 19 -----------
7 files changed, 1 insertion(+), 138 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c86d41b..824341c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libcitygml (2.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebas...@debian.org> Mon, 31 Aug 2015 00:22:05 +0200
diff --git a/debian/patches/information-typo.diff
b/debian/patches/information-typo.diff
deleted file mode 100644
index 50d5260..0000000
--- a/debian/patches/information-typo.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'informations' typo, replace with 'information'.
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Forwarded: https://github.com/jklimke/libcitygml/pull/15
-Applied-Upstream:
https://github.com/jklimke/libcitygml/commit/ce6e5feb61cb3b4ad01a2d2abef18a601c630d53
-
---- a/test/citygmltest.cpp
-+++ b/test/citygmltest.cpp
-@@ -28,7 +28,7 @@ void usage()
- {
- std::cout << "Usage: citygmltest [-options...] <filename>" << std::endl;
- std::cout << " Options:" << std::endl;
-- std::cout << " -log Print some informations during parsing"
<< std::endl;
-+ std::cout << " -log Print some information during parsing" <<
std::endl;
- std::cout << " -filter <mask> CityGML objects to parse (default:All)"
<< std::endl
- << " The mask is composed of:" << std::endl
- << " GenericCityObject, Building, Room," <<
std::endl
diff --git a/debian/patches/install-citygmltest.diff
b/debian/patches/install-citygmltest.diff
deleted file mode 100644
index 05ba743..0000000
--- a/debian/patches/install-citygmltest.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Install citygmltest utility.
-Author: YunQiang Su <wzss...@gmail.com>
-Forwarded: https://github.com/jklimke/libcitygml/pull/15
-Applied-Upstream:
https://github.com/jklimke/libcitygml/commit/ce6e5feb61cb3b4ad01a2d2abef18a601c630d53
-
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -41,3 +41,6 @@ ADD_EXECUTABLE( citygmltest ${PRG_SRCS}
- # ENDIF( MSVC_IDE )
-
- TARGET_LINK_LIBRARIES( citygmltest citygml ${XERCESC_LIBRARY}
${OPENGL_LIBRARIES} )
-+
-+install(TARGETS citygmltest RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-+
diff --git a/debian/patches/install-paths.diff
b/debian/patches/install-paths.diff
deleted file mode 100644
index 4e43e6c..0000000
--- a/debian/patches/install-paths.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: Add user customizable install paths.
-Author: YunQiang Su <wzss...@gmail.com>
-Forwarded: https://github.com/jklimke/libcitygml/pull/15
-Applied-Upstream:
https://github.com/jklimke/libcitygml/commit/ce6e5feb61cb3b4ad01a2d2abef18a601c630d53
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -97,6 +97,28 @@ SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/
- MAKE_DIRECTORY(${OUTPUT_LIBDIR})
- SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
-
-+if(NOT DEFINED BIN_INSTALL_DIR)
-+ set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
-+endif(NOT DEFINED BIN_INSTALL_DIR)
-+if(NOT DEFINED LIB_INSTALL_DIR)
-+ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-+endif(NOT DEFINED LIB_INSTALL_DIR)
-+if(NOT DEFINED DATA_INSTALL_DIR)
-+ set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share")
-+endif(NOT DEFINED DATA_INSTALL_DIR)
-+if(NOT DEFINED INCLUDE_INSTALL_DIR)
-+ set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/citygml")
-+endif(NOT DEFINED INCLUDE_INSTALL_DIR)
-+if(NOT DEFINED MAN_INSTALL_DIR)
-+ set(MAN_INSTALL_DIR "${DATA_INSTALL_DIR}/man")
-+endif(NOT DEFINED MAN_INSTALL_DIR)
-+if(NOT DEFINED RESOURCE_INSTALL_DIR)
-+ set(RESOURCE_INSTALL_DIR
"${DATA_INSTALL_DIR}/libcitygml${META_VERSION_MAJOR}/resource/")
-+endif(NOT DEFINED RESOURCE_INSTALL_DIR)
-+if(NOT DEFINED LOCALE_INSTALL_DIR)
-+ set(LOCALE_INSTALL_DIR "${DATA_INSTALL_DIR}/locale/")
-+endif(NOT DEFINED LOCALE_INSTALL_DIR)
-+
- # IF( DEBUG_BUILD )
- # SET( CMAKE_BUILD_TYPE "Debug" )
- # ELSE( DEBUG_BUILD )
---- a/sources/CMakeLists.txt
-+++ b/sources/CMakeLists.txt
-@@ -153,13 +153,13 @@ TARGET_LINK_LIBRARIES( ${target} ${XERCE
-
- INSTALL(
- TARGETS ${target}
-- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
- # FIXME: Do not run for OS X framework
- INSTALL(
- FILES ${PUBLIC_HEADER}
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${target}
-+ DESTINATION ${INCLUDE_INSTALL_DIR}
- )
-
diff --git a/debian/patches/pkgconfig-support.diff
b/debian/patches/pkgconfig-support.diff
deleted file mode 100644
index b3c01f5..0000000
--- a/debian/patches/pkgconfig-support.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: add pkg-config support for libcitygml
-Author: YunQiang Su <wzss...@gmail.com>
-Forwarded: https://github.com/jklimke/libcitygml/pull/15
-Applied-Upstream:
https://github.com/jklimke/libcitygml/commit/ce6e5feb61cb3b4ad01a2d2abef18a601c630d53
-
---- /dev/null
-+++ b/sources/citygml.pc.cmake
-@@ -0,0 +1,11 @@
-+prefix=${CMAKE_INSTALL_PREFIX}
-+exec_prefix=${BIN_INSTALL_DIR}
-+libdir=${LIB_INSTALL_DIR}
-+includedir=${INCLUDE_INSTALL_DIR}
-+
-+Name: citygml
-+Description: Read and Write CityGML files
-+Requires: libxml-2.0 glu
-+Version: ${META_VERSION}
-+Libs: -L${LIB_INSTALL_DIR} -lcitygml
-+Cflags: -I${INCLUDE_INSTALL_DIR}
---- a/sources/CMakeLists.txt
-+++ b/sources/CMakeLists.txt
-@@ -163,3 +163,6 @@ INSTALL(
- DESTINATION ${INCLUDE_INSTALL_DIR}
- )
-
-+configure_file(citygml.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc DESTINATION
${LIB_INSTALL_DIR}/pkgconfig)
-+
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b769fc1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-install-paths.diff
-pkgconfig-support.diff
-soversion.diff
-install-citygmltest.diff
-information-typo.diff
diff --git a/debian/patches/soversion.diff b/debian/patches/soversion.diff
deleted file mode 100644
index dd3fde5..0000000
--- a/debian/patches/soversion.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Set library VERSION & SOVERSION.
-Author: Bas Couwenberg <sebas...@debian.org>
-Forwarded: https://github.com/jklimke/libcitygml/pull/15
-Applied-Upstream:
https://github.com/jklimke/libcitygml/commit/ce6e5feb61cb3b4ad01a2d2abef18a601c630d53
-
---- a/sources/CMakeLists.txt
-+++ b/sources/CMakeLists.txt
-@@ -151,6 +151,11 @@ ADD_LIBRARY( ${target} ${LIBCITYGML_USER
-
- TARGET_LINK_LIBRARIES( ${target} ${XERCESC_LIBRARIES} ${OPENGL_LIBRARIES}
${GDAL_LIBRARY} )
-
-+set_target_properties( ${target} PROPERTIES
-+ VERSION ${META_VERSION}
-+ SOVERSION ${META_VERSION_MAJOR}
-+)
-+
- INSTALL(
- TARGETS ${target}
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/libcitygml.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
