rev 19404 - in kde-extras/lensfun/trunk/debian: . patches source

Mark Purcell msp at alioth.debian.org
Sat Mar 9 03:33:14 UTC 2013 

Author: msp
Date: 2013-03-09 03:32:29 +0000 (Sat, 09 Mar 2013)
New Revision: 19404

Added:
   kde-extras/lensfun/trunk/debian/patches/
   kde-extras/lensfun/trunk/debian/patches/build_docs.diff
   kde-extras/lensfun/trunk/debian/patches/series
   kde-extras/lensfun/trunk/debian/source/
   kde-extras/lensfun/trunk/debian/source/format
Modified:
   kde-extras/lensfun/trunk/debian/changelog
   kde-extras/lensfun/trunk/debian/compat
   kde-extras/lensfun/trunk/debian/control
   kde-extras/lensfun/trunk/debian/liblensfun-doc.install
   kde-extras/lensfun/trunk/debian/rules
   kde-extras/lensfun/trunk/debian/watch
Log:
  - Fixes "FTBFS with libpng 1.5" (Closes: #648130)
* Switch to cmake - Thanks yofel at kubuntu.org 
* debian/compat -> 9
* New upstream release (LP: #1084730)
* Switch to new cmake based buildsystem as the old one doesn't create
  a properly versioned library anymore and is deprecated
  - Add build-dep on cmake
  - Drop buil-dep on autotools-dev
* Port package from cdbs to dh7 style rules 
  - Build-Depend on debhelper >= 7.0.50~
  - Drop build-dep on cdbs
  - rewrite rules to use dh instead of cdbs
  into the right path again
* Add ubuntu_build_docs.diff so the documentation is built and installed
* Update liblensfun-doc.install as the documentation is now installed into
  the right location right away
* Switch to source format 3.0 (quilt) for quilt support

Modified: kde-extras/lensfun/trunk/debian/changelog
===================================================================
--- kde-extras/lensfun/trunk/debian/changelog	2013-03-02 01:42:52 UTC (rev 19403)
+++ kde-extras/lensfun/trunk/debian/changelog	2013-03-09 03:32:29 UTC (rev 19404)
@@ -1,13 +1,34 @@
-lensfun (0.2.6-1) UNRELEASED; urgency=low
+lensfun (0.2.7-1) experimental; urgency=low
 
-  * NOT RELEASED YET
   * New upstream release
     - Fixes "new upstream version" (Closes: #679113)
+    - Fixes "FTBFS with libpng 1.5" (Closes: #648130)
   * Update debian/watch - Thanks Bart
   * Fixed "Build-Depends on libpng-dev" (Closes: #662391)
+  * Switch to cmake - Thanks yofel at kubuntu.org 
+  * debian/compat -> 9
 
- -- Mark Purcell <msp at debian.org>  Sat, 06 Oct 2012 16:09:44 +1000
+ -- Mark Purcell <msp at debian.org>  Sat, 09 Mar 2013 14:29:47 +1100
 
+lensfun (0.2.7-0ubuntu1) raring; urgency=low
+
+  * New upstream release (LP: #1084730)
+  * Switch to new cmake based buildsystem as the old one doesn't create
+    a properly versioned library anymore and is deprecated
+    - Add build-dep on cmake
+    - Drop buil-dep on autotools-dev
+  * Port package from cdbs to dh7 style rules 
+    - Build-Depend on debhelper >= 7.0.50~
+    - Drop build-dep on cdbs
+    - rewrite rules to use dh instead of cdbs
+    into the right path again
+  * Add ubuntu_build_docs.diff so the documentation is built and installed
+  * Update liblensfun-doc.install as the documentation is now installed into
+    the right location right away
+  * Switch to source format 3.0 (quilt) for quilt support
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Mon, 25 Feb 2013 20:49:11 +0100
+
 lensfun (0.2.5-2) unstable; urgency=low
 
   * Drop symbol support (Closes: #589048) 

Modified: kde-extras/lensfun/trunk/debian/compat
===================================================================
--- kde-extras/lensfun/trunk/debian/compat	2013-03-02 01:42:52 UTC (rev 19403)
+++ kde-extras/lensfun/trunk/debian/compat	2013-03-09 03:32:29 UTC (rev 19404)
@@ -1 +1 @@
-7
+9

Modified: kde-extras/lensfun/trunk/debian/control
===================================================================
--- kde-extras/lensfun/trunk/debian/control	2013-03-02 01:42:52 UTC (rev 19403)
+++ kde-extras/lensfun/trunk/debian/control	2013-03-09 03:32:29 UTC (rev 19404)
@@ -2,7 +2,7 @@
 Priority: extra
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, python, doxygen, libglib2.0-dev, libpng-dev
+Build-Depends: debhelper (>= 9), cmake, python, doxygen, libglib2.0-dev, libpng-dev
 Standards-Version: 3.8.1
 Section: libs
 Homepage: http://lensfun.berlios.de
@@ -18,7 +18,7 @@
   * cameras
   * lenses
  .
- It is used in various photo-related softwares in which it allows the
+ It is used in various photo-related software in which it allows the
  correction of various artifacts:
   * distortion
   * transveral (also known as lateral) chromatic aberrations
@@ -40,7 +40,7 @@
   * cameras
   * lenses
  .
- It is used in various photo-related softwares in which it allows the
+ It is used in various photo-related software in which it allows the
  correction of various artifacts:
   * distortion
   * transveral (also known as lateral) chromatic aberrations
@@ -62,7 +62,7 @@
   * cameras
   * lenses
  .
- It is used in various photo-related softwares in which it allows the
+ It is used in various photo-related software in which it allows the
  correction of various artifacts:
   * distortion
   * transveral (also known as lateral) chromatic aberrations
@@ -85,7 +85,7 @@
   * cameras
   * lenses
  .
- It is used in various photo-related softwares in which it allows the
+ It is used in various photo-related software in which it allows the
  correction of various artifacts:
   * distortion
   * transveral (also known as lateral) chromatic aberrations

Modified: kde-extras/lensfun/trunk/debian/liblensfun-doc.install
===================================================================
--- kde-extras/lensfun/trunk/debian/liblensfun-doc.install	2013-03-02 01:42:52 UTC (rev 19403)
+++ kde-extras/lensfun/trunk/debian/liblensfun-doc.install	2013-03-09 03:32:29 UTC (rev 19404)
@@ -1,4 +1,4 @@
-usr/share/doc/*/manual usr/share/doc/liblensfun-doc/
+usr/share/doc/liblensfun-doc
 docs/lens-calibration usr/share/doc/liblensfun-doc/
 docs/mounts.txt usr/share/doc/liblensfun-doc/ 
 docs/manual-main.txt usr/share/doc/liblensfun-doc/

Added: kde-extras/lensfun/trunk/debian/patches/build_docs.diff
===================================================================
--- kde-extras/lensfun/trunk/debian/patches/build_docs.diff	                        (rev 0)
+++ kde-extras/lensfun/trunk/debian/patches/build_docs.diff	2013-03-09 03:32:29 UTC (rev 19404)
@@ -0,0 +1,40 @@
+Decription: doc install fixes for cmake
+ Correctly build and install the documenation files.
+ Taken from:
+ http://developer.berlios.de/patch/?func=detailpatch&patch_id=3421&group_id=9034
+ http://developer.berlios.de/patch/?func=detailpatch&patch_id=3420&group_id=9034
+Origin: upstream
+Index: b/docs/CMakeLists.txt
+Author: Ubuntu
+===================================================================
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -12,12 +12,12 @@ CONFIGURE_FILE(doxyfile.in.cmake ${DOXYF
+ 
+ # now build documentation
+ ADD_CUSTOM_TARGET(doc
++  ALL
+   COMMAND "${DOXYGEN_EXECUTABLE}"
+-  DEPENDS doxyfile.in.cmake manual-main.txt ../include/lensfun/lensfun.h.in
++  DEPENDS ${DOXYFILE} manual-main.txt ../include/lensfun/lensfun.h.in
+   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+   COMMENT "Building documentation with doxygen"
+ )
+ 
+ # install documentation  
+-FILE(GLOB doc_files "${CMAKE_DOC_OUT}/*.*")
+-INSTALL(FILES ${doc_files} DESTINATION ${DOCDIR})
++INSTALL(DIRECTORY ${CMAKE_DOC_OUT}/ DESTINATION ${DOCDIR})
+Index: b/CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,7 +77,7 @@ SET(BINDIR bin)
+ SET(LIBDIR lib${LIB_SUFFIX})
+ SET(INCLUDEDIR include)
+ SET(DATADIR share/lensfun)
+-SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX})
++SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX} CACHE STRING "Directory to put library documentation in")
+ 
+ IF(WIN32)
+   # install into place in build-dir  

Added: kde-extras/lensfun/trunk/debian/patches/series
===================================================================
--- kde-extras/lensfun/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/lensfun/trunk/debian/patches/series	2013-03-09 03:32:29 UTC (rev 19404)
@@ -0,0 +1 @@
+build_docs.diff

Modified: kde-extras/lensfun/trunk/debian/rules
===================================================================
--- kde-extras/lensfun/trunk/debian/rules	2013-03-02 01:42:52 UTC (rev 19403)
+++ kde-extras/lensfun/trunk/debian/rules	2013-03-09 03:32:29 UTC (rev 19404)
@@ -1,15 +1,11 @@
 #!/usr/bin/make -f
+%:
+	dh $@ --buildsystem=cmake
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
 # disable --vectorization= while we workout howto cross platform
+override_dh_auto_configure:
+	dh_auto_configure -- -DBUILD_DOC=ON -DDOCDIR="share/doc/liblensfun-doc"
 
-configure/liblensfun-dev::
-	./configure  --prefix=/usr --libdir=/usr/lib --vectorization=
-
-DEB_MAKE_BUILD_TARGET := all
-DEB_MAKE_INSTALL_TARGET := install  DESTDIR=$(CURDIR)/debian/tmp/
-DEB_MAKE_CHECK_TARGET := tests
-DEB_DH_MAKESHLIBS_ARGS_ALL := -- -v0.2.6
+override_dh_auto_clean:
+	find -name "*.pyc" -exec rm -f '{}' \;
+	dh_auto_clean

Added: kde-extras/lensfun/trunk/debian/source/format
===================================================================
--- kde-extras/lensfun/trunk/debian/source/format	                        (rev 0)
+++ kde-extras/lensfun/trunk/debian/source/format	2013-03-09 03:32:29 UTC (rev 19404)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: kde-extras/lensfun/trunk/debian/watch
===================================================================
--- kde-extras/lensfun/trunk/debian/watch	2013-03-02 01:42:52 UTC (rev 19403)
+++ kde-extras/lensfun/trunk/debian/watch	2013-03-09 03:32:29 UTC (rev 19404)
@@ -1,6 +1,6 @@
 version=3
-#http://sf.net/lensfun.berlios/lensfun-(.*)\.tar\.bz2 debian svn-upgrade
+http://sf.net/lensfun.berlios/lensfun-(.*)\.tar\.bz2 debian svn-upgrade
 
-http://developer.berlios.de/project/showfiles.php?group_id=9034 .*/lensfun-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz))
+http://developer.berlios.de/project/showfiles.php?group_id=9034 .*/lensfun-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz)) debian svn-upgrade
 # Bart Martens <bartm at debian.org>  Thu, 22 Nov 2012 23:34:40 +0000

More information about the pkg-kde-commits mailing list