libcompizconfig: Changes to 'debian-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS   |   34 
 CMakeLists.txt|   16 
 ChangeLog | 2200 ++
 NEWS  |   25 
 VERSION   |2 
 backend/CMakeLists.txt|7 
 cmake/LibCompizConfigCommon.cmake |   17 
 debian/changelog  |7 
 debian/control|6 
 debian/watch  |2 
 10 files changed, 2279 insertions(+), 37 deletions(-)

New commits:
commit 3af50d54ff2561056bd59b68369770b4737d8151
Author: Janos Guljas ja...@resenje.org
Date:   Wed Aug 3 23:13:02 2011 +0200

Prepare changelog and bump Standards-Version.

diff --git a/debian/changelog b/debian/changelog
index 02ebd74..7fa9e81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcompizconfig (0.9.5.0-0.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+
+ -- Janos Guljas ja...@resenje.org  Tue, 02 Aug 2011 04:36:55 +0200
+
 libcompizconfig (0.9.4-1) experimental; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 68f3771..79658b6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 7.0.50~), cmake, intltool, compiz-dev (= 
0.9.2.1),
+Build-Depends: debhelper (= 7.0.50~), cmake, intltool, compiz-dev (= 
0.9.5.0),
  pkg-config, libxml2-dev, libxslt1-dev, libprotobuf-dev, protobuf-compiler,
- libxslt1-dev, xsltproc, libboost1.42-dev, libboost-serialization1.42-dev
-Standards-Version: 3.9.1
+ libxslt1-dev, xsltproc, libboost-dev, libboost-serialization-dev
+Standards-Version: 3.9.2
 Section: libs
 Homepage: http://www.compiz.org/
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/libcompizconfig.git

commit f3918b7127cea9575455d4e85705888add40e54b
Author: Janos Guljas ja...@resenje.org
Date:   Tue Aug 2 04:36:55 2011 +0200

Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index 139597f..68e9d7e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,32 @@
-
-
+Christopher James Halse Rogers chris@Burninator.(none)
+Danny Baumann daba@mobilrechner.localdomain
+Danny Baumann daba@noname.(none)
+Danny Baumann d...@rechenknecht.peppercon.de
+Danny Baumann dannybaum...@web.de
+Dennis Kasprzyk onest...@beryl-project.org
+Dennis Kasprzyk onest...@compiz-fusion.org
+Dennis Kasprzyk onest...@opencompositing.org
+Didier Roche didro...@ubuntu.com
+Dominique Leuenberger domini...@leuenberger.net
+Erkin Bahceci erkin...@gmail.com
+Guillaume Seguin guilla...@segu.in
+Guillaume Seguin ixce@ed3n.(none)
+Jigish Gohil cyber...@prime.cyberorg.info
+Kristian Lyngstol kristian@nihilus.(none)
+Live session user ubuntu@ubuntu.(none)
+Lubos Lunak llu...@suse.cz
+Patrick Niklaus ma...@opencompositing.org
+Quinn Storm quinn@darter.(none)
+Roland Baer roland@Vista.(none)
+Roland Bär roland@Vista.(none)
+Sam Spilsbury smspil...@gmail.com
+Sam Spilsbury sam.spilsb...@canonical.com
+Sam Spilsbury smspillaz@XPS-FEDORA.(none)
+Sam Spilsbury smspil...@gmail.com
+Scott Moreau ore...@gmail.com
+Travis Watkins amara...@ubuntu.com
+Treviño - 3v1n0 trev...@gmail.com
+maniac maniac
+marex ma...@beryl-project.org
+onestone onestone
+racarr racarr
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0583a53..d2f7f2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,10 @@ project (libcompizconfig)
 
 find_package (Compiz REQUIRED)
 
+set (CMAKE_MODULE_PATH_ORIG ${CMAKE_MODULE_PATH})
+set (LIBCOMPIZCONFIG_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${LIBCOMPIZCONFIGZ_CMAKE_MODULE_PATH})
+
 include (CompizCommon)
 include (CompizPackage)
 include (CheckLibraryExists)
@@ -12,11 +16,10 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${CMAKE_SOURCE_DIR}/cmake)
 # libcompizconfig package version number
 # An odd micro number indicates in-progress development.
 # An even micro number indicates a released version.
-set (LIBCOMPIZCONFIG_VERSION_MAJOR 0)
-set (LIBCOMPIZCONFIG_VERSION_MINOR 9)
-set (LIBCOMPIZCONFIG_VERSION_MICRO 4)
-set (LIBCOMPIZCONFIG_VERSION_MACRO 0)
-set (VERSION 
${LIBCOMPIZCONFIG_VERSION_MAJOR}.${LIBCOMPIZCONFIG_VERSION_MINOR}.${LIBCOMPIZCONFIG_VERSION_MICRO}.${LIBCOMPIZCONFIG_VERSION_MACRO})
+file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 
0)
+string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
+
+set (VERSION ${COMPIZ_RELEASE_VERSION})
 
 set (_libcompizconfig_package_string LibCompizConfig ${VERSION})
 set (_libcompizconfig_package LibCompizCompiz)
@@ -195,3 +198,6 @@ compiz_ensure_linkage ()
 compiz_package_generation (CompizConfig Library)
 add_uninstall ()
 compiz_add_git_dist ()
+compiz_add_distcheck ()
+compiz_add_release ()
+compiz_add_release_signoff ()
diff --git a/ChangeLog b/ChangeLog
index 

libcompizconfig: Changes to 'debian-unstable'

2011-05-01 Thread Janos Guljas
 CMakeLists.txt   |4 ++--
 NEWS |6 ++
 VERSION  |2 +-
 debian/changelog |7 +++
 4 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 9107022bf3af7db101519463455670a362ccc6fd
Author: Janos Guljas ja...@resenje.org
Date:   Sun May 1 13:24:52 2011 +0200

Prepare 0.9.4-1

diff --git a/debian/changelog b/debian/changelog
index 73a1623..02ebd74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcompizconfig (0.9.4-1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+
+ -- Janos Guljas ja...@resenje.org  Thu, 28 Apr 2011 20:54:04 +0200
+
 libcompizconfig (0.9.2.1+git20110226.78a7cc8c-1) experimental; urgency=low
 
   * Incorporate Janos Guljas' compiz packaging work, thanks!

commit 367fb8df91a4e094f90cb6678cd217dd71b890aa
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Mon Mar 7 18:07:43 2011 +0800

Bump VERSION to 0.9.4

diff --git a/VERSION b/VERSION
index f626ec2..a602fc9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.9.0
+0.9.4

commit e1f0133d85bda7d42d95a9d4c60a3c68bdd41d0f
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Mon Mar 7 18:07:43 2011 +0800

Update CMake Version

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f9e686..0583a53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,8 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${CMAKE_SOURCE_DIR}/cmake)
 # An even micro number indicates a released version.
 set (LIBCOMPIZCONFIG_VERSION_MAJOR 0)
 set (LIBCOMPIZCONFIG_VERSION_MINOR 9)
-set (LIBCOMPIZCONFIG_VERSION_MICRO 2)
-set (LIBCOMPIZCONFIG_VERSION_MACRO 1)
+set (LIBCOMPIZCONFIG_VERSION_MICRO 4)
+set (LIBCOMPIZCONFIG_VERSION_MACRO 0)
 set (VERSION 
${LIBCOMPIZCONFIG_VERSION_MAJOR}.${LIBCOMPIZCONFIG_VERSION_MINOR}.${LIBCOMPIZCONFIG_VERSION_MICRO}.${LIBCOMPIZCONFIG_VERSION_MACRO})
 
 set (_libcompizconfig_package_string LibCompizConfig ${VERSION})

