« back to all changes in this revision
Viewing changes to libedataserverui/e-cell-renderer-color.h
- Committer: Bazaar Package Importer
- Date: 2010-05-17 17:02:06 UTC
- mfrom: (1.1.79 upstream) (1.6.12 experimental)
- Revision ID: james.westby@ubuntu.com-20100517170206-4ufr52vwrhh26yh0
* Merge from debian experimental. Remaining change:
(LP: #42199, #229669, #173703, #360344, #508494)
+ debian/control:
- add Vcs-Bzr tag
- don't use libgnome
- Use Breaks instead of Conflicts against evolution 2.25 and earlier.
+ debian/evolution-data-server.install,
debian/patches/45_libcamel_providers_version.patch:
- use the upstream versioning, not a Debian-specific one
+ debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
- install html documentation
+ debian/rules:
- don't build documentation it's shipped with the tarball
(LP: #42199, #229669, #173703, #360344, #508494)
+ debian/control:
- add Vcs-Bzr tag
- don't use libgnome
- Use Breaks instead of Conflicts against evolution 2.25 and earlier.
+ debian/evolution-data-server.install,
debian/patches/45_libcamel_providers_version.patch:
- use the upstream versioning, not a Debian-specific one
+ debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
- install html documentation
+ debian/rules:
- don't build documentation it's shipped with the tarball
- files added:
- addressbook/libebook/e-book-marshal.list
- addressbook/tests/ebook/data
- addressbook/tests/ebook/data/vcards
- camel/providers/imapx
- files removed:
- INSTALL
- addressbook/idl
- calendar/idl
- camel/providers/imapp
- docs/reference/addressbook/libebook/xml
- docs/reference/addressbook/libedata-book/xml
- docs/reference/calendar/libecal/xml
- docs/reference/calendar/libedata-cal/xml
- docs/reference/libebackend/xml
- docs/reference/libedataserver/xml
- docs/reference/libedataserverui/xml
- libdb
- libdb/btree
- libdb/build_unix
- libdb/build_vxworks
- libdb/build_vxworks/BerkeleyDB
- libdb/build_vxworks/db_archive
- libdb/build_vxworks/db_archive/db_archive
- libdb/build_vxworks/db_checkpoint
- libdb/build_vxworks/db_checkpoint/db_checkpoint
- libdb/build_vxworks/db_deadlock
- libdb/build_vxworks/db_deadlock/db_deadlock
- libdb/build_vxworks/db_dump
- libdb/build_vxworks/db_dump/db_dump
- libdb/build_vxworks/db_load
- libdb/build_vxworks/db_load/db_load
- libdb/build_vxworks/db_printlog
- libdb/build_vxworks/db_printlog/db_printlog
- libdb/build_vxworks/db_recover
- libdb/build_vxworks/db_recover/db_recover
- libdb/build_vxworks/db_stat
- libdb/build_vxworks/db_stat/db_stat
- libdb/build_vxworks/db_upgrade
- libdb/build_vxworks/db_upgrade/db_upgrade
- libdb/build_vxworks/db_verify
- libdb/build_vxworks/db_verify/db_verify
- libdb/build_vxworks/dbdemo
- libdb/build_vxworks/dbdemo/dbdemo
- libdb/build_win32
- libdb/clib
- libdb/common
- libdb/cxx
- libdb/db
- libdb/db185
- libdb/db_archive
- libdb/db_checkpoint
- libdb/db_deadlock
- libdb/db_dump
- libdb/db_dump185
- libdb/db_load
- libdb/db_printlog
- libdb/db_recover
- libdb/db_stat
- libdb/db_upgrade
- libdb/db_verify
- libdb/dbinc
- libdb/dbinc_auto
- libdb/dbm
- libdb/dbreg
- libdb/dist
- libdb/dist/aclocal
- libdb/dist/aclocal_java
- libdb/dist/template
- libdb/dist/vx_2.0
- libdb/dist/vx_3.1
- libdb/dist/vx_setup
- libdb/docs
- libdb/docs/api_c
- libdb/docs/api_cxx
- libdb/docs/api_java
- libdb/docs/api_tcl
- libdb/docs/images
- libdb/docs/ref
- libdb/docs/ref/am
- libdb/docs/ref/am_conf
- libdb/docs/ref/am_misc
- libdb/docs/ref/apprec
- libdb/docs/ref/arch
- libdb/docs/ref/build_unix
- libdb/docs/ref/build_vxworks
- libdb/docs/ref/build_win
- libdb/docs/ref/cam
- libdb/docs/ref/debug
- libdb/docs/ref/distrib
- libdb/docs/ref/dumpload
- libdb/docs/ref/env
- libdb/docs/ref/install
- libdb/docs/ref/intro
- libdb/docs/ref/java
- libdb/docs/ref/lock
- libdb/docs/ref/log
- libdb/docs/ref/mp
- libdb/docs/ref/perl
- libdb/docs/ref/program
- libdb/docs/ref/refs
- libdb/docs/ref/rep
- libdb/docs/ref/rpc
- libdb/docs/ref/sendmail
- libdb/docs/ref/simple_tut
- libdb/docs/ref/tcl
- libdb/docs/ref/test
- libdb/docs/ref/transapp
- libdb/docs/ref/txn
- libdb/docs/ref/upgrade
- libdb/docs/ref/upgrade.2.0
- libdb/docs/ref/upgrade.3.0
- libdb/docs/ref/upgrade.3.1
- libdb/docs/ref/upgrade.3.2
- libdb/docs/ref/upgrade.3.3
- libdb/docs/ref/upgrade.4.0
- libdb/docs/ref/upgrade.4.1
- libdb/docs/ref/xa
- libdb/docs/sleepycat
- libdb/docs/utility
- libdb/env
- libdb/examples_c
- libdb/examples_c/ex_apprec
- libdb/examples_c/ex_repquote
- libdb/examples_cxx
- libdb/fileops
- libdb/hash
- libdb/hmac
- libdb/hsearch
- libdb/java
- libdb/java/src
- libdb/java/src/com
- libdb/java/src/com/sleepycat
- libdb/java/src/com/sleepycat/db
- libdb/java/src/com/sleepycat/db/xa
- libdb/java/src/com/sleepycat/examples
- libdb/libdb_java
- libdb/lock
- libdb/log
- libdb/mp
- libdb/mutex
- libdb/os
- libdb/os_vxworks
- libdb/os_win32
- libdb/perl
- libdb/perl/BerkeleyDB
- libdb/perl/BerkeleyDB/BerkeleyDB
- libdb/perl/BerkeleyDB/hints
- libdb/perl/BerkeleyDB/patches
- libdb/perl/BerkeleyDB/t
- libdb/perl/DB_File
- libdb/perl/DB_File/hints
- libdb/perl/DB_File/patches
- libdb/perl/DB_File/t
- libdb/qam
- libdb/rep
- libdb/rpc_client
- libdb/rpc_server
- libdb/rpc_server/c
- libdb/rpc_server/cxx
- libdb/rpc_server/java
- libdb/rpc_server/java/gen
- libdb/tcl
- libdb/tcl/docs
- libdb/test
- libdb/test/scr001
- libdb/test/scr002
- libdb/test/scr003
- libdb/test/scr004
- libdb/test/scr005
- libdb/test/scr006
- libdb/test/scr007
- libdb/test/scr008
- libdb/test/scr009
- libdb/test/scr010
- libdb/test/scr011
- libdb/test/scr012
- libdb/test/scr013
- libdb/test/scr014
- libdb/test/scr015
- libdb/test/scr016
- libdb/test/scr017
- libdb/test/scr018
- libdb/test/scr019
- libdb/test/scr020
- libdb/test/scr021
- libdb/test/scr022
- libdb/txn
- libdb/xa
- servers/exchange
- servers/exchange/lib
- servers/exchange/storage
- servers/exchange/xntlm
- src
- win32
- files modified:
- Makefile.am
added
removed
libedataserverui/e-cell-renderer-color.h
