--- gnote-0.4.0.orig/gnote-0.4.0.tar.bz2.cdbs-config_list +++ gnote-0.4.0/gnote-0.4.0.tar.bz2.cdbs-config_list @@ -0,0 +1,3 @@ +gnote-0.4.0/config.h.in +gnote-0.4.0/config.guess +gnote-0.4.0/config.sub --- gnote-0.4.0.orig/debian/buildcore.mk +++ gnote-0.4.0/debian/buildcore.mk @@ -0,0 +1,290 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters +# Description: Defines the rule framework +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildcore +_cdbs_rules_buildcore = 1 + +include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix) + +# Can we change this to cdbs_curpkg = $(notdir $@) ? +cdbs_curpkg = $(filter-out %/,$(subst /,/ ,$@)) + +testdir: debian/control + test -x debian/rules + +testroot: +ifdef _cdbs_rules_debhelper + dh_testroot +else + test "`id -u`" = 0 +endif + +$(patsubst %,makebuilddir/%,$(DEB_ALL_PACKAGES)) :: makebuilddir/% : + $(if $(DEB_BUILDDIR_$(cdbs_curpkg)),mkdir -p "$(DEB_BUILDDIR_$(cdbs_curpkg))") + +makebuilddir:: $(patsubst %,makebuilddir/%,$(DEB_ALL_PACKAGES)) + mkdir -p "$(DEB_BUILDDIR)" + +cdbs_streq = $(if $(filter-out xx,x$(subst $1,,$2)$(subst $2,,$1)x),,yes) + +cleanbuilddir:: $(patsubst %,cleanbuilddir/%,$(DEB_ALL_PACKAGES)) + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rmdir $(DEB_BUILDDIR)) + +$(patsubst %,cleanbuilddir/%,$(DEB_ALL_PACKAGES)) :: cleanbuilddir/% : + -$(if $(DEB_BUILDDIR_$(cdbs_curpkg)),$(if $(call cdbs_streq,$(DEB_BUILDDIR_$(cdbs_curpkg)),$(DEB_SRCDIR)),,rmdir "$(DEB_BUILDDIR_$(cdbs_curpkg))")) + + +# This variable is used by tarball.mk, but we want it here in order to check +# tarball contents before unpacking. tarball.mk imports this file anyway. +DEB_TARBALL ?= $(wildcard *.tar *.tgz *.tar.gz *.tar.bz *.tar.bz2 *.zip) + +ifneq (, $(findstring .bz2, $(DEB_TARBALL))) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), bzip2 +endif +ifneq (, $(findstring .zip, $(DEB_TARBALL))) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), unzip +endif + +# make is dumb +close_parenthesis = ) + +ifneq (, $(DEB_TARBALL)) +$(warning parsing $(DEB_TARBALL) ...) +config_all_tar := $(shell \ +for i in $(DEB_TARBALL) ; do \ + if ! test -e $$i.cdbs-config_list ; then \ + echo Parsing $$i... >&2 ; \ + case $$i in \ + *.tar$(close_parenthesis) tar -tf $$i | grep "/config\.[^/]*$$" > $$i.cdbs-config_list ;; \ + *.tgz|*.tar.gz$(close_parenthesis) tar -tzf $$i | grep "/config\.[^/]*$$" > $$i.cdbs-config_list ;; \ + *.tar.bz|*.tar.bz2$(close_parenthesis) tar -tjf $$i | grep "/config\.[^/]*$$" > $$i.cdbs-config_list ;; \ + *.zip$(close_parenthesis) unzip -l $$i | grep "/config\.[^/]*$$" > $$i.cdbs-config_list ;; \ + *$(close_parenthesis) echo Warning: tarball $$i with unknown format >&2 ;; \ + esac ; \ + fi ; \ + cat $$i.cdbs-config_list ; \ +done) +endif + +# Avoid recursive braindamage if we're building autotools-dev +ifeq (, $(shell grep -x 'Package: autotools-dev' debian/control)) +config_guess := $(shell find $(DEB_SRCDIR) -type f -name config.guess) +config_sub := $(shell find $(DEB_SRCDIR) -type f -name config.sub) +ifneq (, $(config_all_tar)) +config_guess_tar := $(filter %/config.guess, $(config_all_tar)) +config_sub_tar := $(filter %/config.sub, $(config_all_tar)) +endif +endif +# Ditto for gnulib +ifeq (, $(shell grep -x 'Package: gnulib' debian/control)) +config_rpath := $(shell find $(DEB_SRCDIR) -type f -name config.rpath) +ifneq (, $(config_all_tar)) +config_rpath_tar := $(filter %/config.rpath, $(config_all_tar)) +endif +endif + +ifneq (, $(config_guess)$(config_sub)$(config_guess_tar)$(config_sub_tar)) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autotools-dev +endif +ifneq (, $(config_rpath)$(config_rpath_tar)) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), gnulib (>= 0.0.20041014-2) +endif + +# This target is called before almost anything else happens. It's a good place +# to do stuff like unpack extra source tarballs, apply patches, and stuff. In +# the future it will be a good place to generate debian/control, but right +# now we don't support that very well. +pre-build:: testdir makebuilddir + $(foreach x,$(_cdbs_deprecated_vars),$(if $(shell test "$($x)" != "$(_cdbs_deprecated_$(x)_default)" && echo W),$(warning WARNING: $x is a deprecated variable))) + +# This target is called after patches are applied. Used by the patch system. +post-patches:: pre-build apply-patches update-config +update-config:: +ifneq (, $(config_guess)) + if test -e /usr/share/misc/config.guess ; then \ + for i in $(config_guess) ; do \ + if ! test -e $$i.cdbs-orig ; then \ + mv $$i $$i.cdbs-orig ; \ + cp --remove-destination /usr/share/misc/config.guess $$i ; \ + fi ; \ + done ; \ + fi +endif +ifneq (, $(config_sub)) + if test -e /usr/share/misc/config.sub ; then \ + for i in $(config_sub) ; do \ + if ! test -e $$i.cdbs-orig ; then \ + mv $$i $$i.cdbs-orig ; \ + cp --remove-destination /usr/share/misc/config.sub $$i ; \ + fi ; \ + done ; \ + fi +endif +ifneq (, $(config_rpath)) + if test -e /usr/share/gnulib/config/config.rpath ; then \ + for i in $(config_rpath) ; do \ + if ! test -e $$i.cdbs-orig ; then \ + mv $$i $$i.cdbs-orig ; \ + cp --remove-destination /usr/share/gnulib/config/config.rpath $$i ; \ + fi ; \ + done ; \ + fi +endif + +# This target should be used to configure the package before building. Typically +# this involves running things like ./configure. +common-configure-arch:: post-patches +common-configure-indep:: post-patches +$(patsubst %,configure/%,$(DEB_ARCH_PACKAGES)) :: configure/% : common-configure-arch +$(patsubst %,configure/%,$(DEB_INDEP_PACKAGES)) :: configure/% : common-configure-indep + +# This is a required Debian target; however, its specific semantics is +# in dispute. We are of the opinion that 'build' should invoke +# build-arch and build-indep. Policy tends to support us here. +# However, dpkg-buildpackage is currently invokes debian/rules build +# even when doing an architecture-specific (binary-arch) build. This +# essentially means Build-Depends-Indep is worthless. For more +# information, see Policy §5.2, Policy §7.6, and Debian Bug #178809. +# For now, you may override the dependencies by setting the variable +# DEB_BUILD_DEPENDENCIES, below. This is not recommended. +DEB_BUILD_DEPENDENCIES = build-arch build-indep +build: $(DEB_BUILD_DEPENDENCIES) + +# This target should take care of actually compiling the package from source. +# Most often this involves invoking "make". +common-build-arch:: testdir $(patsubst %,configure/%,$(DEB_ARCH_PACKAGES)) +common-build-indep:: testdir $(patsubst %,configure/%,$(DEB_INDEP_PACKAGES)) +$(patsubst %,build/%,$(DEB_ARCH_PACKAGES)) :: build/% : common-build-arch configure/% +$(patsubst %,build/%,$(DEB_INDEP_PACKAGES)) :: build/% : common-build-indep configure/% + +# This rule is for stuff to run after the build process. Note that this +# may run under fakeroot or sudo, so it's inappropriate for things that +# should be run under the build target. +common-post-build-arch:: common-build-arch $(patsubst %,build/%,$(DEB_ARCH_PACKAGES)) +common-post-build-indep:: common-build-indep $(patsubst %,build/%,$(DEB_INDEP_PACKAGES)) + +# Required Debian targets. +build-arch: $(patsubst %,build/%,$(DEB_ARCH_PACKAGES)) +build-indep: $(patsubst %,build/%,$(DEB_INDEP_PACKAGES)) + +# This rule is used to prepare the source package before a diff is generated. +# Typically you will invoke upstream's "make clean" rule here, although you +# can also hook in other stuff here. Many of the included rules and classes +# add stuff to this rule. +clean:: testdir testroot cleanbuilddir reverse-config +reverse-config:: +ifneq (::, $(config_guess):$(config_sub):$(config_rpath)) + for i in $(config_guess) $(config_sub) $(config_rpath) ; do \ + if test -e $$i.cdbs-orig ; then \ + mv $$i.cdbs-orig $$i ; \ + fi ; \ + done +endif + +ifneq (, $(DEB_AUTO_UPDATE_DEBIAN_CONTROL)) +control_cpu := $(shell grep "^Cpu:" debian/control.in | sed -e "s/^.*: //g" -e "s/ /,/g") +ifeq (, $(control_cpu)) +ifneq (, $(shell egrep "\[(system|cpu): .*\]" debian/control.in)) +$(error inconsistency in control.in: [(system|cpu): ] tags were used but Cpu:|System: was not) +endif +else +# Prevent recursive braindamage when building type-handling with cdbs. +ifeq (, $(shell grep -x 'Package: type-handling' debian/control)) +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), type-handling (>= 0.2.5) +endif +control_system := $(shell grep "^System:" debian/control.in | sed -e "s/^.*: //g" -e "s/ /,/g") +control_arch := $(shell type-handling $(control_cpu) $(control_system)) +endif +endif +debian/control:: +ifneq ($(DEB_AUTO_UPDATE_DEBIAN_CONTROL),) + sed \ + -e "s/@cdbs@/$(CDBS_BUILD_DEPENDS)/g" \ + -e "s/^Build-Depends\(\|-Indep\): ,/Build-Depends\1:/g" \ + \ + -e "s/^Cpu: .*/Architecture: $(control_arch)/g" \ + -e "/^System: /d" \ + \ + -e "s/\[cpu: \([^]]*\)\]/\[\`type-handling \\\\\`echo \1 | tr ' ' ','\\\\\` any\`\]/g" \ + -e "s/\[system: \([^]]*\)\]/\[\`type-handling any \\\\\`echo \1 | tr ' ' ','\\\\\`\`\]/g" \ + \ + -e "s/\"/\\\\\"/g" \ + -e "s/^/echo \"/g" \ + -e "s/\\$$/\\\\$$/g" \ + -e "s/$$/\"/g" \ + < debian/control.in | $(SHELL) > debian/control + -dpkg-checkbuilddeps -B +endif + +# This rule is called before the common-install target. It's currently only +# used by debhelper.mk, to run dh_clean -k. +common-install-prehook-arch:: +common-install-prehook-indep:: + +# This target should do all the work of installing the package into the +# staging directory (debian/packagename or debian/tmp). +common-install-arch:: testdir common-install-prehook-arch common-post-build-arch +common-install-indep:: testdir common-install-prehook-indep common-post-build-indep + +# Required Debian targets. +install-arch: $(patsubst %,install/%,$(DEB_ARCH_PACKAGES)) +install-indep: $(patsubst %,install/%,$(DEB_INDEP_PACKAGES)) + +# These rules should do any installation work specific to a particular package. +$(patsubst %,install/%,$(DEB_ARCH_PACKAGES)) :: install/% : testdir testroot common-install-arch build/% +$(patsubst %,install/%,$(DEB_INDEP_PACKAGES)) :: install/% : testdir testroot common-install-indep build/% + +# This rule is called after all packages are installed. +common-binary-arch:: testdir testroot $(patsubst %,install/%,$(DEB_ARCH_PACKAGES)) +common-binary-indep:: testdir testroot $(patsubst %,install/%,$(DEB_INDEP_PACKAGES)) + +# Required Debian targets +binary-indep: $(patsubst %,binary/%,$(DEB_INDEP_PACKAGES)) +binary-arch: $(patsubst %,binary/%,$(DEB_ARCH_PACKAGES)) + +# These rules should do all the work of actually creating a .deb from the staging +# directory. +$(patsubst %,binary/%,$(DEB_ARCH_PACKAGES)) :: binary/% : testdir testroot common-binary-arch install/% +$(patsubst %,binary/%,$(DEB_INDEP_PACKAGES)) :: binary/% : testdir testroot common-binary-indep install/% + +# Required Debian target +binary: binary-indep binary-arch + +## +# Deprecated targets. You should use the -arch and -indep targets instead. +## +common-configure:: common-configure-arch common-configure-indep +common-build:: common-build-arch common-build-indep +common-post-build:: common-post-build-arch common-post-build-indep +common-install-prehook:: common-install-prehook-arch common-install-prehook-indep +common-install:: common-install-arch common-install-indep +common-binary:: common-binary-arch common-binary-indep + +.PHONY: pre-build apply-patches post-patches common-configure-arch common-configure-indep $(patsubst %,configure/%,$(DEB_ALL_PACKAGES)) build common-build-arch common-build-indep $(patsubst %,build/%,$(DEB_ALL_PACKAGES)) build-arch build-indep clean common-install-arch common-install-indep install-arch install-indep $(patsubst %,install/%,$(DEB_ALL_PACKAGES)) common-binary-arch common-binary-indep $(patsubst %,binary/%,$(DEB_ALL_PACKAGES)) binary-indep binary-arch binary $(DEB_PHONY_RULES) + +# Parallel execution of the cdbs makefile fragments will fail, but +# this way you can call dpkg-buildpackage with MAKEFLAGS=-j in the +# environment and the package's own makefiles can use parallel make. +.NOTPARALLEL: + +endif --- gnote-0.4.0.orig/debian/changelog +++ gnote-0.4.0/debian/changelog @@ -0,0 +1,132 @@ +gnote (0.4.0-3~bpo50+1) lenny-backports; urgency=low + + * lenny backport. + + -- Robert Millan Sun, 14 Jun 2009 20:47:00 +0200 + +gnote (0.4.0-3) unstable; urgency=high + + * patches/02_fix_date_conversion.diff: New patch (from upstream). Fix + segfault when g_time_val_to_iso8601() fails at converting datestamps + from Tomboy. + + -- Robert Millan Sun, 14 Jun 2009 17:26:21 +0200 + +gnote (0.4.0-2) unstable; urgency=low + + * Add -Wl,--as-needed to LDFLAGS. (Closes: #529213) + - rules + - patches/01_boost_m4.diff: New patch (from upstream) to fix --as-needed. + * control (Provides): Add tomboy. + + -- Robert Millan Sun, 07 Jun 2009 19:48:06 +0200 + +gnote (0.4.0-1) unstable; urgency=low + + * New upstream release. + - control (Build-Depends): Add libxslt1-dev. + * rules: Include tarball.mk first to prevent cdbs from building + config.status twice. + * control (Build-Depends): Require libxml++2.6-dev (>= 2.26). According to + upstream, earlier versions are too buggy for Gnote to work reliably. + + -- Robert Millan Fri, 29 May 2009 19:13:04 +0200 + +gnote (0.3.1-7) unstable; urgency=low + + * Fix a pair of problems in German translation (patches from upstream): + - patches/03_fix_german_1.diff (Closes: #528930) + - patches/04_fix_german_2.diff (Closes: #528931) + + -- Robert Millan Mon, 18 May 2009 09:06:18 +0200 + +gnote (0.3.1-6) unstable; urgency=low + + * copyright: Document GFDL in help/*. + * copyright: List libtomboy/eggaccelerators.[ch]. + + -- Robert Millan Mon, 11 May 2009 09:33:37 +0200 + +gnote (0.3.1-5) unstable; urgency=low + + * Misc debian/copyright improvements. + + -- Robert Millan Sun, 10 May 2009 21:09:26 +0200 + +gnote (0.3.1-4) unstable; urgency=low + + * Add missing reference to GPL/LGPL license text. + + -- Robert Millan Sun, 10 May 2009 20:04:55 +0200 + +gnote (0.3.1-3) unstable; urgency=low + + * Rewrite debian/copyright by (loosely) following DEP-5 proposal. + + -- Robert Millan Sun, 10 May 2009 18:51:56 +0200 + +gnote (0.3.1-2) unstable; urgency=low + + * Use © symbol for copyright lines. + * Support debhelper 6. + * patches/01_applet_in_libexec.diff: Move applet to /usr/lib/gnote. + * patches/02_assume_utf8.diff: Assume UTF-8 encoding (fixes lintian warning). + + -- Robert Millan Wed, 06 May 2009 20:11:35 +0200 + +gnote (0.3.1-1) unstable; urgency=low + + * New upstream release. + - Remove 10-gnote_applet_fix.patch (merged). + + [ Savvas Radevic ] + * Remove *.la files during build. + + [ Robert Millan ] + * rules: Include /usr/share/cdbs/1/class/gnome.mk for gconf setup. + * control (Build-Depends): Add libgtkspell-dev to enable spell checker. + + -- Robert Millan Wed, 06 May 2009 02:56:37 +0200 + +gnote (0.3.0-1) unstable; urgency=low + + * New upstream release. + - Includes panel applet. + - Adds a few add-ons. + - patches/02_manpage_syntax.diff: Remove (merged). + - Buildable on Lenny (gtk+ 2.12). Add xdg-utils as alternate dependency + when libgtk2.0-0 (>= 2.14) is not present. + + [ Savvas Radevic ] + * Add debian/watch file. + * control (Standards-Version): Bump to 3.8.1. + * Added 10-gnote_applet_fix.patch (fixes applet icon to "gnote"). + + [ Robert Millan ] + * rules: Add get-orig-source rule. + + -- Robert Millan Tue, 05 May 2009 02:25:19 +0200 + +gnote (0.2.0-2) unstable; urgency=low + + * 01_fhs.diff: Remove. Instead pass --with-gconf-schema-file-dir=\ + /usr/share/gconf/schemas to configure. + + -- Robert Millan Sun, 26 Apr 2009 02:23:55 +0200 + +gnote (0.2.0-1) unstable; urgency=low + + * New upstream release. + - rules: Avoid hardcoding version number. + - patches/01_fhs.diff: Resync. + + * copyright: Minor clarification. + * patches/02_manpage_syntax.diff: Fix syntax error in gnote.1. + + -- Robert Millan Sat, 25 Apr 2009 14:04:54 +0200 + +gnote (0.1.1-1) unstable; urgency=low + + * Initial release. (Closes: #523093) + + -- Robert Millan Fri, 10 Apr 2009 22:27:00 +0200 --- gnote-0.4.0.orig/debian/control +++ gnote-0.4.0/debian/control @@ -0,0 +1,39 @@ +Source: gnote +Section: gnome +Priority: optional +Maintainer: Robert Millan +Build-Depends: cdbs, + debhelper (>= 6), + bzip2, + automake (>= 1:1.10), automake (<< 1:1.11), + autoconf (>= 2.53), + pkg-config (>= 0.14.0), + libgtk2.0-dev (>= 2.12), + libglibmm-2.4-dev, + libgtkmm-2.4-dev, + libpanelappletmm-2.6-dev, + libgtkspell-dev, + libxml++2.6-dev (>= 2.26), + libgconf2-dev, + uuid-dev, + libboost-dev, + libboost-filesystem-dev, + libboost-regex-dev, + libboost-test-dev, + intltool (>= 0.35), + gnome-doc-utils (>= 0.4.2), + rarian-compat, + libxslt1-dev, +Standards-Version: 3.8.1 +Homepage: http://live.gnome.org/Gnote + +Package: gnote +Architecture: any +Provides: tomboy +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-0 (>= 2.14) | xdg-utils +Description: desktop note taking program using Wiki style links + Gnote is a desktop note-taking application which is simple and easy to + use. It lets you organise your notes intelligently by allowing you to + easily link ideas together with Wiki style interconnects. + . + It is a port of Tomboy to C++ and consumes less resources. --- gnote-0.4.0.orig/debian/watch +++ gnote-0.4.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/gnote/(?:[\d\w\.]+)/gnote-(.*)\.tar\.bz2 --- gnote-0.4.0.orig/debian/compat +++ gnote-0.4.0/debian/compat @@ -0,0 +1 @@ +6 --- gnote-0.4.0.orig/debian/rules +++ gnote-0.4.0/debian/rules @@ -0,0 +1,42 @@ +#!/usr/bin/make -f + +deb_version := $(shell dpkg-parsechangelog | sed -ne "s/^Version: \(.*\)/\1/p") +orig_version := $(shell echo $(deb_version) | sed -e "s/-.*//") +upstream_version := $(shell echo $(orig_version) | sed -e "s/+.*//") +major := $(shell echo $(upstream_version) | sed -e "s/\([0-9]\+\.[0-9]\+\)\..*/\1/g") +upstream_base_url := http://ftp.gnome.org/pub/GNOME/sources/gnote + +DEB_TAR_SRCDIR := gnote-$(upstream_version) + +DEB_AUTO_UPDATE_AUTOMAKE := 1.10 +DEB_AUTO_UPDATE_AUTOCONF := 2.50 +DEB_CONFIGURE_USER_FLAGS := \ + --disable-scrollkeeper \ + --disable-static \ + $(NULL) + +LDFLAGS = "-Wl,--as-needed" + +include /usr/share/cdbs/1/rules/tarball.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk # must be after debhelper.mk + +clean:: + rm -rf tempdir + +get-orig-source: ../gnote_$(orig_version).orig.tar.gz + +../gnote_$(orig_version).orig.tar.gz: tempdir/gnote-$(upstream_version)/gnote-$(upstream_version).tar.bz2 + tar -C tempdir -cf - --mtime=@0 gnote-$(upstream_version) | gzip -fn9 > $@ + +tempdir/gnote-$(upstream_version)/gnote-$(upstream_version).tar.bz2: + mkdir -p `dirname $@` + wget $(upstream_base_url)/$(major)/gnote-$(upstream_version).tar.bz2 -O - > $@ || rm -f $@ + cd tempdir/gnote-$(upstream_version) && wget $(upstream_base_url)/$(major)/gnote-$(upstream_version).md5sum -O - -q \ + | grep bz2 \ + | md5sum -c - + +binary-install/gnote:: + find debian/gnote -name "*.la" -exec rm -f "{}" \; --- gnote-0.4.0.orig/debian/docs +++ gnote-0.4.0/debian/docs @@ -0,0 +1 @@ +debian/fdl-1.2.txt --- gnote-0.4.0.orig/debian/copyright +++ gnote-0.4.0/debian/copyright @@ -0,0 +1,170 @@ +Name: Gnote +Maintainer: Hubert Figuiere +Source: http://live.gnome.org/Gnote + +Files: * +Copyright: 2004, 2005 Alex Graveley + 2009, Hubert Figuiere +License: GPL-3+ and LGPL-2.1 + Hubert Figuiere's part of the file covered under GPL-3+. + . + Alex Graveley's part of the file covered under LGPL-2.1. + +Files: help/* +Copyright: 2008, Alex Graveley + 2008, Brent Smith + 2008, Free Software Foundation + 2008, Boyd Timothy + 2008, Sandy Armstrong + 2008, Paul Cutler + 2009, Hubert Figuiere +License: GFDL-1.1+ + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License (GFDL), Version 1.1 or any later version published + by the Free Software Foundation with no Invariant Sections, + no Front-Cover Texts, and no Back-Cover Texts. + . + You can find a copy of the GFDL, version 1.2, in the `fdl-1.2.txt' + file. + +Files: src/sharp/*.[ch]pp +Copyright: 2009, Hubert Figuiere +License: other + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +Files: install-sh +Copyright: 1994, X Consortium +License: other + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of the X Consortium shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from the X Consor- + tium. + +Files: src/contrast.[ch]pp +Copyright: 2006-2007, David Trowbridge +License: other + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: src/actionmanager.cpp +Copyright: 2009, Hubert Figuiere + 2005-2006, Novell, Inc. +License: GPL-3+ and other + Hubert Figuiere's part of the file covered under GPL-3+. + . + Novell's part of the file covered under the following terms: + . + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +Files: libtomboy/{tomboykeybinder,tomboyutil}.[ch] +Copyright: 2008, Alex Graveley +License: other + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: libtomboy/eggaccelerators.[ch] +Copyright: 2002, Red Hat, Inc. + 1998, 2001, Tim Janik +License: LGPL-2+ + +Files: debian/* +Copyright: 2009, Robert Millan +License: GPL-3+ + + +License: GPL-3+ + On Debian systems the full text of the GNU General Public + License can be found in the `/usr/share/common-licenses/GPL' + file. + +License: LGPL-2.1 + On Debian systems the full text of the GNU Lesser General Public + License, version 2.1, can be found in the + `/usr/share/common-licenses/LGPL-2.1' file. + +License: LGPL-2+ + On Debian systems the full text of the GNU Lesser General Public + License can be found in the `/usr/share/common-licenses/LGPL' + file. --- gnote-0.4.0.orig/debian/fdl-1.2.txt +++ gnote-0.4.0/debian/fdl-1.2.txt @@ -0,0 +1,397 @@ + GNU Free Documentation License + Version 1.2, November 2002 + + + Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document "free" in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The "Document", below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as "you". You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall subject +(or to related matters) and contains nothing that could fall directly +within that overall subject. (Thus, if the Document is in part a +textbook of mathematics, a Secondary Section may not explain any +mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML, PostScript or PDF designed for human modification. Examples of +transparent image formats include PNG, XCF and JPG. Opaque formats +include proprietary formats that can be read and edited only by +proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML, PostScript or PDF produced by some word +processors for output purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +A section "Entitled XYZ" means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as "Acknowledgements", +"Dedications", "Endorsements", or "History".) To "Preserve the Title" +of such a section when you modify the Document means that it remains a +section "Entitled XYZ" according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no other +conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to give +them a chance to provide you with an updated version of the Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. +O. Preserve any Warranty Disclaimers. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled "History" +in the various original documents, forming one section Entitled +"History"; likewise combine any sections Entitled "Acknowledgements", +and any sections Entitled "Dedications". You must delete all sections +Entitled "Endorsements". + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other documents +released under this License, and replace the individual copies of this +License in the various documents with a single copy that is included in +the collection, provided that you follow the rules of this License for +verbatim copying of each of the documents in all other respects. + +You may extract a single document from such a collection, and distribute +it individually under this License, provided you insert a copy of this +License into the extracted document, and follow this License in all +other respects regarding verbatim copying of that document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an "aggregate" if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled "Acknowledgements", +"Dedications", or "History", the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document except +as expressly provided for under this License. Any other attempt to +copy, modify, sublicense or distribute the Document is void, and will +automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this +License will not have their licenses terminated so long as such +parties remain in full compliance. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions +of the GNU Free Documentation License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. See +http://www.gnu.org/copyleft/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. --- gnote-0.4.0.orig/debian/patches/01_boost_m4.diff +++ gnote-0.4.0/debian/patches/01_boost_m4.diff @@ -0,0 +1,574 @@ +From a0deb4db0a777564f3ff551b0e02e7f227340472 Mon Sep 17 00:00:00 2001 +From: Priit Laes +Date: Wed, 06 May 2009 06:53:45 +0000 +Subject: Update boost.m4 to latest version from http://repo.or.cz/w/boost.m4.git + +(Closes #581559) + +Signed-off-by: Hubert Figuiere +--- +diff --git a/m4/boost.m4 b/m4/boost.m4 +index 551f263..c4ba5ec 100644 +--- a/m4/boost.m4 ++++ b/m4/boost.m4 +@@ -1,11 +1,18 @@ + # boost.m4: Locate Boost headers and libraries for autoconf-based projects. +-# Copyright (C) 2007 Benoit Sigoure ++# Copyright (C) 2007, 2008, 2009 Benoit Sigoure + # + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # ++# Additional permission under section 7 of the GNU General Public ++# License, version 3 ("GPLv3"): ++# ++# If you convey this file as part of a work that contains a ++# configuration script generated by Autoconf, you may do so under ++# terms of your choice. ++# + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +@@ -14,7 +21,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-# serial 4 ++# serial 10 + # Original sources can be found at http://repo.or.cz/w/boost.m4.git + # You can fetch the latest version of the script by doing: + # wget 'http://repo.or.cz/w/boost.m4.git?a=blob_plain;f=build-aux/boost.m4;hb=HEAD' -O boost.m4 +@@ -28,12 +35,36 @@ + # find the Boost headers of a given (optional) minimum version and it will + # define BOOST_CPPFLAGS accordingly. It will add an option --with-boost to + # your configure so that users can specify non standard locations. ++# If the user's environment contains BOOST_ROOT and --with-boost was not ++# specified, --with-boost=$BOOST_ROOT is implicitly used. + # For more README and documentation, go to http://repo.or.cz/w/boost.m4.git +-# Note: THESE MACRO ASSUME THAT YOU USE LIBTOOL. If you don't, don't worry, ++# Note: THESE MACROS ASSUME THAT YOU USE LIBTOOL. If you don't, don't worry, + # simply read the README, it will show you what to do step by step. + + m4_pattern_forbid([^_?BOOST_]) + ++ ++# _BOOST_SED_CPP(SED-PROGRAM, PROGRAM, ++# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# -------------------------------------------------------- ++# Same as AC_EGREP_CPP, but leave the result in conftest.i. ++# PATTERN is *not* overquoted, as in AC_EGREP_CPP. It could be useful ++# to turn this into a macro which extracts the value of any macro. ++m4_define([_BOOST_SED_CPP], ++[AC_LANG_PREPROC_REQUIRE()dnl ++AC_REQUIRE([AC_PROG_SED])dnl ++AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])]) ++AS_IF([dnl eval is necessary to expand ac_cpp. ++dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell. ++(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | ++ $SED -n -e "$1" >conftest.i 2>&1], ++ [$3], ++ [$4])dnl ++rm -f conftest* ++])# AC_EGREP_CPP ++ ++ ++ + # BOOST_REQUIRE([VERSION]) + # ------------------------ + # Look for Boost. If version is given, it must either be a literal of the form +@@ -44,109 +75,101 @@ m4_pattern_forbid([^_?BOOST_]) + # FIXME: Add a 2nd optional argument so that it's not fatal if Boost isn't found + # and add an AC_DEFINE to tell whether HAVE_BOOST. + AC_DEFUN([BOOST_REQUIRE], +-[dnl First find out what kind of argument we have. +-dnl If we have an empty argument, there is no constraint on the version of +-dnl Boost to use. If it's a literal version number, we can split it in M4 (so +-dnl the resulting configure script will be smaller/faster). Otherwise we do +-dnl the splitting at runtime. +-m4_bmatch([$1], +- [^ *$], [m4_pushdef([BOOST_VERSION_REQ], [])dnl +- boost_version_major=0 +- boost_version_minor=0 +- boost_version_subminor=0 +-], +- [^[0-9]+\([-._][0-9]+\)*$], +- [m4_pushdef([BOOST_VERSION_REQ], [ version >= $1])dnl +- boost_version_major=m4_bregexp([$1], [^\([0-9]+\)], [\1]) +- boost_version_minor=m4_bregexp([$1], [^[0-9]+[-._]\([0-9]+\)], [\1]) +- boost_version_subminor=m4_bregexp([$1], [^[0-9]+[-._][0-9]+[-._]\([0-9]+\)], [\1]) +-], +- [^\$[a-zA-Z_]+$], +- [m4_pushdef([BOOST_VERSION_REQ], [])dnl +- boost_version_major=`expr "X$1" : 'X\([[^-._]]*\)'` +- boost_version_minor=`expr "X$1" : 'X[[0-9]]*[[-._]]\([[^-._]]*\)'` +- boost_version_subminor=`expr "X$1" : 'X[[0-9]]*[[-._]][[0-9]]*[[-._]]\([[0-9]]*\)'` +- case $boost_version_major:$boost_version_minor in #( +- *: | :* | *[[^0-9]]*:* | *:*[[^0-9]]*) +- AC_MSG_ERROR([[Invalid argument for REQUIRE_BOOST: `$1']]) +- ;; +- esac +-], +- [m4_fatal(Invalid argument: `$1')] +-)dnl ++[boost_save_IFS=$IFS ++boost_version_req="$1" ++IFS=. ++set x $boost_version_req 0 0 0 ++IFS=$boost_save_IFS ++shift ++boost_version_req=`expr "$[1]" '*' 100000 + "$[2]" '*' 100 + "$[3]"` + AC_ARG_WITH([boost], + [AS_HELP_STRING([--with-boost=DIR], +- [prefix of Boost]BOOST_VERSION_REQ[ @<:@guess@:>@])])dnl ++ [prefix of Boost $1 @<:@guess@:>@])])dnl ++AC_ARG_VAR([BOOST_ROOT],[Location of Boost installation])dnl ++# If BOOST_ROOT is set and the user has not provided a value to ++# --with-boost, then treat BOOST_ROOT as if it the user supplied it. ++if test x"$BOOST_ROOT" != x; then ++ if test x"$with_boost" = x; then ++ AC_MSG_NOTICE([Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT]) ++ with_boost=$BOOST_ROOT ++ else ++ AC_MSG_NOTICE([Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost]) ++ fi ++fi + AC_SUBST([DISTCHECK_CONFIGURE_FLAGS], + ["$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"]) +- AC_CACHE_CHECK([for Boost headers[]BOOST_VERSION_REQ], ++boost_save_CPPFLAGS=$CPPFLAGS ++ AC_CACHE_CHECK([for Boost headers version >= $boost_version_req], + [boost_cv_inc_path], + [boost_cv_inc_path=no + AC_LANG_PUSH([C++])dnl +- boost_subminor_chk= +- test x"$boost_version_subminor" != x \ +- && boost_subminor_chk="|| (B_V_MAJ == $boost_version_major \ +-&& B_V_MIN == $boost_version_minor \ +-&& B_V_SUB < $boost_version_subminor)" +- for boost_inc in "$with_boost/include" '' \ +- /opt/local/include /usr/local/include /opt/include /usr/include \ +- "$with_boost" C:/Boost/include +- do +- test -e "$boost_inc" || continue +- # Ensure that version.hpp exists: we're going to read it. Moreover, +- # Boost could be reachable thanks to the default include path so we can +- # mistakenly accept a wrong include path without this check. +- test -e "$boost_inc/boost/version.hpp" || continue +- boost_save_CPPFLAGS=$CPPFLAGS +- test x"$boost_inc" != x && CPPFLAGS="$CPPFLAGS -I$boost_inc" + m4_pattern_allow([^BOOST_VERSION$])dnl +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include +-#ifndef BOOST_VERSION ++ AC_LANG_CONFTEST([AC_LANG_PROGRAM([[#include ++#if !defined BOOST_VERSION + # error BOOST_VERSION is not defined ++#elif BOOST_VERSION < $boost_version_req ++# error Boost headers version < $boost_version_req + #endif +-#define B_V_MAJ (BOOST_VERSION / 100000) +-#define B_V_MIN (BOOST_VERSION / 100 % 1000) +-#define B_V_SUB (BOOST_VERSION % 100) +-#if (B_V_MAJ < $boost_version_major) \ +- || (B_V_MAJ == $boost_version_major \ +- && B_V_MIN < $boost_version_minor) $boost_subminor_chk +-# error Boost headers version < $1 +-#endif +-]])], [boost_cv_inc_path=yes], [boost_cv_version=no]) +- CPPFLAGS=$boost_save_CPPFLAGS ++]])]) ++ # If the user provided a value to --with-boost, use it and only it. ++ case $with_boost in #( ++ ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \ ++ /usr/include C:/Boost/include;; #( ++ *) set x "$with_boost/include" "$with_boost";; ++ esac ++ shift ++ for boost_dir ++ do ++ # Without --layout=system, Boost (or at least some versions) installs ++ # itself in /include/boost-. This inner loop helps to ++ # find headers in such directories. ++ # I didn't indent this loop on purpose (to avoid over-indented code) ++ for boost_inc in "$boost_dir" "$boost_dir"/boost-* ++ do ++ test x"$boost_inc" != x && CPPFLAGS="$CPPFLAGS -I$boost_inc" ++ AC_COMPILE_IFELSE([], [boost_cv_inc_path=yes], [boost_cv_version=no]) + if test x"$boost_cv_inc_path" = xyes; then + if test x"$boost_inc" != x; then + boost_cv_inc_path=$boost_inc + fi +- break ++ break 2 + fi + done ++ done + AC_LANG_POP([C++])dnl + ]) + case $boost_cv_inc_path in #( +- no) +- AC_MSG_ERROR([Could not find Boost headers[]BOOST_VERSION_REQ]) +- ;;#( +- yes) +- BOOST_CPPFLAGS= +- ;;#( +- *) +- BOOST_CPPFLAGS="-I$boost_cv_inc_path" +- ;; ++ no) AC_MSG_ERROR([cannot find Boost headers version >= $boost_version_req]);;#( ++ yes) BOOST_CPPFLAGS=;;#( ++ *) AC_SUBST([BOOST_CPPFLAGS], ["-I$boost_cv_inc_path"]);; + esac +-AC_SUBST([BOOST_CPPFLAGS])dnl + AC_CACHE_CHECK([for Boost's header version], + [boost_cv_lib_version], + [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl +- boost_cv_lib_version=unknown +- boost_sed_version='/^.*BOOST_LIB_VERSION.*"\([[^"]]*\)".*$/!d;s//\1/' +- boost_version_hpp="$boost_inc/boost/version.hpp" +- test -e "$boost_version_hpp" \ +- && boost_cv_lib_version=`sed "$boost_sed_version" "$boost_version_hpp"` +- ]) +-m4_popdef([BOOST_VERSION_REQ])dnl ++ _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;g;}], ++ [#include ++boost-lib-version = BOOST_LIB_VERSION], ++ [boost_cv_lib_version=`cat conftest.i`])]) ++ # e.g. "134" for 1_34_1 or "135" for 1_35 ++ boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'` ++ case $boost_major_version in #( ++ '' | *[[!0-9]]*) ++ AC_MSG_ERROR([Invalid value: boost_major_version=$boost_major_version]) ++ ;; ++ esac ++CPPFLAGS=$boost_save_CPPFLAGS + ])# BOOST_REQUIRE + ++# BOOST_STATIC() ++# -------------- ++# Add the "--enable-static-boost" configure argument. If this argument is given ++# on the command line, static versions of the libraries will be looked up. ++AC_DEFUN([BOOST_STATIC], ++ [AC_ARG_ENABLE([static-boost], ++ [AC_HELP_STRING([--enable-static-boost], ++ [Prefer the static boost libraries over the shared ones [no]])], ++ [enable_static_boost=yes], ++ [enable_static_boost=no])])# BOOST_STATIC + + # BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND]) + # -------------------------------------------------------------------------- +@@ -173,11 +196,14 @@ AC_LANG_POP([C++])dnl + ])# BOOST_FIND_HEADER + + +-# BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], [CXX-PROLOGUE]) ++# BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], ++# [CXX-PROLOGUE]) + # ------------------------------------------------------------------------- + # Look for the Boost library LIB-NAME (e.g., LIB-NAME = `thread', for + # libboost_thread). Check that HEADER-NAME works and check that +-# libboost_LIB-NAME can link with the code CXX-TEST. ++# libboost_LIB-NAME can link with the code CXX-TEST. The optional argument ++# CXX-PROLOGUE can be used to include some C++ code before the `main' ++# function. + # + # Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above). + # +@@ -194,6 +220,7 @@ AC_LANG_POP([C++])dnl + AC_DEFUN([BOOST_FIND_LIB], + [AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl + AC_REQUIRE([BOOST_REQUIRE])dnl ++AC_REQUIRE([BOOST_STATIC])dnl + AC_REQUIRE([_BOOST_GUESS_WHETHER_TO_USE_MT])dnl + AC_LANG_PUSH([C++])dnl + AS_VAR_PUSHDEF([Boost_lib], [boost_cv_lib_$1])dnl +@@ -216,10 +243,18 @@ AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib], + mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*\(.*\)'`;; #( + *) boost_mt=; boost_rtopt=$2;; + esac +- # If the PREFERRED-RT-OPT are not empty, prepend a `-'. ++ if test $enable_static_boost = yes; then ++ boost_rtopt="s$boost_rtopt" ++ fi ++ # Find the proper debug variant depending on what we've been asked to find. + case $boost_rtopt in #( +- *[[a-z0-9A-Z]]*) boost_rtopt="-$boost_rtopt";; ++ *d*) boost_rt_d=$boost_rtopt;; #( ++ *[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn') ++ boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #( ++ *) boost_rt_d='-d';; + esac ++ # If the PREFERRED-RT-OPT are not empty, prepend a `-'. ++ test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" + $boost_guess_use_mt && boost_mt=-mt + # Look for the abs path the static archive. + # $libext is computed by Libtool but let's make sure it's non empty. +@@ -227,8 +262,8 @@ AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib], + AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?]) + boost_save_ac_objext=$ac_objext + # Generate the test file. +- AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3> +- $5], [$4])]) ++ AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3> ++$5], [$4])]) + dnl Optimization hacks: compiling C++ is slow, especially with Boost. What + dnl we're trying to do here is guess the right combination of link flags + dnl (LIBS / LDFLAGS) to use a given library. This can take several +@@ -258,9 +293,8 @@ for boost_mt_ in $boost_mt -mt ''; do + for boost_rtopt_ in $boost_rtopt '' -d; do + for boost_lib in \ + boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ +- boost_$1$boost_tag_$boost_mt_$boost_ver_ \ + boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \ +- boost_$1$boost_tag_$boost_mt_ \ ++ boost_$1$boost_tag_$boost_mt_$boost_ver_ \ + boost_$1$boost_tag_$boost_ver_ + do + # Avoid testing twice the same lib +@@ -332,6 +366,14 @@ AC_LANG_POP([C++])dnl + # version of each library (among other things). + + ++# BOOST_ASIO() ++# ------------ ++# Look for Boost.Asio (new in Boost 1.35). ++AC_DEFUN([BOOST_ASIO], ++[AC_REQUIRE([BOOST_SYSTEM])dnl ++BOOST_FIND_HEADER([boost/asio.hpp])]) ++ ++ + # BOOST_BIND() + # ------------ + # Look for Boost.Bind +@@ -361,12 +403,26 @@ AC_DEFUN([BOOST_DATE_TIME], + + # BOOST_FILESYSTEM([PREFERRED-RT-OPT]) + # ------------------------------------ +-# Look for Boost.Filesystem. For the documentation of PREFERRED-RT-OPT, see the +-# documentation of BOOST_FIND_LIB above. +-# Do not check for boost/filesystem.hpp because this file was introduced in 1.34. ++# Look for Boost.Filesystem. For the documentation of PREFERRED-RT-OPT, see ++# the documentation of BOOST_FIND_LIB above. ++# Do not check for boost/filesystem.hpp because this file was introduced in ++# 1.34. + AC_DEFUN([BOOST_FILESYSTEM], +-[BOOST_FIND_LIB([filesystem], [$1], ++[# Do we have to check for Boost.System? This link-time dependency was ++# added as of 1.35.0. If we have a version <1.35, we must not attempt to ++# find Boost.System as it didn't exist by then. ++if test $boost_major_version -ge 135; then ++BOOST_SYSTEM([$1]) ++fi # end of the Boost.System check. ++boost_filesystem_save_LIBS=$LIBS ++boost_filesystem_save_LDFLAGS=$LDFLAGS ++m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl ++LIBS="$LIBS $BOOST_SYSTEM_LIBS" ++LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" ++BOOST_FIND_LIB([filesystem], [$1], + [boost/filesystem/path.hpp], [boost::filesystem::path p;]) ++LIBS=$boost_filesystem_save_LIBS ++LDFLAGS=$boost_filesystem_save_LDFLAGS + ])# BOOST_FILESYSTEM + + +@@ -423,6 +479,27 @@ AC_DEFUN([BOOST_HASH], + [BOOST_FIND_HEADER([boost/functional/hash.hpp])]) + + ++# BOOST_LAMBDA() ++# -------------- ++# Look for Boost.Lambda ++AC_DEFUN([BOOST_LAMBDA], ++[BOOST_FIND_HEADER([boost/lambda/lambda.hpp])]) ++ ++ ++# BOOST_OPTIONAL() ++# ---------------- ++# Look for Boost.Optional ++AC_DEFUN([BOOST_OPTIONAL], ++[BOOST_FIND_HEADER([boost/optional.hpp])]) ++ ++ ++# BOOST_PREPROCESSOR() ++# -------------------- ++# Look for Boost.Preprocessor ++AC_DEFUN([BOOST_PREPROCESSOR], ++[BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])]) ++ ++ + # BOOST_PROGRAM_OPTIONS([PREFERRED-RT-OPT]) + # ----------------------------------------- + # Look for Boost.Program_options. For the documentation of PREFERRED-RT-OPT, see +@@ -452,6 +529,18 @@ AC_DEFUN([BOOST_REGEX], + ])# BOOST_REGEX + + ++# BOOST_SERIALIZATION([PREFERRED-RT-OPT]) ++# --------------------------------------- ++# Look for Boost.Serialization. For the documentation of PREFERRED-RT-OPT, see ++# the documentation of BOOST_FIND_LIB above. ++AC_DEFUN([BOOST_SERIALIZATION], ++[BOOST_FIND_LIB([serialization], [$1], ++ [boost/archive/text_oarchive.hpp], ++ [std::ostream* o = 0; // Cheap way to get an ostream... ++ boost::archive::text_oarchive t(*o);]) ++])# BOOST_SIGNALS ++ ++ + # BOOST_SIGNALS([PREFERRED-RT-OPT]) + # --------------------------------- + # Look for Boost.Signals. For the documentation of PREFERRED-RT-OPT, see the +@@ -472,6 +561,13 @@ BOOST_FIND_HEADER([boost/shared_ptr.hpp]) + ]) + + ++# BOOST_STATICASSERT() ++# -------------------- ++# Look for Boost.StaticAssert ++AC_DEFUN([BOOST_STATICASSERT], ++[BOOST_FIND_HEADER([boost/static_assert.hpp])]) ++ ++ + # BOOST_STRING_ALGO() + # ------------------- + # Look for Boost.StringAlgo +@@ -480,6 +576,18 @@ AC_DEFUN([BOOST_STRING_ALGO], + ]) + + ++# BOOST_SYSTEM([PREFERRED-RT-OPT]) ++# -------------------------------- ++# Look for Boost.System. For the documentation of PREFERRED-RT-OPT, see the ++# documentation of BOOST_FIND_LIB above. This library was introduced in Boost ++# 1.35.0. ++AC_DEFUN([BOOST_SYSTEM], ++[BOOST_FIND_LIB([system], [$1], ++ [boost/system/error_code.hpp], ++ [boost::system::error_code e; e.clear();]) ++])# BOOST_SYSTEM ++ ++ + # BOOST_TEST([PREFERRED-RT-OPT]) + # ------------------------------ + # Look for Boost.Test. For the documentation of PREFERRED-RT-OPT, see the +@@ -487,8 +595,10 @@ AC_DEFUN([BOOST_STRING_ALGO], + AC_DEFUN([BOOST_TEST], + [m4_pattern_allow([^BOOST_CHECK$])dnl + BOOST_FIND_LIB([unit_test_framework], [$1], +- [boost/test/unit_test.hpp], [BOOST_CHECK(2==2);], +- [using boost::unit_test::test_suite; test_suite* init_unit_test_suite( int argc, char ** argv ) { return NULL;}]) ++ [boost/test/unit_test.hpp], [BOOST_CHECK(2 == 2);], ++ [using boost::unit_test::test_suite; ++ test_suite* init_unit_test_suite(int argc, char ** argv) ++ { return NULL; }]) + ])# BOOST_TEST + + +@@ -543,6 +653,13 @@ AC_DEFUN([BOOST_TUPLE], + [BOOST_FIND_HEADER([boost/tuple/tuple.hpp])]) + + ++# BOOST_TYPETRAITS() ++# -------------------- ++# Look for Boost.TypeTraits ++AC_DEFUN([BOOST_TYPETRAITS], ++[BOOST_FIND_HEADER([boost/type_traits.hpp])]) ++ ++ + # BOOST_UTILITY() + # --------------- + # Look for Boost.Utility (noncopyable, result_of, base-from-member idiom, +@@ -561,12 +678,33 @@ BOOST_FIND_HEADER([boost/variant.hpp])]) + + # BOOST_WAVE([PREFERRED-RT-OPT]) + # ------------------------------ ++# NOTE: If you intend to use Wave/Spirit with thread support, make sure you ++# call BOOST_THREADS first. + # Look for Boost.Wave. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. + AC_DEFUN([BOOST_WAVE], +-[BOOST_FIND_LIB([wave], [$1], ++[AC_REQUIRE([BOOST_FILESYSTEM])dnl ++AC_REQUIRE([BOOST_DATE_TIME])dnl ++boost_wave_save_LIBS=$LIBS ++boost_wave_save_LDFLAGS=$LDFLAGS ++m4_pattern_allow([^BOOST_((FILE)?SYSTEM|DATE_TIME|THREAD)_(LIBS|LDFLAGS)$])dnl ++LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS\ ++$BOOST_THREAD_LIBS" ++LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS\ ++$BOOST_DATE_TIME_LDFLAGS $BOOST_THREAD_LDFLAGS" ++BOOST_FIND_LIB([wave], [$1], + [boost/wave.hpp], +- [boost::wave::token_id id; get_token_name(id);])]) ++ [boost::wave::token_id id; get_token_name(id);]) ++LIBS=$boost_wave_save_LIBS ++LDFLAGS=$boost_wave_save_LDFLAGS ++])# BOOST_WAVE ++ ++ ++# BOOST_XPRESSIVE() ++# ----------------- ++# Look for Boost.Xpressive (new since 1.36.0). ++AC_DEFUN([BOOST_XPRESSIVE], ++[BOOST_FIND_HEADER([boost/xpressive/xpressive.hpp])]) + + + # ----------------- # +@@ -669,8 +807,9 @@ AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag] + # como, edg, kcc, bck, mp, sw, tru, xlc + # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines + # the same defines as GCC's). +- # TODO: Move the test on GCC 4.3 up once it's released. ++ # TODO: Move the test on GCC 4.4 up once it's released. + for i in \ ++ _BOOST_gcc_test(4, 3) \ + _BOOST_gcc_test(4, 2) \ + _BOOST_gcc_test(4, 1) \ + _BOOST_gcc_test(4, 0) \ +@@ -688,7 +827,7 @@ AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag] + "defined __ICC && (defined __unix || defined __unix__) @ il" \ + "defined __ICL @ iw" \ + "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \ +- _BOOST_gcc_test(4, 3) \ ++ _BOOST_gcc_test(4, 4) \ + _BOOST_gcc_test(2, 95) \ + "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \ + "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \ +@@ -706,11 +845,21 @@ AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag] + ]])], [boost_cv_lib_tag=$boost_tag; break], []) + done + AC_LANG_POP([C++])dnl +-]) +- if test x"$boost_cv_lib_tag" = xunknown; then +- AC_MSG_WARN([[could not figure out which toolset name to use for $CXX]]) +- boost_cv_lib_tag= +- fi ++ case $boost_cv_lib_tag in #( ++ # Some newer (>= 1.35?) versions of Boost seem to only use "gcc" as opposed ++ # to "gcc41" for instance. ++ *-gcc | *'-gcc ') :;; #( Don't re-add -gcc: it's already in there. ++ gcc*) ++ # We can specify multiple tags in this variable because it's used by ++ # BOOST_FIND_LIB that does a `for tag in -$boost_cv_lib_tag' ... ++ boost_cv_lib_tag="$boost_cv_lib_tag -gcc" ++ ;; #( ++ unknown) ++ AC_MSG_WARN([[could not figure out which toolset name to use for $CXX]]) ++ boost_cv_lib_tag= ++ ;; ++ esac ++])dnl end of AC_CACHE_CHECK + ])# _BOOST_FIND_COMPILER_TAG + + +@@ -765,3 +914,7 @@ dnl as it would interfere with the next link command. + rm -f core conftest.err conftest_ipa8_conftest.oo \ + conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl + ])# _BOOST_AC_LINK_IFELSE ++ ++# Local Variables: ++# mode: autoconf ++# End: +-- +cgit v0.8.2 --- gnote-0.4.0.orig/debian/patches/02_fix_date_conversion.diff +++ gnote-0.4.0/debian/patches/02_fix_date_conversion.diff @@ -0,0 +1,23 @@ + +This bugfix for segfault condition in DateTime::to_iso8601 didn't make +it to 0.4.0. It was extracted from commit d23236275936e6f0f44dddae639528e4f0f7b935 + +diff --git a/src/sharp/datetime.cpp b/src/sharp/datetime.cpp +index ab5e893..994a7f6 100644 +--- a/src/sharp/datetime.cpp ++++ b/src/sharp/datetime.cpp +@@ -107,9 +107,12 @@ namespace sharp { + + std::string DateTime::to_iso8601() const + { ++ std::string retval; + char * iso8601 = g_time_val_to_iso8601(const_cast(&m_date)); +- std::string retval(iso8601); +- g_free(iso8601); ++ if(iso8601) { ++ retval = iso8601; ++ g_free(iso8601); ++ } + return retval; + } +