libxcomposite: Changes to 'debian-unstable'
debian/changelog | 17 ++++
debian/compat | 2
debian/control | 12 +--
debian/rules | 6 -
debian/xsfbs/xsfbs-autoreconf.mk | 150 ---------------------------------------
debian/xsfbs/xsfbs.mk | 57 --------------
6 files changed, 28 insertions(+), 216 deletions(-)
New commits:
commit fc68855e45bd1bac04f548f9ac8719e75d921207
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 18 23:47:54 2008 +0200
debian/control updates
* Drop the -1 debian revision from the libx11-dev build-dep.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
* libxcomposite1{,-dbg} don't need to depend on x11-common.
diff --git a/debian/changelog b/debian/changelog
index 14d14a1..ac63ee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,12 @@ libxcomposite (1:0.4.0-2) UNRELEASED; urgency=low
* Bump debhelper compat to 5.
* Fix dh_strip call to skip the -dbg package.
+ [ Julien Cristau ]
+ * Drop the -1 debian revision from the libx11-dev build-dep.
+ * Bump Standards-Version to 3.7.3.
+ * Drop the XS- prefix from Vcs-* control fields.
+ * libxcomposite1{,-dbg} don't need to depend on x11-common.
+
-- Julien Cristau <jcristau@debian.org> Sun, 18 May 2008 23:36:44 +0200
libxcomposite (1:0.4.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2e7471e..d47fc7d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Jamey Sharp <sharpone@debian.org>, Josh Triplett <josh@freedesktop.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxfixes-dev (>= 1:3.0.0-4), x11proto-composite-dev (>= 1:0.4), libxext-dev, x11proto-fixes-dev, pkg-config, quilt, xmlto
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxcomposite
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxcomposite.git
+Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2), libxfixes-dev (>= 1:3.0.0-4), x11proto-composite-dev (>= 1:0.4), libxext-dev, x11proto-fixes-dev, pkg-config, quilt, xmlto
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxcomposite
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxcomposite.git
Package: libxcomposite1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X11 Composite extension library
libXcomposite provides an X Window System client interface to the Composite
extension to the X protocol.
@@ -30,7 +30,7 @@ Package: libxcomposite1-dbg
Architecture: any
Section: libdevel
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxcomposite1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxcomposite1 (= ${binary:Version})
Description: X11 Composite extension library (debug package)
libXcomposite provides an X Window System client interface to the Composite
extension to the X protocol.
commit c87ea43906787791a87a659c0a9d6312945ffb32
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 13 03:12:18 2008 +0200
Remove xsfbs-autoreconf.mk
It has never been used, and that doesn't look likely to change.
diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
deleted file mode 100644
index dce8fc8..0000000
--- a/debian/xsfbs/xsfbs-autoreconf.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/make -f
-# $Id$
-
-# Automagical conversion of autoreconf results into quilt patches.
-
-# Copyright 2006 Eugene Konev
-#
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-# The idea behind this is storing changes produced by autoreconf as a
-# separate patch on quilt stack (on top of stack actually).
-# The only usable target here is 'autoreconf`. Other targets are not
-# supposed to be called directly. DO NOT invoke them, unless you know what
-# you are doing.
-# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
-# were changed during patching (from upstream version or from previously
-# autoreconfed version) and call actual autoreconfing if they were.
-# The actual autoreconfing target (doautoreconf) WILL FAIL after
-# calling autoreconf and pushing changes into quilt stack by design. It
-# should never be invoked by automatic build process.
-# The proposed use is adding autoreconf into clean's prerequisites before
-# xsfclean like:
-# - clean: xsfclean
-# + clean: autoreconf xsfclean
-# This will ensure it is called when you build package with dpkg-buildpackage.
-
-# This dir will be used for producing diff of autoreconfed tree
-RECONF_DIR := xsfautoreconf
-
-# This files will be checked for changes
-RECONF_CHECKFILES += configure.ac Makefile.am
-
-# This files will not be hardlinked but copied
-RECONF_NOLINKFILES += aclocal.m4
-
-# This files/dirs will be pruned after autoreconf run
-RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
-
-# Internal target. Never invoke directly.
-stampdir_target+=check.md5sum
-$(STAMP_DIR)/check.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules prepare
- for F in $(RECONF_CHECKFILES); do \
- find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \
- LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \
- done
-
-# Internal target. Never invoke directly.
-$(STAMP_DIR)/clean.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules unpatch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- mv $(STAMP_DIR)/check.md5sum $@
-
-# Internal target. Never invoke directly.
-debian/patches/patched.md5sum:
- dh_testdir
- [ -f $(STAMP_DIR)/clean.md5sum ] || \
- $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum
-
- $(MAKE) -f debian/rules patch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/clean.md5sum \
- $(STAMP_DIR)/check.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- else \
- mv $(STAMP_DIR)/check.md5sum $@; \
- fi
-
-# Internal target. Never invoke directly.
-,PHONY: doautoreconf
-doautoreconf: patch
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true
- if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \
- quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt rename -p autoreconf.diff autoreconf-old.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- fi
-
- if [ -e $(RECONF_DIR) ]; then \
- echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \
- exit 1; \
- fi
-
- mkdir -p $(RECONF_DIR)/before
- find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \
- -a ! -wholename ./debian -a ! -wholename ./patches \
- -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \
- xargs -i{} cp -al {} $(RECONF_DIR)/before/
-
- for F in $(RECONF_PRUNEFILES); do \
- find $(RECONF_DIR)/before -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after
-
- for F in $(RECONF_NOLINKFILES); do \
- find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \
- -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \
- -print | \
- xargs --no-run-if-empty -i{} cp --remove-destination {} \
- $(RECONF_DIR)/after/{}; \
- done
-
- cd $(RECONF_DIR)/after && autoreconf -v --install && \
- for F in $(RECONF_PRUNEFILES); do \
- find . -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true
-
- quilt import $(RECONF_DIR)/autoreconf.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1
-
- mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum
-
- rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff
-
- @echo
- @echo "****************************************************************"
- @echo " This target is made to fail INTENTIONALLY. It should NEVER "
- @echo " be invoked during automatic builds. "
- @echo
- @echo " This target was invoked because you added/removed/changed "
- @echo " patches which modify either configure.ac or Makefile.am and, "
- @echo " thus, require autoreconf run. And all autoreconfing should "
- @echo " happen before uploading. "
- @echo
- @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) "
- @echo
- @echo " If you see this message, autoreconfing actually SUCCEEDED, "
- @echo " and your build should finish successfully, when rerun. "
- @echo "****************************************************************"
- @echo
- exit 1;
-
-.PHONY: autoreconf
-autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/check.md5sum \
- debian/patches/patched.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- fi
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 51fa145..6582a42 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -307,6 +307,4 @@ else
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
endif
-include debian/xsfbs/xsfbs-autoreconf.mk
-
# vim:set noet ai sts=8 sw=8 tw=0:
commit bef8b301bf7649b4156bef2dc26ebf9f7f9244ad
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 11:53:16 2008 +0100
xsfbs.mk: make 'serverabi' depend on 'install'
See bug#471193, thanks to Bernhard R. Link <brlink@debian.org>
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 4822173..51fa145 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -297,7 +297,7 @@ PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
.PHONY: serverabi
-serverabi:
+serverabi: install
ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
commit 844199da71f29556be3436fa0fead2f0cc0bfc1b
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Jan 8 20:18:49 2008 -0500
Kill the manifest code.
It served its purpose for the monolith and is now dead.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b8f7afd..4822173 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -196,7 +196,6 @@ xsfclean: cleanscripts unpatch
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
- debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \
debian/po/pothead
# Generate the debconf templates POT file header.
@@ -209,58 +208,6 @@ debian/po/pothead: debian/po/pothead.in
updatepo: debian/po/pothead
debian/scripts/debconf-updatepo --pot-header=pothead --verbose
-# Use the MANIFEST files to determine whether we're shipping everything we
-# expect to ship, and not shipping anything we don't expect to ship.
-.PHONY: check-manifest
-stampdir_targets+=check-manifest
-check-manifest: $(STAMP_DIR)/check-manifest
-$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install
- # Compare manifests.
- (cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) \
- >debian/MANIFEST.$(ARCH).new
- # Construct MANIFEST files from MANIFEST.$(ARCH).in and
- # MANIFEST.$(ARCH).all or MANIFEST.all.
- if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" \
- : "-DBuildFonts=NO" >/dev/null 2>&1; then \
- LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); \
- else \
- if [ -e debian/MANIFEST.$(ARCH).all ]; then \
- LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
- else \
- LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all >debian/MANIFEST.$(ARCH); \
- fi; \
- fi
- # Confirm that the installed file list has not changed.
- if [ -e debian/MANIFEST.$(ARCH) ]; then \
- if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then \
- diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new || DIFFSTATUS=$$?; \
- case $${DIFFSTATUS:-0} in \
- 0) ;; \
- 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
- echo 'MANIFEST check failed; ignoring problem because \$$IGNORE_MANIFEST_CHANGES set' >&2; \
- echo 'Please ensure that the package maintainer has an up-to-date version of the' >&2; \
- echo 'MANIFEST.$(ARCH).in file.' >&2; \
- else \
- echo 'MANIFEST check failed; please see debian/README' >&2; \
- exit 1; \
- fi; \
- ;; \
- *) echo "diff reported unexpected exit status $$DIFFSTATUS when performing MANIFEST check" >&2; \
- exit 1; \
- ;; \
- esac; \
- fi; \
- fi
- >$@
-
-# Because we build (and install) different files depending on whether or not
-# any architecture-independent packages are being created, the list of files we
-# expect to see will differ; see the discussion of the "build" target above.
-.PHONY: check-manifest-arch check-manifest-indep
-check-manifest-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO -DInstallHardcopyDocs=NO
-check-manifest-arch: check-manifest
-check-manifest-indep: check-manifest
-
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
#
commit fd297b12b8570426032ab8e999ad272091316e98
Author: Drew Parsons <dparsons@debian.org>
Date: Sat Aug 19 12:29:06 2006 +0000
All dbg packages in lib should have priority extra,
see http://lists.debian.org/debian-devel/2006/08/msg00737.html
diff --git a/debian/changelog b/debian/changelog
index d64c494..58913a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
libxcomposite (1:0.2.2.2-4) UNRELEASED; urgency=low
+ [ Andres Salomon ]
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
idempotency fix.
* Run dh_install w/ --list-missing.
@@ -10,7 +11,10 @@ libxcomposite (1:0.2.2.2-4) UNRELEASED; urgency=low
* Bump debhelper compat to 5.
* Fix dh_strip call to skip the -dbg package.
- -- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 01:20:45 -0400
+ [ Drew Parsons ]
+ * dbg package has priority extra.
+
+ -- Drew Parsons <dparsons@debian.org> Sat, 19 Aug 2006 22:15:57 +1000
libxcomposite (1:0.2.2.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index edf2f4e..6bd6538 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Description: X11 Composite extension library
Package: libxcomposite1-dbg
Architecture: any
+Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxcomposite1 (= ${Source-Version})
Description: X11 Composite extension library (debug package)
libXcomposite provides an X Window System client interface to the Composite
commit 5a7dbeebb0f78904e0b59c090c2e0aeb6f144307
Author: Branden Robinson <branden@debian.org>
Date: Tue Aug 1 15:29:08 2006 +0000
Use only the major version, minor version, and major patch number
components of the Policy Manual revision in Standards-Version, because "the
minor patch level will be changed when only cosmetic, typographical or
other edits are made which neither change the meaning of the document nor
affect the contents of packages". See Policy Manual §5.6.11.
(The real reason for this commit, as with r2615, is to test tweaks to the
repository's commit-email.pl script.)
diff --git a/debian/control b/debian/control
index 5e0d0ff..edf2f4e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxfixes-dev (>= 1:3.0.0-4), x11proto-composite-dev, libxdamage-dev (>= 1:1.0.1-4), pkg-config
-Standards-Version: 3.7.2.0
+Standards-Version: 3.7.2
Package: libxcomposite1
Architecture: any
commit add92163d1ea782db6d6c9a9fef09e46fb247da3
Author: Branden Robinson <branden@debian.org>
Date: Tue Aug 1 14:10:51 2006 +0000
Whitespace police.
(The real reason for this commit is to test tweaks to the repository's
commit-email.pl script.)
diff --git a/debian/changelog b/debian/changelog
index 7552eb4..d64c494 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ libxcomposite (1:0.2.2.2-4) UNRELEASED; urgency=low
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
idempotency fix.
- * Run dh_install w/ --list-missing.
+ * Run dh_install w/ --list-missing.
* Drop duplicate x11-common dep in -dev package.
* Bump standards version to 3.7.2.0.
* Version x11-common pre-dep in -dev package to 1:7.0.0 to match
commit b4523c55d2f8f14915aecf5d6722ce269912226f
Author: Andres Salomon <dilinger@debian.org>
Date: Sat Jul 29 06:22:53 2006 +0000
* Drop duplicate x11-common dep in -dev package.
* Bump standards version to 3.7.2.0.
* Version x11-common pre-dep in -dev package to 1:7.0.0 to match
the rest of Debian.
* Bump debhelper compat to 5.
* Fix dh_strip call to skip the -dbg package.
diff --git a/debian/changelog b/debian/changelog
index 1810be5..7552eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ libxcomposite (1:0.2.2.2-4) UNRELEASED; urgency=low
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
idempotency fix.
* Run dh_install w/ --list-missing.
+ * Drop duplicate x11-common dep in -dev package.
+ * Bump standards version to 3.7.2.0.
+ * Version x11-common pre-dep in -dev package to 1:7.0.0 to match
+ the rest of Debian.
+ * Bump debhelper compat to 5.
+ * Fix dh_strip call to skip the -dbg package.
-- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 01:20:45 -0400
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..5e0d0ff
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,65 @@
+Source: libxcomposite
+Section: x11
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxfixes-dev (>= 1:3.0.0-4), x11proto-composite-dev, libxdamage-dev (>= 1:1.0.1-4), pkg-config
+Standards-Version: 3.7.2.0
+
+Package: libxcomposite1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Description: X11 Composite extension library
+ libXcomposite provides an X Window System client interface to the Composite
+ extension to the X protocol.
+ .
+ The Composite extension allows clients called compositing managers to control
+ the final drawing of the screen. Rendering is done into an off-screen buffer.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'lib/Xcomposite' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: libxcomposite1-dbg
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxcomposite1 (= ${Source-Version})
+Description: X11 Composite extension library (debug package)
+ libXcomposite provides an X Window System client interface to the Composite
+ extension to the X protocol.
+ .
+ The Composite extension allows clients called compositing managers to control
+ the final drawing of the screen. Rendering is done into an off-screen buffer.
+ .
+ This package contains the debug versions of the library found in libxcomposite1.
+ Non-developers likely have little use for this package.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'lib/Xcomposite' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: libxcomposite-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxcomposite1 (= ${Source-Version}), libx11-dev, libxfixes-dev, x11proto-composite-dev
+Pre-Depends: x11-common (>= 1:7.0.0)
+Description: X11 Composite extension library (development headers)
+ libXcomposite provides an X Window System client interface to the Composite
+ extension to the X protocol.
+ .
+ The Composite extension allows clients called compositing managers to control
+ the final drawing of the screen. Rendering is done into an off-screen buffer.
+ .
+ This package contains the development headers for the library found in
+ libxcomposite1. Non-developers likely have little use for this package.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'lib/Xcomposite' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
diff --git a/debian/rules b/debian/rules
index 0571ad9..670cbf9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ binary-arch: build install
dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
- dh_strip --dbg-package=$(PACKAGE)
+ dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
dh_makeshlibs
commit 834dbd2a5bd91f4b9ea536b253cbb2c6a0f9cb3e
Author: Andres Salomon <dilinger@debian.org>
Date: Mon Jul 17 05:29:25 2006 +0000
When building arch-dependent stuff, run dh_install w/ --list-missing.
diff --git a/debian/changelog b/debian/changelog
index b6fa7a6..1810be5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
libxcomposite (1:0.2.2.2-4) UNRELEASED; urgency=low
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
- idempotency fix.
+ idempotency fix.
+ * Run dh_install w/ --list-missing.
- -- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:18:27 -0400
+ -- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 01:20:45 -0400
libxcomposite (1:0.2.2.2-3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 327f0a9..0571ad9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp
+ dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
dh_strip --dbg-package=$(PACKAGE)
commit ac5f43cc02b85ded4a9a2b3f58740369f267313a
Author: Andres Salomon <dilinger@debian.org>
Date: Mon Jul 17 04:44:49 2006 +0000
Idempotency fixes; everywhere where we're using a separate build directory,
we tend to create it via "mkdir obj-$(foo)". This doesn't work if rebuilding,
because the directory already exists. Instead, only create it if there's
no directory there already.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..b6fa7a6
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,46 @@
+libxcomposite (1:0.2.2.2-4) UNRELEASED; urgency=low
+
+ * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+ idempotency fix.
+
+ -- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:18:27 -0400
+
+libxcomposite (1:0.2.2.2-3) unstable; urgency=low
+
+ * Reorder makeshlib command in rules file so that ldconfig is run
+ properly. Thanks Drew Parsons and Steve Langasek.
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 18 Apr 2006 21:49:57 -0400
+
+libxcomposite (1:0.2.2.2-2) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 23 Mar 2006 22:44:30 -0500
+
+libxcomposite (1:0.2.2.2-1) experimental; urgency=low
+
+ * First upload to Debian
+ * Fix copyright file to use COPYING file shipped in RC1. For some reason it
+ was listed as GPL.
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 29 Dec 2005 20:51:30 -0500
+
+libxcomposite (1:0.2.0-3) breezy; urgency=low
+
+ * Bump Build-Depends on libxfixes-dev, libxdamage-dev and libx11-dev high
+ enough that we route around the wonderful _XOPEN_SOURCE incident.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Fri, 22 Jul 2005 23:46:03 +1000
+
+libxcomposite (1:0.2.0-2) breezy; urgency=low
+
+ * Add B-D on libxdamage-dev.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Tue, 12 Jul 2005 13:27:37 +1000
+
+libxcomposite (1:0.2.0-1) breezy; urgency=low
+
+ * First libxcomposite release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 16 May 2005 22:10:17 +1000
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..327f0a9
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,93 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian libxcomposite package.
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
+# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
+# Copyright © 2005 David Nusinow <dnusinow@debian.org>
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# set this to the name of the main shlib's binary package
+PACKAGE = libxcomposite1
+
+include debian/xsfbs/xsfbs.mk
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+
+ test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ CFLAGS="$(CFLAGS)"
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ rm -f config.cache config.log config.status
+ rm -f */config.cache */config.log */config.status
+ rm -f conftest* */conftest*
+ rm -rf autom4te.cache */autom4te.cache
+ rm -rf obj-*
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+
+ dh_installdocs
+ dh_install --sourcedir=debian/tmp
+ dh_installchangelogs
+ dh_link
+ dh_strip --dbg-package=$(PACKAGE)
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_shlibdeps
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture-independent files here.
+binary-indep: build install
+# Nothing to do
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Reply to: