[med-svn] r18918 - in trunk/packages/ginkgocadx/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-03-06 22:42:25 +0000 (Fri, 06 Mar 2015)
New Revision: 18918

Modified:
   trunk/packages/ginkgocadx/trunk/debian/changelog
   trunk/packages/ginkgocadx/trunk/debian/copyright
   trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch
   trunk/packages/ginkgocadx/trunk/debian/rules
   trunk/packages/ginkgocadx/trunk/debian/watch
Log:
Use uscan do download upstream source, upload to experimental (no bugs closed yet - wait for confirmation of bug reporters)


Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog	2015-03-06 12:24:43 UTC (rev 18917)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog	2015-03-06 22:42:25 UTC (rev 18918)
@@ -1,8 +1,14 @@
-ginkgocadx (3.7.1.1573.41+dfsg-1) UNRELEASED; urgency=medium
+ginkgocadx (3.7.1.1573.41+dfsg-1) experimental; urgency=medium
 
+  [ Dmitry Smirnov ]
   * New upstream release [December 2014].
   * Standards-Version: 3.9.6.
 
+  [ Andreas Tille ]
+  * d/rules: Use uscan + Files-Excluded
+  * d/watch: proper versionmangling
+  * d/copyright: point to SF as source location
+
  -- Dmitry Smirnov <onlyjob at debian.org>  Thu, 01 Jan 2015 12:18:14 +1100
 
 ginkgocadx (3.7.0.1465.37+dfsg-1) unstable; urgency=low

Modified: trunk/packages/ginkgocadx/trunk/debian/copyright
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/copyright	2015-03-06 12:24:43 UTC (rev 18917)
+++ trunk/packages/ginkgocadx/trunk/debian/copyright	2015-03-06 22:42:25 UTC (rev 18918)
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Ginkgo CADx
 Upstream-Contact: Carlos Barrales <carlos.barrales at metaemotion.com>
-Source: http://ginkgo-cadx.com
+Source: http://sourceforge.net/projects/ginkgocadx/
 Files-Excluded: src/cadxcore/jsoncpp
 
 Files: *

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch	2015-03-06 12:24:43 UTC (rev 18917)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch	2015-03-06 22:42:25 UTC (rev 18918)
@@ -5,8 +5,7 @@
 
 --- a/src/cadxcore/CMakeLists.txt
 +++ b/src/cadxcore/CMakeLists.txt
-@@ -77,9 +77,8 @@
- IF(NOT USE_SYSTEM_SQLITE)
+@@ -78,7 +78,6 @@ IF(NOT USE_SYSTEM_SQLITE)
  AUX_SOURCE_DIRECTORY(sqlite SRCS)
  ENDIF()
  
@@ -14,9 +13,7 @@
  
  AUX_SOURCE_DIRECTORY(endpoint SRCS)
  
- AUX_SOURCE_DIRECTORY(vtk SRCS)
-@@ -136,15 +135,21 @@
- 	${CMAKE_CURRENT_SOURCE_DIR}/wx
+@@ -137,13 +136,19 @@ SET(${PROJECT_NAME}_INCLUDE_DIR
  	${CMAKE_CURRENT_SOURCE_DIR}/wx/VTK
  	${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D
  	${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D/wxVTK
@@ -37,9 +34,7 @@
  ADD_DEFINITIONS(${libcurl_defines})
  INCLUDE_DIRECTORIES(${libcurl_INCLUDE_DIR})
  LINK_DIRECTORIES(${libcurl_DIR})
- #MESSAGE("LIBCURLLibx = ${libcurl_LIBRARIES} LIBCURL_include = ${libcurl_INCLUDE_DIR}  LIBCURL_LINK_DIR= ${libcurl_DIR} LIBCURL_DEFINES=${libcurl_defines}")
-@@ -272,8 +277,10 @@
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/tr/wxstd.mo DESTINATION share/ginkgocadx/lang/tr)
+@@ -273,6 +278,8 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/tr/cadxcore.mo DESTINATION share/ginkgocadx/lang/tr)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/conformance.xml DESTINATION share/ginkgocadx)
  ################ LIBS ################
@@ -48,4 +43,3 @@
  TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libcurl_LIBRARIES})
  
  TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${wxWidgets_LIBRARIES})
- 

Modified: trunk/packages/ginkgocadx/trunk/debian/rules
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/rules	2015-03-06 12:24:43 UTC (rev 18917)
+++ trunk/packages/ginkgocadx/trunk/debian/rules	2015-03-06 22:42:25 UTC (rev 18918)
@@ -44,13 +44,14 @@
         && dh_strip --dbg-package=$(PKG)-dbg \
         || dh_strip
 
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
+get-orig-source:
+	uscan --verbose --force-download --repack --compress xz
 
 ## http://wiki.debian.org/onlyjob/get-orig-source
+## A. Tille: I prefer using uscan + Files-Excluded.  Thus I wrote upstream
+##           about default tarball layout
 DTYPE := +dfsg
-.PHONY: get-orig-source
-get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
+get-orig-source_old: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
 	@
 
 $(PKG)_$(VER)$(DTYPE).orig.tar.xz:

Modified: trunk/packages/ginkgocadx/trunk/debian/watch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/watch	2015-03-06 12:24:43 UTC (rev 18917)
+++ trunk/packages/ginkgocadx/trunk/debian/watch	2015-03-06 22:42:25 UTC (rev 18918)
@@ -1,8 +1,5 @@
-## Use "debian/rules get-orig-source" to get DFSG-repackaged orig.tar
-## with corrected permissions.
-
 version=3
 
 ## Redirector http://qa.debian.org/watch/sf.php/ginkgocadx
-opts="dversionmangle=s/\+dfsg//" \
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
  http://sf.net/ginkgocadx/ginkgocadx-([0-9.]+)\.(?:tgz|tar\.gz|tar\.xz|tar\.bz2)