r35913 - in /packages/cimg/trunk/debian: ./ patches/
tille at users.alioth.debian.org
tille at users.alioth.debian.org
Tue Oct 20 11:24:08 UTC 2009
Author: tille
Date: Tue Oct 20 11:24:07 2009
New Revision: 35913
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35913
Log:
Split into three binary packages: cimg-dev, cimg-doc, cimg-examples; short debian/rules file using dh; lintian issues fixed; TODO: Check copyright, check Makefile of example packages, verify package functionality
Added:
packages/cimg/trunk/debian/README.source
packages/cimg/trunk/debian/cimg-dev.docs
packages/cimg/trunk/debian/cimg-dev.install
packages/cimg/trunk/debian/cimg-doc.doc-base
packages/cimg/trunk/debian/cimg-doc.install
packages/cimg/trunk/debian/cimg-examples.install
packages/cimg/trunk/debian/patches/10_do_not_build_gmic_examples.patch
Removed:
packages/cimg/trunk/debian/dirs
packages/cimg/trunk/debian/doc-base
packages/cimg/trunk/debian/docs
packages/cimg/trunk/debian/examples
packages/cimg/trunk/debian/links
Modified:
packages/cimg/trunk/debian/changelog
packages/cimg/trunk/debian/compat
packages/cimg/trunk/debian/control
packages/cimg/trunk/debian/patches/10_examples.patch
packages/cimg/trunk/debian/patches/series
packages/cimg/trunk/debian/rules
Added: packages/cimg/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/README.source?rev=35913&op=file
==============================================================================
--- packages/cimg/trunk/debian/README.source (added)
+++ packages/cimg/trunk/debian/README.source Tue Oct 20 11:24:07 2009
@@ -1,0 +1,4 @@
+This packages uses the quilt patch system. Please read
+/usr/share/doc/quilt/README.source for more information.
+
+ -- Andreas Tille <tille at debian.org> Fri, 09 Oct 2009 14:07:50 +0200
Modified: packages/cimg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/changelog?rev=35913&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog (original)
+++ packages/cimg/trunk/debian/changelog Tue Oct 20 11:24:07 2009
@@ -28,6 +28,8 @@
* debian/doc-base
* debian/patches: Added a patch by upstream to enable building
examples
+ * Split into three packages: cimg-dev, cimg-doc, cimg-examples
+ * Debhelper 7, short debian/rules file using dh
-- Andreas Tille <tille at debian.org> Fri, 09 Oct 2009 14:07:50 +0200
Added: packages/cimg/trunk/debian/cimg-dev.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/cimg-dev.docs?rev=35913&op=file
==============================================================================
--- packages/cimg/trunk/debian/cimg-dev.docs (added)
+++ packages/cimg/trunk/debian/cimg-dev.docs Tue Oct 20 11:24:07 2009
@@ -1,0 +1,1 @@
+README.txt
Added: packages/cimg/trunk/debian/cimg-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/cimg-dev.install?rev=35913&op=file
==============================================================================
--- packages/cimg/trunk/debian/cimg-dev.install (added)
+++ packages/cimg/trunk/debian/cimg-dev.install Tue Oct 20 11:24:07 2009
@@ -1,0 +1,2 @@
+plugins/*.h usr/include/CImg/plugins
+CImg.h usr/include
Added: packages/cimg/trunk/debian/cimg-doc.doc-base
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/cimg-doc.doc-base?rev=35913&op=file
==============================================================================
--- packages/cimg/trunk/debian/cimg-doc.doc-base (added)
+++ packages/cimg/trunk/debian/cimg-doc.doc-base Tue Oct 20 11:24:07 2009
@@ -1,0 +1,16 @@
+Document: cimg-doc
+Title: David Tschumperlé <David.Tschumperle at greyc.ensicaen.fr>
+Author: David Tschumperlé <David.Tschumperle at greyc.ensicaen.fr>
+Abstract: The CImg Library is an open-source C++ library for image processing.
+ It provides a minimal set of C++ classes that can be used to perform
+ several common operations on generic images (up to 4D multivalued ones).
+ It is simple-to-use, efficient, and portable. It's a really pleasant
+ toolkit for developing image processing stuffs in C++.
+Section: Science/Mathematics
+
+Format: html
+Files: /usr/share/doc/cimg-dev/html/*
+Index: /usr/share/doc/cimg-dev/html/index.shtml
+
+Format: pdf
+Files: /usr/share/doc/cimg-dev/html/CImg_reference.pdf
Added: packages/cimg/trunk/debian/cimg-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/cimg-doc.install?rev=35913&op=file
==============================================================================
--- packages/cimg/trunk/debian/cimg-doc.install (added)
+++ packages/cimg/trunk/debian/cimg-doc.install Tue Oct 20 11:24:07 2009
@@ -1,0 +1,1 @@
+html/*html html/img html/reference html/*.pdf html/*.png usr/share/doc/cimg-dev/html
Added: packages/cimg/trunk/debian/cimg-examples.install
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/cimg-examples.install?rev=35913&op=file
==============================================================================
--- packages/cimg/trunk/debian/cimg-examples.install (added)
+++ packages/cimg/trunk/debian/cimg-examples.install Tue Oct 20 11:24:07 2009
@@ -1,0 +1,1 @@
+examples/*.* examples/img examples/Makefile usr/share/doc/cimg-dev/examples
Modified: packages/cimg/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/compat?rev=35913&op=diff
==============================================================================
--- packages/cimg/trunk/debian/compat (original)
+++ packages/cimg/trunk/debian/compat Tue Oct 20 11:24:07 2009
@@ -1,1 +1,1 @@
-5
+7
Modified: packages/cimg/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/control?rev=35913&op=diff
==============================================================================
--- packages/cimg/trunk/debian/control (original)
+++ packages/cimg/trunk/debian/control Tue Oct 20 11:24:07 2009
@@ -7,7 +7,7 @@
Andreas Tille <tille at debian.org>
Build-Depends-Indep: doxygen, libx11-dev, libxrandr-dev, libmagick++-dev,
libfftw3-dev | fftw3-dev, libgimp2.0-dev, quilt
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.1)
Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/cimg/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/?rev=0&sc=0
@@ -17,7 +17,7 @@
Architecture: all
Depends: libx11-dev, libxrandr-dev, libmagick++9-dev, libfftw3-dev | fftw3-dev,
${misc:Depends}, ${shlibs:Depends}
-Suggests: xmedcon, lapack3-dev
+Suggests: xmedcon, lapack3-dev, cimg-doc, cimg-examples
Description: powerful image processing library
The CImg Library is a C++ toolkit providing simple classes and functions
to load, save, process and display images in your own C++ code. It consists
@@ -32,3 +32,45 @@
compile it with only standard C libraries. No need for exotic libraries and
complex dependencies.
+Package: cimg-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Enhances: cimg-dev
+Description: documentation of cimg-dev imaging library
+ The CImg Library is a C++ toolkit providing simple classes and functions
+ to load, save, process and display images in your own C++ code. It consists
+ only of a single header file CImg.h that must be included in your program
+ source. It contains useful image processing algorithms for loading/saving,
+ resizing/rotating, filtering, object drawing (text, lines, faces, ellipses,
+ ...), etc.
+ .
+ Images are instantiated by a class able to represent images up to 4-dimension
+ wide (from 1-D scalar signals to 3-D volumes of vector-valued pixels), with
+ template pixel types. It depends on a minimal number of libraries : you can
+ compile it with only standard C libraries. No need for exotic libraries and
+ complex dependencies.
+ .
+ This package contains the documentation.
+
+Package: cimg-examples
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: cimg-dev
+Enhances: cimg-dev, cimg-doc
+Description: examples for cimg-dev imaging library
+ The CImg Library is a C++ toolkit providing simple classes and functions
+ to load, save, process and display images in your own C++ code. It consists
+ only of a single header file CImg.h that must be included in your program
+ source. It contains useful image processing algorithms for loading/saving,
+ resizing/rotating, filtering, object drawing (text, lines, faces, ellipses,
+ ...), etc.
+ .
+ Images are instantiated by a class able to represent images up to 4-dimension
+ wide (from 1-D scalar signals to 3-D volumes of vector-valued pixels), with
+ template pixel types. It depends on a minimal number of libraries : you can
+ compile it with only standard C libraries. No need for exotic libraries and
+ complex dependencies.
+ .
+ This package contains examples for the usage of the library.
Added: packages/cimg/trunk/debian/patches/10_do_not_build_gmic_examples.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/10_do_not_build_gmic_examples.patch?rev=35913&op=file
==============================================================================
--- packages/cimg/trunk/debian/patches/10_do_not_build_gmic_examples.patch (added)
+++ packages/cimg/trunk/debian/patches/10_do_not_build_gmic_examples.patch Tue Oct 20 11:24:07 2009
@@ -1,0 +1,19 @@
+Author: Andreas Tille <tille at debian.org>
+Description: According to upstream author building gmic examples does not
+ make any sense and takes ages which is especially bad for weak architectures
+ so this is simply supressed here
+--- CImg-1.3.2.orig/examples/Makefile
++++ CImg-1.3.2/examples/Makefile
+@@ -77,9 +77,9 @@
+ use_RGBclass \
+
+ # Files which requires external libraries to run.
+-CIMG_EXTRA_FILES = use_jpeg_buffer \
+- gmic_gimp \
+- gmic
++CIMG_EXTRA_FILES = use_jpeg_buffer
++# gmic_gimp \
++# gmic
+
+ #---------------------------------
+ # Set correct variables and paths
Modified: packages/cimg/trunk/debian/patches/10_examples.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/10_examples.patch?rev=35913&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/10_examples.patch (original)
+++ packages/cimg/trunk/debian/patches/10_examples.patch Tue Oct 20 11:24:07 2009
@@ -1,3 +1,5 @@
+Author: David Tschumperlé <http://david.tschumperle.free.fr>
+Description: Fix problem with compiling gmic examples
--- CImg-1.3.2.orig/examples/Makefile
+++ CImg-1.3.2/examples/Makefile
@@ -289,7 +289,8 @@
Modified: packages/cimg/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/series?rev=35913&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/series (original)
+++ packages/cimg/trunk/debian/patches/series Tue Oct 20 11:24:07 2009
@@ -1,1 +1,2 @@
10_examples.patch
+10_do_not_build_gmic_examples.patch
Modified: packages/cimg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/rules?rev=35913&op=diff
==============================================================================
--- packages/cimg/trunk/debian/rules (original)
+++ packages/cimg/trunk/debian/rules Tue Oct 20 11:24:07 2009
@@ -1,81 +1,35 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
+# Sample debian/rules for cimg-dev package
+# GNU copyright 2009 Andreas Tille <tille at debian.org>
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+pkg=cimg-dev
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+%:
+ dh --with quilt $@
-CFLAGS = -Wall -g
+override_dh_compress:
+ dh_compress --exclude=.shtml \
+ --exclude=.pdf \
+ --exclude=.h \
+ --exclude=.cpp \
+ --exclude=.bmp \
+ --exclude=.pgm \
+ --exclude=.ppm \
+ --exclude=Makefile \
+ --exclude=.raw
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O3
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+override_dh_installchangelogs:
+ dh_installchangelogs --exclude=CHANGES.txt
+ mkdir -p $(CURDIR)/debian/$(pkg)/usr/share/doc/$(pkg)
+ cp -a CHANGES.txt $(CURDIR)/debian/$(pkg)/usr/share/doc/$(pkg)/changelog
-include /usr/share/quilt/quilt.make
+override_dh_auto_install:
+ cd examples && $(MAKE) Mlinux "LDFLAGS=-lm -lpthread"
-build: build-indep-stamp
-build-indep-stamp:
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- cd examples && $(MAKE) Mlinux "LDFLAGS=-lm -lpthread"
- cd examples && $(MAKE) clean
- touch build-indep-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp
+override_dh_auto_clean:
-cd examples && $(MAKE) clean
- rm -Rf html
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- rm -rf .pc
dh_clean
-
-install:
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs usr/share/doc/cimg-dev usr/include/CImg/plugins
- cp -a documentation html
- rm -f html/CImg.doxygen
- dh_install documentation examples usr/share/doc/cimg-dev
- dh_install CImg.h usr/include
- dh_install plugins/*.h usr/include/CImg/plugins
- dh_install
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples examples/*
- dh_installman
- dh_link
- dh_strip
- dh_compress -X cimg-dev/documentation/ -X cimg-dev/examples/
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
get-orig-source:
. debian/get-orig-source
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
More information about the debian-science-commits
mailing list