--- xcompmgr-1.1.4.orig/debian/changelog
+++ xcompmgr-1.1.4/debian/changelog
@@ -0,0 +1,31 @@
+xcompmgr (1.1.4-0.1) unstable; urgency=low
+
+  * Non-maintainer upload with maintainer agreement.
+  * New upstream release.
+  * Use debhelper v7, drop cdbs build-dep, update to newer automake.
+  * Add watch file.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 29 May 2008 15:43:09 +0200
+
+xcompmgr (1.1.1+cvs.20051218-1) experimental; urgency=low
+
+  * First Debian release (Closes: #343947).
+  * debian/control
+    - Maintainer field changed
+    - Standards-Version updated to 3.6.2.1
+    - Build-Depends versioned
+    - Build-Depends on automake1.7 added
+
+ -- Gustavo Franco <stratus@debian.org>  Sun, 18 Dec 2005 21:44:26 -0200
+
+xcompmgr (1.1.1+cvs.20041109-0ubuntu2) UNRELEASED; urgency=low
+
+  * Add pkg-config to Build-Depends.
+
+ -- Daniel Stone <daniel.stone@canonical.com>  Wed, 24 Nov 2004 14:50:09 +0100
+
+xcompmgr (1.1.1+cvs.20041109-0ubuntu1) UNRELEASED; urgency=low
+
+  * First xcompmgr release.
+
+ -- Daniel Stone <daniel.stone@canonical.com>  Tue,  9 Nov 2004 21:01:19 +0100
--- xcompmgr-1.1.4.orig/debian/compat
+++ xcompmgr-1.1.4/debian/compat
@@ -0,0 +1 @@
+7
--- xcompmgr-1.1.4.orig/debian/control
+++ xcompmgr-1.1.4/debian/control
@@ -0,0 +1,15 @@
+Source: xcompmgr
+Section: x11
+Priority: optional
+Maintainer: Gustavo Franco <stratus@debian.org>
+Build-Depends: debhelper (>= 7.0.0), automake, libx11-dev (>= 6.8.2.dfsg.1-11), libxcomposite-dev (>= 6.8.2.dfsg.1-11), libxfixes-dev (>= 6.8.2.dfsg.1-11), libxdamage-dev (>= 6.8.2.dfsg.1-11), libxrender-dev (>= 1:0.9.0-2), pkg-config (>= 0.20)
+Standards-Version: 3.7.3
+
+Package: xcompmgr
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: X composition manager
+ xcompmgr is the standard composition manager for the X Composite extension,
+ which allows clients to modify what is drawn to the screen before it
+ happens.  This composition manager implements shadows, fading, proper
+ translucency, and more.
--- xcompmgr-1.1.4.orig/debian/copyright
+++ xcompmgr-1.1.4/debian/copyright
@@ -0,0 +1,19 @@
+xcompmgr was primarily authored by Keith Packard <keithp@keithp.com> and
+Matthew Hawn <hawnpawn@yahoo.com>, with additional modifications by Dan
+Doel <dolio@case.edu>.
+
+xcompmgr is copyright both Keith Packard and Matthew Dawn.  The primary
+copyright/licence is:
+ * Copyright © 2003 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+
+Matthew Hawn has specified he wishes to assert the same terms.
--- xcompmgr-1.1.4.orig/debian/rules
+++ xcompmgr-1.1.4/debian/rules
@@ -0,0 +1,42 @@
+#!/usr/bin/make -f
+
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+confflags = --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE)
+
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	confflags += --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+
+build: build-stamp
+build-stamp:
+	dh build --before configure
+	autoreconf -vfi
+	mkdir -p $(BUILDDIR)
+	cd $(BUILDDIR) && ../configure $(confflags)
+	cd $(BUILDDIR) && $(MAKE)
+	dh build --after build
+	touch $@
+
+install: build-stamp
+	dh install --before dh_auto_install
+	cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	dh install --after dh_auto_install
+
+binary-indep:
+	dh $@
+
+binary-arch: install
+	dh $@
+
+binary: binary-arch
+
+clean:
+	dh $@
+	rm -f Makefile.in aclocal.m4 config.h.in configure
+	rm -f depcomp install-sh missing
+	rm -rf $(BUILDDIR)
+	rm -f *-stamp
--- xcompmgr-1.1.4.orig/debian/watch
+++ xcompmgr-1.1.4/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/app/ xcompmgr-(.*)\.tar\.gz
--- xcompmgr-1.1.4.orig/debian/xcompmgr.install
+++ xcompmgr-1.1.4/debian/xcompmgr.install
@@ -0,0 +1,2 @@
+usr/bin/xcompmgr
+usr/share/man/man1/xcompmgr.1