diff -Nru pidgin-openfetion-0.2/CMakeLists.txt pidgin-openfetion-0.3/CMakeLists.txt --- pidgin-openfetion-0.2/CMakeLists.txt 2011-05-04 09:49:59.000000000 +0000 +++ pidgin-openfetion-0.3/CMakeLists.txt 2012-01-02 03:24:59.000000000 +0000 @@ -49,15 +49,14 @@ ${PURPLE_LIBRARIES} ) -EXEC_PROGRAM("whereis libpurple| sed -e 's/[^\\/]*//' -e 's/\\(.*\\)lib\\/libpurple\\.so.*/\\1/'" - OUTPUT_VARIABLE PURPLE_PREFIX) - -EXEC_PROGRAM("whereis pidgin | sed -e 's/[^\\/]*//' -e 's/\\(.*\\)bin\\/pidgin.*/\\1/'" - OUTPUT_VARIABLE PIDGIN_PREFIX) - -SET(PIDGIN_PIX_INSTALL_DIR "${PIDGIN_PREFIX}share/pixmaps/pidgin/protocols/16/") -SET(RES_INSTALL_DIR "${PURPLE_PREFIX}share/purple/openfetion/") -SET(LIB_INSTALL_DIR "${PURPLE_PREFIX}lib/purple-${PURPLE_MAJOR_VERSION}") +EXEC_PROGRAM("pkg-config --variable=datadir purple 2>/dev/null" + OUTPUT_VARIABLE PURPLE_DATADIR) +EXEC_PROGRAM("pkg-config --variable=libdir purple 2>/dev/null" + OUTPUT_VARIABLE PURPLE_LIBDIR) + +SET(PIDGIN_PIX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/pixmaps/pidgin/protocols/16/") +SET(RES_INSTALL_DIR "${PURPLE_DATADIR}/purple/openfetion/") +SET(LIB_INSTALL_DIR "${PURPLE_LIBDIR}/purple-${PURPLE_MAJOR_VERSION}") SET(LOCALE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/locale/") ADD_DEFINITIONS(-DRES_DIR="${RES_INSTALL_DIR}") diff -Nru pidgin-openfetion-0.2/debian/changelog pidgin-openfetion-0.3/debian/changelog --- pidgin-openfetion-0.2/debian/changelog 2011-05-04 17:41:17.000000000 +0000 +++ pidgin-openfetion-0.3/debian/changelog 2012-01-02 03:23:13.000000000 +0000 @@ -1,3 +1,9 @@ +pidgin-openfetion (0.3-1) unstable; urgency=low + + * New upstream release. + + -- Aron Xu Mon, 02 Jan 2012 11:22:44 +0800 + pidgin-openfetion (0.2-1) unstable; urgency=low * Initial release in Debian (Closes: #610123) diff -Nru pidgin-openfetion-0.2/debian/control pidgin-openfetion-0.3/debian/control --- pidgin-openfetion-0.2/debian/control 2011-05-04 17:41:17.000000000 +0000 +++ pidgin-openfetion-0.3/debian/control 2012-01-02 03:24:15.000000000 +0000 @@ -1,7 +1,8 @@ Source: pidgin-openfetion Section: net Priority: optional -Maintainer: Aron Xu +Maintainer: Debian Chinese Team +Uploaders: Aron Xu Build-Depends: debhelper (>= 7), cmake, libxml2-dev, libssl-dev, libpurple-dev Standards-Version: 3.9.2 Homepage: http://code.google.com/p/ofetion diff -Nru pidgin-openfetion-0.2/debian/patches/lp706076-bin-invalid-paths.patch pidgin-openfetion-0.3/debian/patches/lp706076-bin-invalid-paths.patch --- pidgin-openfetion-0.2/debian/patches/lp706076-bin-invalid-paths.patch 2011-05-04 17:41:17.000000000 +0000 +++ pidgin-openfetion-0.3/debian/patches/lp706076-bin-invalid-paths.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Description: Fix invalid paths in binary packages - Rewrite to use pkg-config to get paths of relevant libraries, instead - of searching with whereis and sed. -Author: Aron Xu -Bug-LP: 706076 -Last-Update: 2011-01-22 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,15 +49,14 @@ - ${PURPLE_LIBRARIES} - ) - --EXEC_PROGRAM("whereis libpurple| sed -e 's/[^\\/]*//' -e 's/\\(.*\\)lib\\/libpurple\\.so.*/\\1/'" -- OUTPUT_VARIABLE PURPLE_PREFIX) -- --EXEC_PROGRAM("whereis pidgin | sed -e 's/[^\\/]*//' -e 's/\\(.*\\)bin\\/pidgin.*/\\1/'" -- OUTPUT_VARIABLE PIDGIN_PREFIX) -- --SET(PIDGIN_PIX_INSTALL_DIR "${PIDGIN_PREFIX}share/pixmaps/pidgin/protocols/16/") --SET(RES_INSTALL_DIR "${PURPLE_PREFIX}share/purple/openfetion/") --SET(LIB_INSTALL_DIR "${PURPLE_PREFIX}lib/purple-${PURPLE_MAJOR_VERSION}") -+EXEC_PROGRAM("pkg-config --variable=datadir purple 2>/dev/null" -+ OUTPUT_VARIABLE PURPLE_DATADIR) -+EXEC_PROGRAM("pkg-config --variable=libdir purple 2>/dev/null" -+ OUTPUT_VARIABLE PURPLE_LIBDIR) -+ -+SET(PIDGIN_PIX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/pixmaps/pidgin/protocols/16/") -+SET(RES_INSTALL_DIR "${PURPLE_DATADIR}/purple/openfetion/") -+SET(LIB_INSTALL_DIR "${PURPLE_LIBDIR}/purple-${PURPLE_MAJOR_VERSION}") - SET(LOCALE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/locale/") - - ADD_DEFINITIONS(-DRES_DIR="${RES_INSTALL_DIR}") diff -Nru pidgin-openfetion-0.2/debian/patches/series pidgin-openfetion-0.3/debian/patches/series --- pidgin-openfetion-0.2/debian/patches/series 2011-05-04 17:41:17.000000000 +0000 +++ pidgin-openfetion-0.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -lp706076-bin-invalid-paths.patch diff -Nru pidgin-openfetion-0.2/fx_login.c pidgin-openfetion-0.3/fx_login.c --- pidgin-openfetion-0.2/fx_login.c 2011-05-04 09:49:59.000000000 +0000 +++ pidgin-openfetion-0.3/fx_login.c 2012-01-02 02:25:11.000000000 +0000 @@ -798,12 +798,12 @@ xmlNewProp(node , BAD_CAST "mobile-no" , BAD_CAST user->mobileno); xmlNewProp(node , BAD_CAST "user-id" , BAD_CAST user->userId); node1 = xmlNewChild(node , NULL , BAD_CAST "personal" , NULL); - xmlNewProp(node1 , BAD_CAST "version" , BAD_CAST user->personalVersion); + xmlNewProp(node1 , BAD_CAST "version" , BAD_CAST "0"/*user->personalVersion*/); xmlNewProp(node1 , BAD_CAST "attributes" , BAD_CAST "v4default"); node1 = xmlNewChild(node , NULL , BAD_CAST "custom-config" , NULL); - xmlNewProp(node1 , BAD_CAST "version" , BAD_CAST user->customConfigVersion); + xmlNewProp(node1 , BAD_CAST "version" , BAD_CAST "0"/*user->customConfigVersion*/); node1 = xmlNewChild(node , NULL , BAD_CAST "contact-list" , NULL); - xmlNewProp(node1 , BAD_CAST "version" , BAD_CAST user->contactVersion); + xmlNewProp(node1 , BAD_CAST "version" , BAD_CAST "0"/*user->contactVersion*/); xmlNewProp(node1 , BAD_CAST "buddy-attributes" , BAD_CAST "v4default"); node = xmlNewChild(rootnode , NULL , BAD_CAST "credentials" , NULL); xmlNewProp(node , BAD_CAST "domains" , BAD_CAST "fetion.com.cn");