commit fad9572a85341df0b042331b6a58f5642eb19ab3
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Mon Mar 7 18:07:34 2011 +0800

Update news for 0.9.4 release

diff --git a/NEWS b/NEWS
index 1846b6c..17eb3c6 100644
--- a/NEWS
+++ b/NEWS
@@ -15,3 +15,9 @@ Fixed symbol linking issue with backends
 Release 0.9.2.1 (2010-11-06 Sam Spilsbury sam.spilsb...@canonical.com)
 
 Bugfix release.
+
+Release 0.9.4 (2010-02-24 Sam Spilsbury sam.spilsb...@canonical.com)
+
+Development Release.
+
+Install systemwide profiles correctly


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qgumc-00019p...@alioth.debian.org



libcompizconfig: Changes to 'debian-unstable'

2011-02-27 Thread Sean Finney
 CMakeLists.txt |  197 
 INSTALL|  239 --
 Makefile.am|   25 -
 NEWS   |   18 
 VERSION|2 
 autogen.sh |   16 
 backend/CMakeLists.txt |5 
 backend/Makefile.am|   18 
 backend/ini.c  |  727 ---
 backend/src/ini.c  |  721 +++
 cmake/CMakeLists.txt   |8 
 cmake/FindCompizConfig.cmake   |   86 +++
 cmake/LibCompizConfigCommon.cmake  |  122 +
 config.h.in|5 
 config/CMakeLists.txt  |   10 
 config/Makefile.am |6 
 configure.ac   |  156 --
 debian/changelog   |   16 
 debian/compat  |2 
 debian/control |8 
 debian/libcompizconfig-dev.install |9 
 debian/libcompizconfig0.install|3 
 debian/rules   |   88 ---
 debian/source/format   |1 
 debian/source/local-options|2 
 debian/watch   |4 
 include/CMakeLists.txt |9 
 include/Makefile.am|3 
 include/ccs.h  |   33 -
 libcompizconfig.pc.in  |2 
 metadata/Makefile.am   |5 
 metadata/ccp.xml   |7 
 plugin/CMakeLists.txt  |6 
 plugin/Makefile.am |   15 
 plugin/ccp.c   |  844 -
 plugin/ccp.xml |7 
 plugin/ccp/CMakeLists.txt  |   16 
 plugin/ccp/ccp.xml.in  |7 
 plugin/ccp/src/ccp.cpp |  532 +++
 plugin/ccp/src/ccp.cpp~|  536 +++
 plugin/ccp/src/ccp.h   |   73 +++
 po/POTFILES.in |2 
 src/CMakeLists.txt |   79 +++
 src/Makefile.am|   52 --
 src/compiz.cpp |  159 ++
 src/compizconfig.proto |8 
 src/config.c   |2 
 src/main.c |   74 ---
 48 files changed, 2583 insertions(+), 2382 deletions(-)

New commits:
commit 3475736511c33db57ecc381d15a9fbf2d628d51d
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 09:42:11 2011 +

Temp hack for upstream cruft in repo and after build

diff --git a/debian/rules b/debian/rules
index 8b9be96..1ca6489 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,12 @@ CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:spa
 %:
dh $@
 
+
+# temporary hack for a tmp file left in upstream repo
+override_dh_clean:
+   dh_clean -X plugin/ccp/src/ccp.cpp~
+   rm -f src/compizconfig.pb.cc src/compizconfig.pb.h
+
 override_dh_auto_configure:
dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE 
-DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
 

commit 8820916e88fc0182c4abf2146974e843a6bae51d
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 09:40:26 2011 +

Add unapply-patches and abort-on-upstream-changes to local-options

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..8293bbd
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+apply-patches
+abort-on-upstream-changes

commit fd868d88df9f814a3cea6e6c2c71425ef6a08ef7
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 09:38:29 2011 +

Prepare new release

diff --git a/debian/changelog b/debian/changelog
index c0acfc3..73a1623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcompizconfig (0.9.2.1+git20110226.78a7cc8c-1) experimental; urgency=low
+
+  * Incorporate Janos Guljas' compiz packaging work, thanks!
+
+ -- Sean Finney sean...@debian.org  Sun, 27 Feb 2011 09:36:37 +
+
 libcompizconfig (0.9.2.1-1.1) unstable; urgency=low
 
   * New upstream release

commit cdcbbe940b4e3f6fc68fbe60a8917ad1a7b722eb
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 09:30:31 2011 +

Incorporate Janos Guljas' packaging work

diff --git a/debian/changelog b/debian/changelog
index 10d0191..c0acfc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libcompizconfig (0.9.2.1-1.1) unstable; urgency=low
+
+  * New upstream release
+  * Bump standards to 3.9.1
+  * Switch to dpkg version 3.0 (quilt)
+  * Rewrite debian/rules to use debhelper 7.
+  * Added debian/watch file
+
+ -- Janos Guljas ja...@resenje.org  Sun, 14 Nov 2010 20:13:28 +0100
+
 libcompizconfig (0.8.4-3) UNRELEASED; urgency=low
 
   * Update upstream git repo url in debian/copyright.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5

libcompizconfig: Changes to 'debian-unstable'

2010-04-04 Thread Julien Cristau
 debian/changelog |8 
 debian/control   |2 --
 debian/rules |2 +-
 src/Makefile.am  |2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit bd99b7011b6d22504f75bb3f451a595565f793c6
Author: Julien Cristau jcris...@debian.org
Date:   Sun Apr 4 18:26:30 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 6a4590b..0025e86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libcompizconfig (0.8.4-2) UNRELEASED; urgency=low
+libcompizconfig (0.8.4-2) unstable; urgency=medium
 
+  * Medium urgency to fix RC bug in testing.
   * Disable protobuf to work around #572923.
   * Link libcompizconfig with -ldl (closes: #558875)
 
- -- Julien Cristau jcris...@debian.org  Sun, 04 Apr 2010 18:16:35 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 04 Apr 2010 18:25:06 +0200
 
 libcompizconfig (0.8.4-1) unstable; urgency=low
 

commit f6c05d54020ae17d1c6e92fe4eb489055427bca1
Author: Julien Cristau jcris...@debian.org
Date:   Sun Apr 4 18:24:28 2010 +0200

Link libcompizconfig with -ldl (closes: #558875)

diff --git a/debian/changelog b/debian/changelog
index c194e1b..6a4590b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libcompizconfig (0.8.4-2) UNRELEASED; urgency=low
 
   * Disable protobuf to work around #572923.
+  * Link libcompizconfig with -ldl (closes: #558875)
 
  -- Julien Cristau jcris...@debian.org  Sun, 04 Apr 2010 18:16:35 +0200
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 788bda2..92cd09f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,7 +46,7 @@ libcompizconfig_la_SOURCES = \
ccs-private.h   \
iniparser.h
 
-libcompizconfig_la_LIBADD = @LIBXML2_LIBS@ @LIBX11_LIBS@ $(PROTOBUF_LIB)
+libcompizconfig_la_LIBADD = -ldl @LIBXML2_LIBS@ @LIBX11_LIBS@ $(PROTOBUF_LIB)
 
 lib_LTLIBRARIES=libcompizconfig.la
 

commit 77ec06a85ed066621df42a964acf6a719bb0381e
Author: Julien Cristau jcris...@debian.org
Date:   Sun Apr 4 18:17:31 2010 +0200

Disable protobuf to work around #572923.

diff --git a/debian/changelog b/debian/changelog
index fc60f96..c194e1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcompizconfig (0.8.4-2) UNRELEASED; urgency=low
+
+  * Disable protobuf to work around #572923.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 04 Apr 2010 18:16:35 +0200
+
 libcompizconfig (0.8.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index d375c61..429b694 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,7 @@ Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
 Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.4-1), intltool, libtool, libglib2.0-dev, 
- libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
- protobuf-compiler
 Standards-Version: 3.8.1
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/libcompizconfig.git
diff --git a/debian/rules b/debian/rules
index 4fb5069..d102b19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ AUTOFOO_DELETE:=Makefile.in aclocal.m4 backend/Makefile.in 
config/Makefile.in \
 configure: configure-stamp
 configure-stamp:
dh_testdir
-   ./autogen.sh --prefix=/usr --sysconfdir=/etc
+   ./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-protobuf
touch configure-stamp
 
 build: build-stamp


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nysft-0004sw...@alioth.debian.org



libcompizconfig: Changes to 'debian-unstable'

2010-04-04 Thread Julien Cristau
 debian/changelog |6 ++
 debian/copyright |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit b00a5e8674461c6061b360735e7d46d6acfa9663
Author: Julien Cristau jcris...@debian.org
Date:   Sun Apr 4 18:41:36 2010 +0200

Update upstream git repo url in debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 0025e86..10d0191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcompizconfig (0.8.4-3) UNRELEASED; urgency=low
+
+  * Update upstream git repo url in debian/copyright.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 04 Apr 2010 18:41:24 +0200
+
 libcompizconfig (0.8.4-2) unstable; urgency=medium
 
   * Medium urgency to fix RC bug in testing.
diff --git a/debian/copyright b/debian/copyright
index 028af4e..b1e0cf4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 This package was debianized by sean finney sean...@debian.org.
 
-It was downloaded from 
git://anongit.compiz-fusion.org/fusion/compizconfig/libcompizconfig
+It was downloaded from 
git://anongit.compiz-fusion.org/compiz/compizconfig/libcompizconfig
 
 Upstream Authors: 
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nysxo-0007xy...@alioth.debian.org



libcompizconfig: Changes to 'debian-unstable'

2010-02-11 Thread Sean Finney
 debian/changelog |3 ++-
 debian/control   |4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 809c90b03f6d936f413ad92b1479a917f61a2415
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 20:33:21 2010 +0100

Update changelog to mention ABI bump.

diff --git a/debian/changelog b/debian/changelog
index 2aaf0c1..fc60f96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ libcompizconfig (0.8.4-1) unstable; urgency=low
   * New upstream release.
 - Includes fix for basic_string::_S_construct NULL not valid.
   (Closes: #531797)
+  * Update Build-Depends against compiz-dev to 0.8.4-1 for ABI bump.
 
- -- Sean Finney sean...@debian.org  Thu, 04 Feb 2010 18:01:12 +0100
+ -- Sean Finney sean...@debian.org  Thu, 11 Feb 2010 20:33:19 +0100
 
 libcompizconfig (0.8.2-2) unstable; urgency=low
 

commit e44428097b21f449d4ec6395aff0a6e308cef6c0
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 20:31:52 2010 +0100

Update Build-Depends against compiz-dev to 0.8.4-1 for ABI bump.

diff --git a/debian/control b/debian/control
index 79f3fda..d375c61 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2-6), intltool, libtool, libglib2.0-dev, 
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.4-1), intltool, libtool, libglib2.0-dev, 
  libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
  protobuf-compiler
@@ -14,7 +14,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/libcompizconfig.git
 Package: libcompizconfig-dev
 Section: libdevel
 Architecture: any
-Depends: libcompizconfig0 (= ${binary:Version}), compiz-dev (= 0.8.2-6)
+Depends: libcompizconfig0 (= ${binary:Version})
 Description: Configuration settings library for compiz-fusion - development 
files
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



libcompizconfig: Changes to 'debian-unstable'

2010-02-04 Thread Sean Finney
 VERSION|2 -
 backend/ini.c  |   11 +
 configure.ac   |2 -
 debian/changelog   |8 
 src/bindings.c |   14 +--
 src/compiz.cpp |   97 +
 src/compizconfig.proto |   17 
 src/main.c |   19 -
 8 files changed, 106 insertions(+), 64 deletions(-)

New commits:
commit 755d0b65312e1c98c7ac19e4aa633b29b3ce5975
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 4 18:01:31 2010 +0100

Prepare 0.8.4-1

diff --git a/debian/changelog b/debian/changelog
index bf7d423..2aaf0c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libcompizconfig (0.8.4-1) unstable; urgency=low
+
+  * New upstream release.
+- Includes fix for basic_string::_S_construct NULL not valid.
+  (Closes: #531797)
+
+ -- Sean Finney sean...@debian.org  Thu, 04 Feb 2010 18:01:12 +0100
+
 libcompizconfig (0.8.2-2) unstable; urgency=low
 
   * Let libcompizcore0 depend on compiz-core and

commit a728704db3c3b89808aaf79d1d3ff0d62135da28
Author: Guillaume Seguin guilla...@segu.in
Date:   Wed Oct 14 04:09:05 2009 +0200

* Bump version to 0.8.4

diff --git a/VERSION b/VERSION
index 9b265c0..e4184f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.3
+VERSION=0.8.4

commit 0001e60f79edaeac2ff8ec80bd28aebebfac77ff
Author: Erkin Bahceci erkin...@gmail.com
Date:   Thu Sep 24 13:01:56 2009 -0500

Fix compiler warnings.

diff --git a/src/compiz.cpp b/src/compiz.cpp
index 2755d47..179a43a 100644
--- a/src/compiz.cpp
+++ b/src/compiz.cpp
@@ -281,8 +281,6 @@ initEdgeValuePB (CCSSettingValue * v,
 CCSSettingInfo * i,
 const GenericValueMetadata  value)
 {
-int k, num;
-
 v-value.asEdge = 0;
 
 if (value.has_edge_value ())
@@ -516,7 +514,6 @@ addOptionForPluginPB (CCSPlugin * plugin,
  const StringList  subgroups,
  const OptionMetadata  option)
 {
-int num = 0;
 CCSSetting *setting;
 
 if (ccsFindSetting (plugin, name, isScreen, screen))
@@ -677,7 +674,6 @@ addOptionFromPB (CCSPlugin * plugin,
 {
 const char *name;
 Bool readonly = FALSE;
-int i;
 
 name = option.name ().c_str ();
 
@@ -688,7 +684,7 @@ addOptionFromPB (CCSPlugin * plugin,
 
 if (isScreen)
 {
-   for (i = 0; i  plugin-context-numScreens; i++)
+   for (unsigned i = 0; i  plugin-context-numScreens; i++)
addOptionForPluginPB (plugin, name, TRUE,
  plugin-context-screens[i],
  groups, subgroups, option);
@@ -1009,9 +1005,7 @@ getOptionType (const char *name)
{ match, TypeMatch },
{ list, TypeList }
 };
-int i;
-
-for (i = 0; i  sizeof (map) / sizeof (map[0]); i++)
+for (unsigned i = 0; i  sizeof (map) / sizeof (map[0]); i++)
if (strcasecmp (name, map[i].name) == 0)
return map[i].type;
 
@@ -1439,7 +1433,7 @@ initEdgeValue (CCSSettingValue * v,
 {
 xmlNode **nodes;
 char *value;
-int j, k, num;
+int k, num;
 
 v-value.asEdge = 0;
 
@@ -1461,7 +1455,7 @@ initEdgeValue (CCSSettingValue * v,
value = getStringFromXPath (node-doc, nodes[k], @name);
if (value)
{
-   for (j = 0; j  sizeof (edge) / sizeof (edge[0]); j++)
+   for (unsigned j = 0; j  sizeof (edge) / sizeof (edge[0]); j++)
{
if (strcasecmp ((char *) value, edge[j]) == 0)
v-value.asEdge |= (1  j);
@@ -2170,8 +2164,6 @@ addOptionFromXMLNode (CCSPlugin * plugin,
 char *type;
 char *readonly;
 Bool isReadonly;
-Bool screen;
-int i;
 
 if (!node)
return;
@@ -2201,7 +2193,7 @@ addOptionFromXMLNode (CCSPlugin * plugin,
 
 if (isScreen)
 {
-   for (i = 0; i  plugin-context-numScreens; i++)
+   for (unsigned i = 0; i  plugin-context-numScreens; i++)
addOptionForPlugin (plugin, name, type, isReadonly, TRUE,
plugin-context-screens[i], node,
groupListPBv, subgroupListPBv, optionPBv);
@@ -2658,7 +2650,6 @@ checkAndLoadProtoBuf (char *pbPath,
  struct stat *xmlStat,
  PluginBriefMetadata *pluginBriefPB)
 {
-Bool needsUpdate = FALSE;
 const PluginInfoMetadata pluginInfoPB = pluginBriefPB-info ();
 
 if (pbStat-st_mtime  xmlStat-st_mtime || // is .pb older than .xml?
@@ -2793,7 +2784,6 @@ loadPluginFromXMLFile (CCSContext * context, char 
*xmlName, char *xmlDirPath)
 
// Check if the corresponding .pb exists in cache
Bool error = TRUE;
-   int lenXMLName = strlen (xmlName);
struct stat pbStat;
 
name = strndup (xmlName, strlen (xmlName) - 4);
@@ -2886,7 +2876,6 @@ static void
 loadPluginsFromXMLFiles (CCSContext * context, char *path)
 {
 struct dirent **nameList;
-char *metadataPath;
   

libcompizconfig: Changes to 'debian-unstable'

2009-04-24 Thread Loïc Minier
 debian/control |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit b7775a547fb615346e5bc7bdb871448e266c5703
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 11:20:16 2009 +0200

Revert Bdep on libxcursor-dev; closes: #525240, #524943

This reverts commit ef2ddffd5d15d535a569be2c6c76970150f16409.

diff --git a/debian/control b/debian/control
index ef67803..6bc9101 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Uploaders: Sean Finney sean...@debian.org
 Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2), intltool, libtool, libglib2.0-dev, 
  libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
- protobuf-compiler,
- libxcursor-dev
+ protobuf-compiler
 Standards-Version: 3.8.1
 Section: libs
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



libcompizconfig: Changes to 'debian-unstable'

2009-04-24 Thread Loïc Minier
 debian/control |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ef2ddffd5d15d535a569be2c6c76970150f16409
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 10:45:18 2009 +0200

Bdep on libxcursor-dev; closes: #525240, #524943

diff --git a/debian/control b/debian/control
index 6bc9101..ef67803 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Uploaders: Sean Finney sean...@debian.org
 Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2), intltool, libtool, libglib2.0-dev, 
  libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
- protobuf-compiler
+ protobuf-compiler,
+ libxcursor-dev
 Standards-Version: 3.8.1
 Section: libs
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



libcompizconfig: Changes to 'debian-unstable'

2009-04-24 Thread Loïc Minier
 debian/control |5 -
 debian/rules   |4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit b9cd4a79696c9d3f511613a3f6733761a6106d16
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 14:18:25 2009 +0200

Add Vcs-Git-* control headers

diff --git a/debian/control b/debian/control
index 90b68ff..06adc1a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,8 @@ Build-Depends: debhelper (= 5), autoconf, automake1.9, 
autotools-dev, compiz-de
  protobuf-compiler
 Standards-Version: 3.8.1
 Section: libs
+Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/libcompizconfig.git
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/libcompizconfig.git
 
 Package: libcompizconfig-dev
 Section: libdevel

commit 4687bd430bd3e6b91c034379c75847ba07c9d613
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 14:16:19 2009 +0200

Depend on compiz-core and -abiversion-2009xxyy

Let libcompizcore0 depend on compiz-core and
compiz-core-abiversion-2009xxyy to avoid package mismatches.

diff --git a/debian/control b/debian/control
index 6bc9101..90b68ff 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Description: Configuration settings library for compiz-fusion 
- development file
 Package: libcompizconfig0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ compiz-core, compiz-core-${coreabiversion}
 Description: Configuration settings library for compiz-fusion
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide
diff --git a/debian/rules b/debian/rules
index 4719122..4fb5069 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,8 @@ endif
 version=0.52
 major=0
 
+CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' 
/usr/include/compiz/compiz-core.h )
+
 # the following are generated by autoconf and have no way of being deleted
 # gracefully. 
 AUTOFOO_DELETE:=Makefile.in aclocal.m4 backend/Makefile.in config/Makefile.in \
@@ -73,7 +75,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
-   dh_gencontrol
+   dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
dh_md5sums
dh_builddeb
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



libcompizconfig: Changes to 'debian-unstable'

2009-04-24 Thread Loïc Minier
 debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9cc97e5ce1d09372d971be0e358230e27530dfd0
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 14:33:59 2009 +0200

Fix missing -abiversion in virtual dep

diff --git a/debian/control b/debian/control
index 06adc1a..7c796eb 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Package: libcompizconfig0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- compiz-core, compiz-core-${coreabiversion}
+ compiz-core, compiz-core-abiversion-${coreabiversion}
 Description: Configuration settings library for compiz-fusion
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



libcompizconfig: Changes to 'debian-unstable'

2009-04-24 Thread Loïc Minier
 debian/changelog |   13 +
 debian/control   |4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit dc3c244e82a624fa325c56a8a22d1491a89393d5
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 16:56:34 2009 +0200

Update changelog for 0.8.2-2

diff --git a/debian/changelog b/debian/changelog
index 58e430c..bf7d423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libcompizconfig (0.8.2-2) unstable; urgency=low
+
+  * Let libcompizcore0 depend on compiz-core and
+compiz-core-abiversion-2009xxyy to avoid package mismatches.
+  * Add Vcs-Git-* control headers.
+  * Fix missing -abiversion in virtual dep.
+  * Let libcompizconfig-dev dep on compiz-dev (= 0.8.2) for the Requires:
+compiz libcompizconfig.pc.
+  * Temporarily bump compiz-dev build-dep and dep to = 0.8.2-6 to
+workaround FTBFS with current compiz-dev.
+
+ -- Loic Minier l...@dooz.org  Fri, 24 Apr 2009 15:58:19 +0200
+
 libcompizconfig (0.8.2-1) unstable; urgency=low
 
   * New upstream release.

commit 5da89471a26a6f6bd27256d891ee51af4f248c0d
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 17:04:38 2009 +0200

Bump compiz-dev bdep and dep to 0.8.2-6 for FTBFS

Temporarily bump compiz-dev build-dep and dep to = 0.8.2-6 to
workaround FTBFS with current compiz-dev.

diff --git a/debian/control b/debian/control
index e1cc7ff..79f3fda 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2), intltool, libtool, libglib2.0-dev, 
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2-6), intltool, libtool, libglib2.0-dev, 
  libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
  protobuf-compiler
@@ -14,7 +14,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/libcompizconfig.git
 Package: libcompizconfig-dev
 Section: libdevel
 Architecture: any
-Depends: libcompizconfig0 (= ${binary:Version}), compiz-dev (= 0.8.2)
+Depends: libcompizconfig0 (= ${binary:Version}), compiz-dev (= 0.8.2-6)
 Description: Configuration settings library for compiz-fusion - development 
files
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide

commit 81e0c00e92b2add71c1992cfade49bca2b9293d3
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 17:03:26 2009 +0200

Let libcompizconfig-dev dep on compiz-dev

Let libcompizconfig-dev dep on compiz-dev (= 0.8.2) for the Requires:
compiz libcompizconfig.pc.

diff --git a/debian/control b/debian/control
index 7c796eb..e1cc7ff 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/libcompizconfig.git
 Package: libcompizconfig-dev
 Section: libdevel
 Architecture: any
-Depends: libcompizconfig0 (= ${binary:Version})
+Depends: libcompizconfig0 (= ${binary:Version}), compiz-dev (= 0.8.2)
 Description: Configuration settings library for compiz-fusion - development 
files
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



libcompizconfig: Changes to 'debian-unstable'

2009-04-05 Thread Sean Finney
 Makefile.am |   10 
 VERSION |2 
 config/config   |5 
 configure.ac|   28 
 debian/changelog|   10 
 debian/control  |7 
 debian/gbp.conf |8 
 debian/libcompizconfig0.install |1 
 include/ccs.h   |   44 
 metadata/Makefile.am|7 
 metadata/global.xml |  416 -
 plugin/ccp.c|   99 -
 src/Makefile.am |   46 
 src/ccs-private.h   |5 
 src/compiz.c| 1570 
 src/compiz.cpp  | 3137 
 src/compizconfig.proto  |  164 ++
 src/config.c|   13 
 src/ini.c   |  131 -
 src/lists.c |6 
 src/main.c  |   65 
 21 files changed, 3632 insertions(+), 2142 deletions(-)

New commits:
commit 40bbe774c362fe7e2fd236e9b9326f845c087c40
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 21:51:13 2009 +0200

prep changelog for upload

diff --git a/debian/changelog b/debian/changelog
index a876151..d47afe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libcompizconfig (0.8.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add gbp.conf for use with git-buildpackage
+  * Add build-dep on libprotobuf-dev and protobuf-compiler.
+  * Update Standards-Version to 3.8.1
+  * Remove usr/share/compizconfig from libcompizconfig0.install
+
+ -- Sean Finney sean...@debian.org  Sun, 05 Apr 2009 21:47:59 +0200
+
 libcompizconfig (0.7.6-1) unstable; urgency=low
 
   * New upstream release.  Includes ABI change so build-deps changed

commit c1eb7402fb8e0d1d11b18bdb90da4e6ab2729fc9
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 21:47:48 2009 +0200

remove usr/share/compizconfig from libcompizconfig0.install

diff --git a/debian/libcompizconfig0.install b/debian/libcompizconfig0.install
index 1c035b2..8cdfd85 100644
--- a/debian/libcompizconfig0.install
+++ b/debian/libcompizconfig0.install
@@ -2,5 +2,4 @@ usr/lib/libcompizconfig.so.*
 usr/lib/compiz/*.so
 usr/lib/compizconfig/backends/*.so
 usr/share/compiz/*xml
-usr/share/compizconfig
 etc/compizconfig/config

commit de92318a6060dbec6ab4f45613abc40218f4001a
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 21:45:20 2009 +0200

update standard-version to 3.8.1

diff --git a/debian/control b/debian/control
index 786c4c8..b0d9c3c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (= 5), autoconf, automake1.9, 
autotools-dev, compiz-de
  libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
  protobuf-compiler
-Standards-Version: 3.7.2
+Standards-Version: 3.8.1
 Section: libs
 
 Package: libcompizconfig-dev

commit 9d0092b5031182aa889935643bd51f9a2ac4e065
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 21:41:52 2009 +0200

add build-dep on libprotobuf-dev and protobuf-compiler

diff --git a/debian/control b/debian/control
index f8ef646..786c4c8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,10 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.6), intltool, libtool, libglib2.0-dev, libxml2-dev, 
libxslt1-dev
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.6), intltool, libtool, libglib2.0-dev, 
+ libprotobuf-dev,
+ libxml2-dev, libxslt1-dev,
+ protobuf-compiler
 Standards-Version: 3.7.2
 Section: libs
 

commit e788f7aa01b00466f75283e745f3d66bf390a123
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 19:16:38 2009 +0200

add gbp.conf for use with git-buildpackage

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..6b6b4c7
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+debian-branch = debian-unstable
+debian-tag = libcompizconfig-%(version)s
+upstream-branch = upstream-unstable
+upstream-tag = %(version)s
+
+[git-dch]
+meta = 1

commit cbbdcceea27f671f96ff86902478487f76cd3f12
Author: Guillaume Seguin guilla...@segu.in
Date:   Mon Mar 9 15:43:46 2009 +0100

* Bump version to 0.8.2

diff --git a/VERSION b/VERSION
index 1357b31..2dcc312 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.9
+VERSION=0.8.2

commit bb0ec725b1f5ed60d719ecb37843150b6713cc1f
Author: Guillaume Seguin guilla...@segu.in
Date:   Thu Mar 5 16:28:32 2009 +0100

Fix compizconfig.proto dist inclusion

diff --git a/src/Makefile.am b/src/Makefile.am
index 6dfae9c..788bda2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,6 @@ PROTOBUF_LIB = -lprotobuf
 PROTOBUF_DEFINES = \
-DUSE_PROTOBUF=1
 
-EXTRA_DIST = compizconfig.proto
-
 compizconfig.pb.cc: compizconfig.proto

libcompizconfig: Changes to 'debian-unstable'

2009-04-05 Thread Sean Finney
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit de42e63c1702f42808f7d0e5fd13a96920670cd8
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 22:07:09 2009 +0200

another change to the changelog

diff --git a/debian/changelog b/debian/changelog
index d47afe1..58e430c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libcompizconfig (0.8.2-1) unstable; urgency=low
   * Add build-dep on libprotobuf-dev and protobuf-compiler.
   * Update Standards-Version to 3.8.1
   * Remove usr/share/compizconfig from libcompizconfig0.install
+  * update build-dep version against compiz-dev
 
  -- Sean Finney sean...@debian.org  Sun, 05 Apr 2009 21:47:59 +0200
 

commit db0d74f1503e3582ea6a4b3db6200e02890e491d
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 22:06:27 2009 +0200

update build-dep version against compiz-dev

diff --git a/debian/control b/debian/control
index b0d9c3c..6bc9101 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.6), intltool, libtool, libglib2.0-dev, 
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2), intltool, libtool, libglib2.0-dev, 
  libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
  protobuf-compiler


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



libcompizconfig: Changes to 'debian-unstable'

2008-06-02 Thread Sean Finney
 VERSION |2 +-
 debian/changelog|7 +++
 debian/control  |2 +-
 include/ccs.h   |   12 +---
 metadata/global.xml |4 
 src/compiz.c|   25 +
 src/main.c  |   16 +---
 7 files changed, 60 insertions(+), 8 deletions(-)

New commits:
commit 17c4ccb44683123b07cb35163449f8c40452f668
Author: Sean Finney [EMAIL PROTECTED]
Date:   Tue Jun 3 00:43:20 2008 +0200

new upstream release

diff --git a/debian/changelog b/debian/changelog
index 6b092e2..a876151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcompizconfig (0.7.6-1) unstable; urgency=low
+
+  * New upstream release.  Includes ABI change so build-deps changed
+accordingly.
+
+ -- Sean Finney [EMAIL PROTECTED]  Tue, 03 Jun 2008 00:42:01 +0200
+
 libcompizconfig (0.7.4-2) unstable; urgency=low
 
   * Add build-deps on autoconf, automake1.9, libglib2.0-dev, and libtool 
diff --git a/debian/control b/debian/control
index 9167e8b..f8ef646 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.3), intltool, libtool, libglib2.0-dev, libxml2-dev, 
libxslt1-dev
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.6), intltool, libtool, libglib2.0-dev, libxml2-dev, 
libxslt1-dev
 Standards-Version: 3.7.2
 Section: libs
 

commit 4b8f5d694ecf5b0cff73fb16dc9e211172c92e35
Author: Guillaume Seguin [EMAIL PROTECTED]
Date:   Sat May 31 14:08:49 2008 +0200

* Bump version to 0.7.6

diff --git a/VERSION b/VERSION
index 130f2d5..6410fd5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.5
+VERSION=0.7.6

commit b1c52a6d0c71f34092c0c544cc0a9ca53a59459f
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Fri Apr 25 01:59:19 2008 +0200

Added an action information that indicates that a binding is not a global 
binding. The new internal tag (internal/ or internaltrue/internal) can 
now be used to mark an action setting as plugin internal.

diff --git a/include/ccs.h b/include/ccs.h
index 885597c..a7d8663 100644
--- a/include/ccs.h
+++ b/include/ccs.h
@@ -253,11 +253,17 @@ typedef struct _CCSSettingListInfo
 union _CCSSettingInfo *listInfo; /* list of settings */
 } CCSSettingListInfo;
 
+typedef struct _CCSSettingActionInfo
+{
+Bool internal; /* is this binding global or plugin internal*/
+} CCSSettingActionInfo;
+
 typedef union _CCSSettingInfo
 {
-CCSSettingIntInfo   forInt;
-CCSSettingFloatInfo forFloat;
-CCSSettingListInfo  forList;
+CCSSettingIntInfoforInt;
+CCSSettingFloatInfo  forFloat;
+CCSSettingListInfo   forList;
+CCSSettingActionInfo forAction;
 } CCSSettingInfo;
 
 typedef struct _CCSSettingColorValueColor
diff --git a/src/compiz.c b/src/compiz.c
index f89a724..7ce15f9 100644
--- a/src/compiz.c
+++ b/src/compiz.c
@@ -860,6 +860,25 @@ initListInfo (CCSSettingInfo * i, xmlNode * node)
 }
 
 static void
+initActionInfo (CCSSettingInfo * i, xmlNode * node)
+{
+char *value;
+
+i-forAction.internal = FALSE;
+
+value = getStringFromPath (node-doc, node, internal/child::text());
+if (value)
+{
+   if (strcasecmp (value, true) == 0)
+   i-forAction.internal = TRUE;
+   free (value);
+   return;
+}
+if (nodeExists (node, internal))
+   i-forAction.internal = TRUE;
+}
+
+static void
 addOptionForPlugin (CCSPlugin * plugin,
char * name,
char * type,
@@ -929,6 +948,12 @@ addOptionForPlugin (CCSPlugin * plugin,
 case TypeList:
initListInfo (setting-info, node);
break;
+case TypeKey:
+case TypeButton:
+case TypeEdge:
+case TypeBell:
+   initActionInfo (setting-info, node);
+   break;
 default:
break;
 }

commit 4d728b6eb6d00fcf8a4066dd47049692352ef3f0
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Apr 15 08:23:46 2008 +0200

But switcher panel bindings into Bindings group.

diff --git a/metadata/global.xml b/metadata/global.xml
index 870b56f..147726e 100644
--- a/metadata/global.xml
+++ b/metadata/global.xml
@@ -373,6 +373,10 @@
option name=next_no_popup_key type=key/
option name=prev_no_popup_button 
type=button/
option name=prev_no_popup_key type=key/
+   option name=next_panel_button type=button/
+   option name=next_panel_key type=key/
+   option name=prev_panel_button type=button/
+   option name=prev_panel_key type=key/
/group
/display
/plugin

commit a2bedd700b3573159ae602d52b30edf74097ddf4
Author: 

libcompizconfig: Changes to 'debian-unstable'

2008-05-20 Thread Sean Finney
 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit b49ec2ad6b406bb50da4a173e4a912219122d497
Author: Sean Finney [EMAIL PROTECTED]
Date:   Tue May 20 08:34:10 2008 +0200

add autofoo build-deps

diff --git a/debian/changelog b/debian/changelog
index 53120c1..4f9a9fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcompizconfig (0.7.4-2) unstable; urgency=low
+
+  * Add build-deps on autoconf, automake1.9, and libtool 
+
+ -- Sean Finney [EMAIL PROTECTED]  Tue, 20 May 2008 08:33:31 +0200
+
 libcompizconfig (0.7.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 6770bf3..10118c1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autotools-dev, compiz-dev (= 0.7.3), 
intltool, libxml2-dev, libxslt1-dev
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.3), intltool, libtool, libxml2-dev, libxslt1-dev
 Standards-Version: 3.7.2
 Section: libs
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



libcompizconfig: Changes to 'debian-unstable'

2008-05-20 Thread Sean Finney
 debian/changelog |2 +-
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a3a1a1666521cbee32ae46d96a85046faee9b5af
Author: Sean Finney [EMAIL PROTECTED]
Date:   Tue May 20 08:37:47 2008 +0200

more autofoo build-deps

diff --git a/debian/changelog b/debian/changelog
index 4f9a9fb..6b092e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 libcompizconfig (0.7.4-2) unstable; urgency=low
 
-  * Add build-deps on autoconf, automake1.9, and libtool 
+  * Add build-deps on autoconf, automake1.9, libglib2.0-dev, and libtool 
 
  -- Sean Finney [EMAIL PROTECTED]  Tue, 20 May 2008 08:33:31 +0200
 
diff --git a/debian/control b/debian/control
index 10118c1..9167e8b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.3), intltool, libtool, libxml2-dev, libxslt1-dev
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.3), intltool, libtool, libglib2.0-dev, libxml2-dev, 
libxslt1-dev
 Standards-Version: 3.7.2
 Section: libs
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



libcompizconfig: Changes to 'debian-unstable'

2008-05-19 Thread Sean Finney
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 158f2a000f077d2a0e3b33250a44548ff2b7c201
Author: Sean Finney [EMAIL PROTECTED]
Date:   Tue May 20 07:22:09 2008 +0200

update build deps

diff --git a/debian/changelog b/debian/changelog
index 3afcf40..53120c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libcompizconfig (0.7.4-1) unstable; urgency=low
 
   * New upstream release.
+  * Update build-deps to compiz-dev = 0.7.3
 
  -- Sean Finney [EMAIL PROTECTED]  Sun, 18 May 2008 19:58:13 +0200
 
diff --git a/debian/control b/debian/control
index 2e464fc..6770bf3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autotools-dev, compiz-dev (= 0.6.0), 
intltool, libxml2-dev, libxslt1-dev
+Build-Depends: debhelper (= 5), autotools-dev, compiz-dev (= 0.7.3), 
intltool, libxml2-dev, libxslt1-dev
 Standards-Version: 3.7.2
 Section: libs
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



libcompizconfig: Changes to 'debian-unstable'

2008-05-18 Thread Sean Finney
 Makefile.in |  731 -
 VERSION |2 
 aclocal.m4  | 8250 -
 backend/Makefile.in |  519 
 backend/ini.c   |   75 
 config.guess| 1516 --
 config.h.in |   89 
 config.sub  | 1626 --
 config/Makefile.in  |  406 
 configure   |24871 
 configure.ac|2 
 debian/changelog|6 
 debian/libcompizconfig0.install |1 
 debian/rules|   12 
 depcomp |  530 
 include/Makefile.in |  448 
 include/ccs.h   |  464 
 install-sh  |  323 
 intltool-extract.in |  861 -
 intltool-merge.in   | 1451 --
 intltool-update.in  | 1164 -
 ltmain.sh   | 6938 ---
 metadata/Makefile.am|   10 
 metadata/Makefile.in|  405 
 metadata/ccp.xml|7 
 metadata/global.xml |  205 
 missing |  360 
 mkinstalldirs   |  111 
 plugin/Makefile.in  |  518 
 plugin/ccp.c|  881 -
 po/Makefile.in.in   |  218 
 src/Makefile.in |  539 
 src/bindings.c  |  224 
 src/compiz.c|  473 
 src/ini.c   |  360 
 src/lists.c |   68 
 src/main.c  |  489 
 37 files changed, 1719 insertions(+), 53434 deletions(-)

New commits:
commit 7991cf7228af765fb1259ecbd3606af8ac82af7d
Author: Sean Finney [EMAIL PROTECTED]
Date:   Sun May 18 20:52:23 2008 +0200

catch autocruft

diff --git a/debian/rules b/debian/rules
index f3d3176..4719122 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,11 +15,18 @@ endif
 version=0.52
 major=0
 
+# the following are generated by autoconf and have no way of being deleted
+# gracefully. 
+AUTOFOO_DELETE:=Makefile.in aclocal.m4 backend/Makefile.in config/Makefile.in \
+   configure include/Makefile.in intltool-extract.in intltool-merge.in \
+   intltool-update.in metadata/Makefile.in plugin/Makefile.in \
+   po/Makefile.in.in src/Makefile.in config.guess config.h.in config.sub \
+   depcomp install-sh ltmain.sh missing mkinstalldirs
+
 configure: configure-stamp
 configure-stamp:
dh_testdir
-   chmod +x ./configure ./install-sh
-   ./configure --prefix=/usr --sysconfdir=/etc
+   ./autogen.sh --prefix=/usr --sysconfdir=/etc
touch configure-stamp
 
 build: build-stamp
@@ -33,6 +40,7 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
+   rm -f $(AUTOFOO_DELETE)
dh_clean 
 
 install: build

commit 9d843643a2256298f89b7d0fd20392278b8e3b6d
Author: Sean Finney [EMAIL PROTECTED]
Date:   Sun May 18 20:44:28 2008 +0200

delete disappeared upstream files

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 2e03b92..000
--- a/Makefile.in
+++ /dev/null
@@ -1,731 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
[EMAIL PROTECTED]@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-   $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-   $(srcdir)/libcompizconfig.pc.in $(top_srcdir)/configure \
-   AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
-   config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-   

libcompizconfig: Changes to 'debian-unstable'

2007-11-17 Thread Sean Finney
 debian/changelog |7 
 debian/copyright |   88 ---
 2 files changed, 91 insertions(+), 4 deletions(-)

New commits:
commit 85a73c8842618766b52ee064a3c32ed90ce94488
Author: Sean Finney [EMAIL PROTECTED]
Date:   Sat Nov 17 13:18:37 2007 +0100

update/clarify copyright info

diff --git a/debian/changelog b/debian/changelog
index 77509f4..2405785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcompizconfig (0.6.0-3) unstable; urgency=low
+
+  * update/clarify copyright information in debian/copyright at the request of
+ftp-master.
+
+ -- Sean Finney [EMAIL PROTECTED]  Sat, 17 Nov 2007 13:18:03 +0100
+
 libcompizconfig (0.6.0-2) unstable; urgency=low
 
   * ship the development package as libcompizconfig-dev, instead of
diff --git a/debian/copyright b/debian/copyright
index 007faab..028af4e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 This package was debianized by sean finney [EMAIL PROTECTED].
 
-It was downloaded from 
git://anongit.opencompositing.org/fusion/compizconfig/libcompizconfig
+It was downloaded from 
git://anongit.compiz-fusion.org/fusion/compizconfig/libcompizconfig
 
 Upstream Authors: 
 
@@ -9,9 +9,89 @@ Upstream Authors:
Nicolas Devillard (ndevilla AT free DOT fr) 
David Reveman [EMAIL PROTECTED]
 
-License:
+Copyright:
 
-GPL, see `/usr/share/common-licenses/GPL'
+
+The following copyright applies to the files:
+   - ./src/iniparser.c:
+   - ./src/iniparser.h:
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+ Copyright (c) 2000 by Nicolas Devillard (ndevilla AT free DOT fr).
+
+ Written by Nicolas Devillard. Not derived from licensed software.
+
+ Permission is granted to anyone to use this software for any
+ purpose on any computer system, and to redistribute it freely,
+ subject to the following restrictions:
+
+ 1. The author is not responsible for the consequences of use of
+ this software, no matter how awful, even if they arise
+ from defects in it.
+
+ 2. The origin of this software must not be misrepresented, either
+ by explicit claim or by omission.
+
+ 3. Altered versions must be plainly marked as such, and must not
+ be misrepresented as being the original software.
+
+ 4. This notice may not be removed or altered.
+
+
+
+The following copyright applies to the files:
+   - src/lists.c
+   - src/bindings.c
+   - src/config.c
+   - src/ini.c
+   - src/ccs-private.h
+   - src/filewatch.h
+   - src/main.c
+   - src/compiz.c
+   - plugin/ccp.c
+   - include/ccs-backend.h
+   - include/ccs.h
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+ * Copyright (C) 2007  Dennis Kasprzyk [EMAIL PROTECTED]
+ * Copyright (C) 2007  Danny Baumann [EMAIL PROTECTED]
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
+ */
+
+
+On Debian systems, the complete text of the GNU Lesser General Public
+License, can be found in /usr/share/common-licenses/LGPL.
+
+
+The following copyright applies to
+   - backend/ini.c
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+ * Copyright (c) 2007 Danny Baumann [EMAIL PROTECTED]
+ *
+ * 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
+ * of the License, 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.
+
+
+On Debian systems, the 

libcompizconfig: Changes to 'debian-unstable'

2007-11-08 Thread Sean Finney
 debian/changelog|7 +++
 debian/control  |3 +--
 debian/libcompizconfig-dev.docs |3 +++
 debian/libcompizconfig-dev.install  |6 ++
 debian/libcompizconfig0-dev.docs|3 ---
 debian/libcompizconfig0-dev.install |6 --
 6 files changed, 17 insertions(+), 11 deletions(-)

New commits:
commit 3e1d334fb71e564784fc77e1c8cd683c67ca6f33
Author: Sean Finney [EMAIL PROTECTED]
Date:   Fri Nov 9 08:43:28 2007 +0100

s/libcompizconfig0-dev/libcompizconfig-dev/g

diff --git a/debian/changelog b/debian/changelog
index 1fbd580..77509f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcompizconfig (0.6.0-2) unstable; urgency=low
+
+  * ship the development package as libcompizconfig-dev, instead of
+libcompizconfig0-dev.
+
+ -- Sean Finney [EMAIL PROTECTED]  Fri, 09 Nov 2007 08:41:37 +0100
+
 libcompizconfig (0.6.0-1) unstable; urgency=low
 
   * Initial release (Closes: #431787)
diff --git a/debian/control b/debian/control
index 2e30778..2e464fc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,10 @@ Build-Depends: debhelper (= 5), autotools-dev, compiz-dev 
(= 0.6.0), intltool,
 Standards-Version: 3.7.2
 Section: libs
 
-Package: libcompizconfig0-dev
+Package: libcompizconfig-dev
 Section: libdevel
 Architecture: any
 Depends: libcompizconfig0 (= ${binary:Version})
-Provides: libcompizconfig-dev
 Description: Configuration settings library for compiz-fusion - development 
files
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide
diff --git a/debian/libcompizconfig-dev.docs b/debian/libcompizconfig-dev.docs
new file mode 100644
index 000..a3d08bc
--- /dev/null
+++ b/debian/libcompizconfig-dev.docs
@@ -0,0 +1,3 @@
+NEWS
+AUTHORS
+TODO
diff --git a/debian/libcompizconfig-dev.install 
b/debian/libcompizconfig-dev.install
new file mode 100644
index 000..4ec7f46
--- /dev/null
+++ b/debian/libcompizconfig-dev.install
@@ -0,0 +1,6 @@
+usr/include/*
+usr/lib/pkgconfig
+usr/lib/libcompizconfig.so
+usr/lib/*.a
+usr/lib/compiz/*.a
+usr/lib/compizconfig/backends/*.a
diff --git a/debian/libcompizconfig0-dev.docs b/debian/libcompizconfig0-dev.docs
deleted file mode 100644
index a3d08bc..000
--- a/debian/libcompizconfig0-dev.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-NEWS
-AUTHORS
-TODO
diff --git a/debian/libcompizconfig0-dev.install 
b/debian/libcompizconfig0-dev.install
deleted file mode 100644
index 4ec7f46..000
--- a/debian/libcompizconfig0-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/include/*
-usr/lib/pkgconfig
-usr/lib/libcompizconfig.so
-usr/lib/*.a
-usr/lib/compiz/*.a
-usr/lib/compizconfig/backends/*.a


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



libcompizconfig: Changes to 'debian-unstable'

2007-11-07 Thread Sean Finney
 Makefile.am |3 
 Makefile.in |7 
 VERSION |2 
 backend/Makefile.in |2 
 config/Makefile.am  |6 
 config/Makefile.in  |  406 
 config/config   |   16 +
 configure   |   23 +-
 configure.ac|1 
 debian/changelog|4 
 debian/control  |   23 +-
 debian/libcompizconfig-dev.install  |5 
 debian/libcompizconfig0-dev.docs|3 
 debian/libcompizconfig0-dev.install |6 
 debian/libcompizconfig0.docs|3 
 debian/libcompizconfig0.install |5 
 debian/rules|   12 -
 include/Makefile.in |2 
 intltool-extract.in |2 
 intltool-merge.in   |   57 +++--
 intltool-update.in  |8 
 metadata/Makefile.in|2 
 metadata/global.xml |1 
 plugin/Makefile.in  |2 
 src/Makefile.in |2 
 src/compiz.c|   14 +
 src/ini.c   |   19 +
 src/iniparser.c |6 
 src/main.c  |5 
 29 files changed, 579 insertions(+), 68 deletions(-)

New commits:
commit 22851a2624f94436484b7c371ab9ae0c500c39b2
Author: Sean Finney [EMAIL PROTECTED]
Date:   Wed Nov 7 19:03:53 2007 +0100

- update debian packaging for new upstream
- add --sysconfdir to ./configure flags to avoid some files being plopped
  in /usr/etc
- rework some of the file installing/moving/removing in debian/rules
- libcompizconfig-dev - libcompizconfig0-dev which provides the former
- build-dep on compiz  0.6.0 to make sure we don't build against an old
  compiz package
- don't bother installing upstream changelogs until they have content
- add a decent description

diff --git a/debian/changelog b/debian/changelog
index 398e5d6..1fbd580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libcompizconfig (0.5.2-1) unstable; urgency=low
+libcompizconfig (0.6.0-1) unstable; urgency=low
 
   * Initial release (Closes: #431787)
 
- -- Sean Finney [EMAIL PROTECTED]  Wed, 05 Sep 2007 21:17:27 +0200
+ -- Sean Finney [EMAIL PROTECTED]  Wed, 07 Nov 2007 08:33:47 +0100
 
diff --git a/debian/control b/debian/control
index a8b0793..2e30778 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,35 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autotools-dev, compiz-dev, intltool, 
libxml2-dev, libxslt1-dev
+Build-Depends: debhelper (= 5), autotools-dev, compiz-dev (= 0.6.0), 
intltool, libxml2-dev, libxslt1-dev
 Standards-Version: 3.7.2
 Section: libs
 
-Package: libcompizconfig-dev
+Package: libcompizconfig0-dev
 Section: libdevel
 Architecture: any
 Depends: libcompizconfig0 (= ${binary:Version})
+Provides: libcompizconfig-dev
 Description: Configuration settings library for compiz-fusion - development 
files
- TODO
+ Compiz Fusion is the result of the re-unification of the Beryl-project
+ and the community around the Compiz Window Manager. It seeks to provide
+ an easy and fun-to-use windowing environment, allowing use of the
+ graphics hardware to provide impressive effects, amazing speed and
+ unrivalled usefulness
+ .
+ This package provides the development files for the compiz-fusion 
+ configuration system.
 
 Package: libcompizconfig0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Configuration settings library for compiz-fusion
- TODO
+ Compiz Fusion is the result of the re-unification of the Beryl-project
+ and the community around the Compiz Window Manager. It seeks to provide
+ an easy and fun-to-use windowing environment, allowing use of the
+ graphics hardware to provide impressive effects, amazing speed and
+ unrivalled usefulness
+ .
+ This package provides the libraries and runtime files for the compiz-fusion 
+ configuration system.
diff --git a/debian/libcompizconfig-dev.install 
b/debian/libcompizconfig-dev.install
deleted file mode 100644
index 21ab231..000
--- a/debian/libcompizconfig-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/*
-usr/lib/libcompizconfig.so
-usr/lib/*.a
-usr/lib/compiz/*.a
-usr/lib/compizconfig/backends/*.a
diff --git a/debian/libcompizconfig0-dev.docs b/debian/libcompizconfig0-dev.docs
new file mode 100644
index 000..a3d08bc
--- /dev/null
+++ b/debian/libcompizconfig0-dev.docs
@@ -0,0 +1,3 @@
+NEWS
+AUTHORS
+TODO
diff --git a/debian/libcompizconfig0-dev.install 
b/debian/libcompizconfig0-dev.install
new file mode 100644
index 000..4ec7f46
--- /dev/null
+++ b/debian/libcompizconfig0-dev.install
@@ -0,0 +1,6 @@

libcompizconfig: Changes to 'debian-unstable'

2007-09-06 Thread Sean Finney
New branch 'debian-unstable' available with the following commits:
commit abef0e362f3a8adba168a03c937e67ceae9b5cb1
Author: Sean Finney [EMAIL PROTECTED]
Date:   Thu Sep 6 00:01:50 2007 +0200

initial debianization

commit f071087c03751143d14950cc6965c89c015d1f2e
Author: Sean Finney [EMAIL PROTECTED]
Date:   Wed Sep 5 22:49:00 2007 +0200

initial autoconfination of code


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]