x11proto-composite: Changes to 'debian-unstable'
debian/changelog |7 +++ debian/control |5 ++--- debian/watch |2 +- 3 files changed, 10 insertions(+), 4 deletions(-) New commits: commit 82e4784669fe683fd46c0ebbf0c49100299c7ad7 Author: Julien Cristau Date: Sat Sep 24 13:43:46 2016 +0200 Remove David Nusinow, Brice Goglin and Cyril Brulebois from Uploaders diff --git a/debian/changelog b/debian/changelog index 645a001..3fae454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x11proto-composite (1:0.4.2-3) UNRELEASED; urgency=medium * Use https URLs in debian/watch and Vcs-* control fields. + * Remove David Nusinow, Brice Goglin and Cyril Brulebois from Uploaders. -- Julien Cristau Sat, 24 Sep 2016 13:42:55 +0200 diff --git a/debian/control b/debian/control index 22e11b7..c72300d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,6 @@ Source: x11proto-composite Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow , Brice Goglin , Cyril Brulebois Build-Depends: debhelper (>= 5.0.0), automake, commit 51c7d712af7fd2f03a3b1b4865aa8565870c10ae Author: Julien Cristau Date: Sat Sep 24 13:43:07 2016 +0200 Use https URLs in debian/watch and Vcs-* control fields. diff --git a/debian/changelog b/debian/changelog index e7c5d3f..645a001 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-composite (1:0.4.2-3) UNRELEASED; urgency=medium + + * Use https URLs in debian/watch and Vcs-* control fields. + + -- Julien Cristau Sat, 24 Sep 2016 13:42:55 +0200 + x11proto-composite (1:0.4.2-2) unstable; urgency=low * Mark x11proto-xinerama-dev Multi-Arch: foreign. diff --git a/debian/control b/debian/control index b9bc2d7..22e11b7 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Build-Depends: pkg-config, xutils-dev (>= 1:7.5~1) Standards-Version: 3.8.3 -Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-composite -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-composite.git +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/proto/x11proto-composite.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/proto/x11proto-composite.git Package: x11proto-composite-dev Architecture: all diff --git a/debian/watch b/debian/watch index 19e6f9f..9de32ad 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/proto/compositeproto version=3 -http://xorg.freedesktop.org/releases/individual/proto/ compositeproto-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/proto/ compositeproto-(.*)\.tar\.gz
x11proto-composite: Changes to 'debian-unstable'
debian/changelog |8
debian/control|1 +
debian/x11proto-composite-dev.install |2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 80bb666d05a36c8a24634e081408e91778733652
Author: Steve Langasek
Date: Sat Jul 2 01:42:18 2011 +0100
releasing version 1:0.4.2-2
diff --git a/debian/changelog b/debian/changelog
index 6a5ee97..e7c5d3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-x11proto-composite (1:0.4.2-2) UNRELEASED; urgency=low
+x11proto-composite (1:0.4.2-2) unstable; urgency=low
* Mark x11proto-xinerama-dev Multi-Arch: foreign.
* Install .pc file to /usr/share/pkgconfig instead of
/usr/lib/pkgconfig
- -- Steve Langasek Sat, 02 Jul 2011 01:39:59 +0100
+ -- Steve Langasek Sat, 02 Jul 2011 01:42:05 +0100
x11proto-composite (1:0.4.2-1) unstable; urgency=low
commit 4fa258503c0bcee7519dd46986bf485c4fd21913
Author: Steve Langasek
Date: Sat Jul 2 01:40:30 2011 +0100
Install .pc file to /usr/share/pkgconfig instead of /usr/lib/pkgconfig
diff --git a/debian/changelog b/debian/changelog
index d6b0a7a..6a5ee97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
x11proto-composite (1:0.4.2-2) UNRELEASED; urgency=low
* Mark x11proto-xinerama-dev Multi-Arch: foreign.
+ * Install .pc file to /usr/share/pkgconfig instead of
+/usr/lib/pkgconfig
-- Steve Langasek Sat, 02 Jul 2011 01:39:59 +0100
diff --git a/debian/x11proto-composite-dev.install
b/debian/x11proto-composite-dev.install
index 74a65bd..8fff1fa 100644
--- a/debian/x11proto-composite-dev.install
+++ b/debian/x11proto-composite-dev.install
@@ -1,3 +1,3 @@
usr/include/X11/extensions/*
-usr/lib/pkgconfig/compositeproto.pc
+usr/lib/pkgconfig/compositeproto.pc usr/share/pkgconfig
usr/share/doc/compositeproto/compositeproto.txt
usr/share/doc/x11proto-composite-dev
commit 27b8c7a89e7bcc090b3dbd511e8cde1c7044f2e9
Author: Steve Langasek
Date: Sat Jul 2 01:40:08 2011 +0100
Mark x11proto-xinerama-dev Multi-Arch: foreign.
diff --git a/debian/changelog b/debian/changelog
index 6f3af2d..d6b0a7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-composite (1:0.4.2-2) UNRELEASED; urgency=low
+
+ * Mark x11proto-xinerama-dev Multi-Arch: foreign.
+
+ -- Steve Langasek Sat, 02 Jul 2011 01:39:59 +0100
+
x11proto-composite (1:0.4.2-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index fe2ebab..b9bc2d7 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/proto/x11proto-composite.git
Package: x11proto-composite-dev
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-core-dev,
x11proto-fixes-dev
+Multi-Arch: foreign
Description: X11 Composite extension wire protocol
This package provides development headers describing the wire protocol
for the Composite extension, used to let arbitrary client programs control
--
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/e1qcoj9-0001w2...@vasks.debian.org
x11proto-composite: Changes to 'debian-unstable'
debian/changelog | 10 ++-- debian/control|2 - debian/copyright | 41 +- debian/rules |4 +-- debian/x11proto-composite-dev.install |1 5 files changed, 33 insertions(+), 25 deletions(-) New commits: commit f30a108d225c05ab6312071d34bd9ca7adea7e2c Author: Cyril Brulebois Date: Wed Nov 3 01:04:37 2010 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index fbd12cb..6f3af2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low +x11proto-composite (1:0.4.2-1) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -14,7 +14,7 @@ x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low * Use .install rather than dh_installdocs for the txt documentation. * Switch from --list-missing to --fail-missing for additional safety. - -- Robert Hooker Tue, 02 Nov 2010 19:02:03 -0400 + -- Cyril Brulebois Wed, 03 Nov 2010 01:04:22 +0100 x11proto-composite (1:0.4.1-1) unstable; urgency=low commit dfbf3482cbb0cca077b9320e8acb5718f2161aba Author: Cyril Brulebois Date: Wed Nov 3 01:03:01 2010 +0100 Switch from --list-missing to --fail-missing for additional safety. diff --git a/debian/changelog b/debian/changelog index 4230b0a..fbd12cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low * Update debian/copyright from upstream COPYING. * Add myself to Uploaders. * Use .install rather than dh_installdocs for the txt documentation. + * Switch from --list-missing to --fail-missing for additional safety. -- Robert Hooker Tue, 02 Nov 2010 19:02:03 -0400 diff --git a/debian/rules b/debian/rules index 581f390..2fab9d9 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,7 @@ binary-indep: build install dh_installdocs dh_installman - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp --fail-missing dh_installchangelogs ChangeLog dh_link dh_strip commit 749fac54f74c70fd575cb880ac201866cf66fd67 Author: Cyril Brulebois Date: Wed Nov 3 01:02:28 2010 +0100 Use .install rather than dh_installdocs for the txt documentation. diff --git a/debian/changelog b/debian/changelog index 60a8404..4230b0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * Update debian/copyright from upstream COPYING. * Add myself to Uploaders. + * Use .install rather than dh_installdocs for the txt documentation. -- Robert Hooker Tue, 02 Nov 2010 19:02:03 -0400 diff --git a/debian/rules b/debian/rules index 76cb6f1..581f390 100755 --- a/debian/rules +++ b/debian/rules @@ -74,7 +74,7 @@ binary-indep: build install dh_testdir dh_testroot - dh_installdocs compositeproto.txt + dh_installdocs dh_installman dh_install --sourcedir=debian/tmp --list-missing dh_installchangelogs ChangeLog diff --git a/debian/x11proto-composite-dev.install b/debian/x11proto-composite-dev.install index 8bf21f5..74a65bd 100644 --- a/debian/x11proto-composite-dev.install +++ b/debian/x11proto-composite-dev.install @@ -1,2 +1,3 @@ usr/include/X11/extensions/* usr/lib/pkgconfig/compositeproto.pc +usr/share/doc/compositeproto/compositeproto.txt usr/share/doc/x11proto-composite-dev commit a2df244b7f334075dd3291a9f399486dba33b175 Author: Cyril Brulebois Date: Wed Nov 3 00:58:17 2010 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 90546a3..60a8404 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * Update debian/copyright from upstream COPYING. + * Add myself to Uploaders. -- Robert Hooker Tue, 02 Nov 2010 19:02:03 -0400 diff --git a/debian/control b/debian/control index cf9ad61..fe2ebab 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: x11proto-composite Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow , Brice Goglin +Uploaders: David Nusinow , Brice Goglin , Cyril Brulebois Build-Depends: debhelper (>= 5.0.0), automake, commit 2e5f1d4c6e4a6732ce2124bcf3cbca6610794e4c Author: Cyril Brulebois Date: Wed Nov 3 00:55:20 2010 +0100 Update debian/copyright from upstream COPYING. diff --git a/debian/changelog b/debian/changelog index f15a82a..90546a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low * New upstream release. * Add pkg-config to the build deps. + [ Cyril Brulebois ] + * U
x11proto-composite: Changes to 'debian-unstable'
ChangeLog | 128 ++ 1 file changed, 128 insertions(+) New commits: commit c08f3ba215ab1c2a6054babee50215417c48dcec Author: Cyril Brulebois Date: Wed Nov 3 00:47:08 2010 +0100 Update upstream changelog as well. diff --git a/ChangeLog b/ChangeLog index 79babec..afb677d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,131 @@ +commit d358d6290af3d9cedb7b6d7e16058370e4779508 +Author: Alan Coopersmith +Date: Fri Oct 29 20:27:55 2010 -0700 + +compositeproto 0.4.2 + +Signed-off-by: Alan Coopersmith + +commit 6eece824c1cb40bdfc1007b26ce765803d110712 +Author: Alan Coopersmith +Date: Fri Oct 29 20:26:29 2010 -0700 + +Sun's copyrights now belong to Oracle + +Signed-off-by: Alan Coopersmith + +commit 68ff97cd30c709439c088bfea2c33a4f9632ed38 +Author: Gaetan Nadon +Date: Sun Mar 28 19:00:30 2010 -0400 + +config: remove the pkgconfig pc.in file from EXTRA_DIST + +Automake always includes it in the tarball. +autogen.sh is also not required in any GNU package. + +Signed-off-by: Gaetan Nadon + +commit 1a48a0d70e00fd11521e436864a8ec0705e58285 +Author: Alan Coopersmith +Date: Fri Jan 15 13:34:49 2010 -0800 + +Update Sun license notices to current X.Org standard form + +Signed-off-by: Alan Coopersmith + +commit e827d7b875a6b16e9e7208af3407cb96cd1e91ed +Author: Alan Coopersmith +Date: Fri Jan 15 13:36:08 2010 -0800 + +Purge CVS/RCS $Id$ tags + +Signed-off-by: Alan Coopersmith + +commit 843e916e15b117c1142ab78d35b9ea722bdc7a0b +Author: Gaetan Nadon +Date: Mon Nov 16 11:47:44 2009 -0500 + +COPYING: add Copyright from SUN Microsystems + +The COPYING file contains all Copyright notices from source code. +Refer to composite.h. + +Signed-off-by: Gaetan Nadon + +commit fdf8d73a27cd0cadae5a14e7a88870121ae113aa +Author: Rémi Cardona +Date: Thu Dec 17 08:32:20 2009 +0100 + +Use $(docdir) for compositeproto.txt install path + +Signed-off-by: Rémi Cardona +Reviewed-by: Gaetan Nadon +Reviewed-by: Alan Coopersmith +Reviewed-by: Dan Nicholson + +commit 5ecb066e04595d300a0faad0f95c859a709ff857 +Author: Gaetan Nadon +Date: Sun Nov 22 19:24:47 2009 -0500 + +Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + +Now that the INSTALL file is generated. +Allows running make maintainer-clean. + +commit 330cbabbbf73b310b237e6745185f338d7d33998 +Author: Gaetan Nadon +Date: Wed Nov 18 19:00:34 2009 -0500 + +INSTALL: file is missing or incorrect #24206 + +The standard GNU file on building/installing tarball is copied +using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS + +commit 260cc8eadd89b3fc9f59e505e34dcb5bc09018bd +Author: Gaetan Nadon +Date: Sun Nov 15 20:25:50 2009 -0500 + +NEWS: remove empty file #24206 + +commit 55f6f1eec2a0baca0f6c7738cc2e54e7098b3652 +Author: Gaetan Nadon +Date: Sun Nov 15 19:45:26 2009 -0500 + +Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + +ChangeLog filename is known to Automake and requires no further +coding in the makefile. + +commit ad60112eb2eacb50954bf9cd461b9e90d6f64a63 +Author: Gaetan Nadon +Date: Sun Nov 15 18:31:28 2009 -0500 + +Makefile.am: INSTALL file is missing or incorrect #24206 + +The standard GNU file on building/installing tarball is copied +using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS +Add INSTALL target + +commit 8a7c2c629635510a0728d5ab086b0f4b600b0e49 +Author: Gaetan Nadon +Date: Sun Nov 15 18:11:36 2009 -0500 + +configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242 + +This macro aggregate a number of existing macros that sets commmon +X.Org components configuration options. It shields the configuration file from +future changes. + +commit 00dc749894784dc6f1b749903ef872572f678c3c +Author: Gaetan Nadon +Date: Sat Nov 14 18:26:46 2009 -0500 + +.gitignore: use common defaults with custom section # 24239 + +Using common defaults will reduce errors and maintenance. +Only the very small or inexistent custom section need periodic maintenance +when the structure of the component changes. Do not edit defaults. + commit 39612a7153ac3e800c5dbb11a7f760c53797bf73 Author: Alan Coopersmith Date: Fri Oct 2 18:59:54 2009 -0700 -- 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/e1pdqzk-0005t0...@alioth.debian.org
x11proto-composite: Changes to 'debian-unstable'
.gitignore | 75 --- COPYING | 21 ++- INSTALL |8 - Makefile.am | 16 +-- composite.h | 38 +-- compositeproto.h | 39 +--- configure.ac | 11 +++- debian/changelog |9 +- debian/control |1 9 files changed, 149 insertions(+), 69 deletions(-) New commits: commit c2fc83596563ede0bf35643dd9973d0f948bfea2 Author: Robert Hooker Date: Tue Nov 2 19:02:31 2010 -0400 Add pkg-config to build deps. diff --git a/debian/changelog b/debian/changelog index d94b84f..f15a82a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -x11proto-composite (1:0.4.1-2) UNRELEASED; urgency=low +x11proto-composite (1:0.4.2-1) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! - -- Julien Cristau Sat, 16 Jan 2010 16:47:48 + + [ Robert Hooker ] + * New upstream release. + * Add pkg-config to the build deps. + + -- Robert Hooker Tue, 02 Nov 2010 19:02:03 -0400 x11proto-composite (1:0.4.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 5249ab3..cf9ad61 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: David Nusinow , Brice Goglin = 5.0.0), automake, + pkg-config, xutils-dev (>= 1:7.5~1) Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-composite commit d358d6290af3d9cedb7b6d7e16058370e4779508 Author: Alan Coopersmith Date: Fri Oct 29 20:27:55 2010 -0700 compositeproto 0.4.2 Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index 45969f7..d83be2f 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT([CompositeProto], [0.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([CompositeProto], [0.4.2], +[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 6eece824c1cb40bdfc1007b26ce765803d110712 Author: Alan Coopersmith Date: Fri Oct 29 20:26:29 2010 -0700 Sun's copyrights now belong to Oracle Signed-off-by: Alan Coopersmith diff --git a/COPYING b/COPYING index 23c1a6c..b541db8 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright © 2006 Sun Microsystems, Inc. All rights reserved. +Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/composite.h b/composite.h index 7725321..e460118 100644 --- a/composite.h +++ b/composite.h @@ -1,5 +1,5 @@ /* - * Copyright © 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/compositeproto.h b/compositeproto.h index aa6cd8a..0417f2c 100644 --- a/compositeproto.h +++ b/compositeproto.h @@ -1,5 +1,5 @@ /* - * Copyright © 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), commit 68ff97cd30c709439c088bfea2c33a4f9632ed38 Author: Gaetan Nadon Date: Sun Mar 28 19:00:30 2010 -0400 config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. autogen.sh is also not required in any GNU package. Signed-off-by: Gaetan Nadon diff --git a/Makefile.am b/Makefile.am index e982323..5a14884 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,6 @@ pkgconfig_DATA = compositeproto.pc dist_doc_DATA = compositeproto.txt -EXTRA_DIST = autogen.sh compositeproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL commit 1a48a0d70e00fd11521e436864a8ec0705e58285 Author: Alan Coopersmith Date: Fri Jan 15 13:34:49 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith diff --git a/COPYING b/COPYING index 37038d2..23c1a6c 100644 --- a/COPYING +++ b/COPYING @@ -1,22 +1,23 @@ -Copyright © 2006 Sun Microsystems +Copyright © 2006 Sun Microsystems, Inc. All rights reserved. -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 a
x11proto-composite: Changes to 'debian-unstable'
debian/control |2 -- 1 file changed, 2 deletions(-) New commits: commit 2f67049ea61e9c8c1992c172cd6e268880252893 Author: Mikhail Gusarov Date: Fri May 7 18:58:51 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index 6c56a57..5249ab3 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,5 @@ Description: X11 Composite extension wire protocol . More information about X.Org can be found at: http://www.X.org> - http://xorg.freedesktop.org> - http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org compositeproto proto module. -- 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/e1oamho-0001af...@alioth.debian.org
x11proto-composite: Changes to 'debian-unstable'
debian/changelog |7 +++
debian/rules | 10 +-
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 3ba1a57d5392797153be214d252e8b614ea02c24
Author: Julien Cristau
Date: Sat Jan 16 16:49:00 2010 +
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good
reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index a4679ca..d94b84f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-composite (1:0.4.1-2) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau Sat, 16 Jan 2010 16:47:48 +
+
x11proto-composite (1:0.4.1-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index e86994a..76cb6f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,12 +36,12 @@ build: build-stamp
build-stamp:
dh_testdir
autoreconf -vfi
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --disable-shared \
$(confflags) CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
touch build-stamp
@@ -54,7 +54,7 @@ clean:
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
+ rm -rf build
rm -f aclocal.m4 configure install-sh missing
rm -f config.guess config.sub
find -name Makefile.in -delete
@@ -67,7 +67,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-independent files here.
binary-indep: build install
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
x11proto-composite: Changes to 'debian-unstable'
debian/changelog |4 ++-- debian/rules |1 + 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 2330806c36751d7e9124e1a1e52b1746d172e342 Author: Julien Cristau Date: Sat Nov 21 12:07:56 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 637a203..a4679ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-composite (1:0.4.1-1) UNRELEASED; urgency=low +x11proto-composite (1:0.4.1-1) unstable; urgency=low [ Julien Cristau ] * Run autoreconf at build time. @@ -12,7 +12,7 @@ x11proto-composite (1:0.4.1-1) UNRELEASED; urgency=low * New upstream release 0.4.1. * Bump the build-dep on xutils-dev (>= 1:7.5~1). - -- Julien Cristau Sat, 05 Sep 2009 14:07:46 +0200 + -- Julien Cristau Sat, 21 Nov 2009 12:07:25 +0100 x11proto-composite (1:0.4-2) unstable; urgency=low commit c6bc1878447693193ff478dad10804a65e9238d4 Author: Julien Cristau Date: Sat Nov 21 12:03:59 2009 +0100 Remove config.* in debian/rules clean diff --git a/debian/rules b/debian/rules index 4471860..e86994a 100755 --- a/debian/rules +++ b/debian/rules @@ -56,6 +56,7 @@ clean: rm -rf autom4te.cache */autom4te.cache rm -rf obj-* rm -f aclocal.m4 configure install-sh missing + rm -f config.guess config.sub find -name Makefile.in -delete dh_clean -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
x11proto-composite: Changes to 'debian-unstable'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 079dee4d247b607e4b95fd7733d947374d272925 Author: Timo Aaltonen Date: Sat Nov 21 12:47:48 2009 +0200 Clarify the changelog entry about the xutils-dev bump. diff --git a/debian/changelog b/debian/changelog index 1a62a0d..637a203 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ x11proto-composite (1:0.4.1-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * New upstream release 0.4.1. - * Build-Depend on xutils-dev (>= 1:7.5~1) + * Bump the build-dep on xutils-dev (>= 1:7.5~1). -- Julien Cristau Sat, 05 Sep 2009 14:07:46 +0200 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
x11proto-composite: Changes to 'debian-unstable'
debian/changelog |1 + debian/control |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit e422198168355a80ea41c8073f557b704a15f761 Author: Timo Aaltonen Date: Sat Nov 21 12:43:54 2009 +0200 Build-Depend on xutils-dev (>= 1:7.5~1) diff --git a/debian/changelog b/debian/changelog index c41abd3..1a62a0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x11proto-composite (1:0.4.1-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * New upstream release 0.4.1. + * Build-Depend on xutils-dev (>= 1:7.5~1) -- Julien Cristau Sat, 05 Sep 2009 14:07:46 +0200 diff --git a/debian/control b/debian/control index 172c524..6c56a57 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow , Brice Goglin = 5.0.0), automake, - xutils-dev + xutils-dev (>= 1:7.5~1) Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-composite Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-composite.git -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
x11proto-composite: Changes to 'debian-unstable'
ChangeLog | 232 ++ 1 file changed, 232 insertions(+) New commits: commit 4e05bb3c8ed3d1a022b84e607e9e28795a45fd3f Author: Timo Aaltonen Date: Fri Nov 20 16:59:21 2009 +0200 Update the ChangeLog. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 000..79babec --- /dev/null +++ b/ChangeLog @@ -0,0 +1,232 @@ +commit 39612a7153ac3e800c5dbb11a7f760c53797bf73 +Author: Alan Coopersmith +Date: Fri Oct 2 18:59:54 2009 -0700 + +compositeproto 0.4.1 + +Signed-off-by: Alan Coopersmith + +commit ad173235db562b7f788ad82e5b4849c1519bd0b5 +Author: Alan Coopersmith +Date: Fri Oct 2 18:57:51 2009 -0700 + +Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS + +Signed-off-by: Alan Coopersmith + +commit bbdc2ae4f4115332337460631911857cbadaf603 +Author: Alan Coopersmith +Date: Fri Oct 2 18:52:44 2009 -0700 + +Add pointers to mailing list, git repo, and wiki to README + +Signed-off-by: Alan Coopersmith + +commit 961dbcda7fcfd15a3e60bfb905f05286ba33508f +Author: Gaetan Nadon +Date: Wed Jul 8 10:03:40 2009 -0400 + +compositeproto: use XORG_CHANGELOG macro to create ChangeLog. #22611 + +Build break: Makefile.am: command not found: git-log +Adding the macro in configure.ac and use it in Makefile.am +Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 +Tested: running autogen.sh, make and 'make dist' + +Signed-off-by: Gaetan Nadon +Signed-off-by: Peter Hutterer + +commit 2ffb32d61cbed1452d67abb2028ac13910550392 +Author: James Cloos +Date: Thu Dec 6 16:38:57 2007 -0500 + +Replace static ChangeLog with dist-hook to generate from git log + +commit 5ac473a9375fa43896e379da96d1955653960350 +Author: Jeremy C. Reed +Date: Thu Aug 16 11:28:30 2007 -0500 + +Temporarily define Pixmap (just like Window and Region). (From pkgsrc.) + +commit 25e8047e25652be388dc66d85c180dcc4ccea4f6 +Author: Keith Packard +Date: Tue Jul 3 14:11:10 2007 -0700 + +Bump version in configure.ac to 0.4 + +commit 1838412121d0bac8ce443d362e75439d58a93a4d +Author: Keith Packard +Date: Tue Jul 3 14:09:41 2007 -0700 + +Define new manual-redirect clipping semantics and bump version to 0.4. + +Manual-redirect windows no longer clip their parents, nor do they affect +expose event computation. This makes it possible to create application-level +composited windows which can be damaged by other window manipulations. + +This patch also removes the coordinate transformation stuff which was never +released. + +commit bca9592612d60142e3c624b90649475b561b8eda +Author: Alan Coopersmith +Date: Tue Apr 17 20:48:18 2007 -0700 + +Add *~ to .gitignore to skip emacs/patch droppings + +commit 6acacb52efd6f0927c9b82fe864f17623e7dc8c2 +Author: Alan Coopersmith +Date: Tue Apr 17 20:47:50 2007 -0700 + +Protocol spec nit cleanups + +Fix versioning from 0.3/0.4 merge +Update description of RedirectWindow to match names in protocol diagrams + +commit dd2133540f8dd0f0f66ecf24e01113184045af83 +Author: Eric Anholt +Date: Tue Jan 9 10:42:31 2007 -0800 + +Update protocol spec for 0.3 -> 0.4 rename and new 0.3 request. + +The original overlay window text was from Deron Johnson, but I moved it +around to be where I understand the pieces of the description were meant to go. + +commit ea2c1d120e58e3eb5f2d8eedb3c32b2cfa052366 +Author: Eric Anholt +Date: Tue Jan 9 09:46:31 2007 -0800 + +Move composite protocol description to the new canonical location/name. + +commit 34251361a60c9e0c0f3c51416985e067c2aa255a +Author: Aaron Plattner +Date: Tue Dec 5 12:39:15 2006 -0800 + +Have NameWindowPixmap return a Match error on unrealized windows. + +commit 5ecbf06cb7786009e8e1547f4bc2b0640599f655 +Author: root +Date: Tue Aug 15 14:30:32 2006 -0700 + +Correct the spelling of compositedocdir_DATA. Otherwise automake complains. + +commit ba9ca99638fac157b126a2d9a3e57385bad32998 +Author: Deron +Date: Fri Mar 31 03:29:42 2006 -0800 + +Sync'd with modular proto/Composite (Version 0.3 definitions). +Also changed CTR definitions to Version 0.4 and increased the +request numbers to be above those of Version 0.3. + +commit 565c0bcc569f5ab9114314185316fe2129aa5a3e +Author: Keith Packard +Date: Fri Feb 24 02:55:19 2006 +0100 + +Add coordinate transform redirect protocol bits + +commit 8e0790045d33525ec182afd3997014b46ef77b66 +Author: Keith Packard +Date: Fri Feb 24 02:06:13 2006 +0100 + +Clean up mistakes integrating xorg changes + +commit 1d43eaf21b32fef4aba8a58dee323344b7f48d16 +Author: Keith Packard +Date: Fri Feb 24 02:03:25 2006 +0100 + +Remove .cvsignore + +commit 694da3931be9bb03e23e4fbaf54d331c2202b2fc +Author: Keith Packard +Date: Fri Feb 24 02:01:54 2006 +0100 + +Add .gitignore + +commit 369d28141b1b296abeb4365b5c57846d72faeb82 +Author: Keith Packard +Date: Fri Feb 24 02:01:1
x11proto-composite: Changes to 'debian-unstable'
debian/xsfbs/xsfbs.mk | 17 ++---
debian/xsfbs/xsfbs.sh |4 +---
2 files changed, 3 insertions(+), 18 deletions(-)
New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# 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 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper
operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
x11proto-composite: Changes to 'debian-unstable'
ChangeLog| 182 --- Makefile.am | 10 +++ README | 24 +++ compositeproto.h |2 configure.ac |8 +- debian/changelog |6 + 6 files changed, 47 insertions(+), 185 deletions(-) New commits: commit 6858b639abfdf0c58a150e0e253be08a0f7fad6c Author: Timo Aaltonen Date: Fri Nov 20 14:50:25 2009 +0200 Update the changelog; new upstream release diff --git a/debian/changelog b/debian/changelog index acff063..c41abd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -x11proto-composite (1:0.4-3) UNRELEASED; urgency=low +x11proto-composite (1:0.4.1-1) UNRELEASED; urgency=low + [ Julien Cristau ] * Run autoreconf at build time. * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N. * Remove Conflicts/Replaces on old libxcomposite-dev, and Pre-Depends on @@ -7,6 +8,9 @@ x11proto-composite (1:0.4-3) UNRELEASED; urgency=low * Drop the XS- prefix from Vcs-* control fields. * Bump Standards-Version to 3.8.3. + [ Timo Aaltonen ] + * New upstream release 0.4.1. + -- Julien Cristau Sat, 05 Sep 2009 14:07:46 +0200 x11proto-composite (1:0.4-2) unstable; urgency=low commit 39612a7153ac3e800c5dbb11a7f760c53797bf73 Author: Alan Coopersmith Date: Fri Oct 2 18:59:54 2009 -0700 compositeproto 0.4.1 Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index fedf760..0fd3fb8 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT([CompositeProto], [0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([CompositeProto], [0.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit ad173235db562b7f788ad82e5b4849c1519bd0b5 Author: Alan Coopersmith Date: Fri Oct 2 18:57:51 2009 -0700 Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index 7fa9070..fedf760 100644 --- a/configure.ac +++ b/configure.ac @@ -28,12 +28,11 @@ AC_INIT([CompositeProto], [0.4], [https://bugs.freedesktop.org/enter_bug.cgi?pro AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) -XORG_RELEASE_VERSION -XORG_CHANGELOG +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile compositeproto.pc]) commit bbdc2ae4f4115332337460631911857cbadaf603 Author: Alan Coopersmith Date: Fri Oct 2 18:52:44 2009 -0700 Add pointers to mailing list, git repo, and wiki to README Signed-off-by: Alan Coopersmith diff --git a/README b/README index 9c03568..66b40a4 100644 --- a/README +++ b/README @@ -7,3 +7,27 @@ extension. Library and server implementations are separate. Keith Packard kei...@keithp.com + +All questions regarding this software should be directed at the +Xorg mailing list: + +http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + +https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + +git://anongit.freedesktop.org/git/xorg/proto/compositeproto + +http://cgit.freedesktop.org/xorg/proto/compositeproto + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + +http://wiki.x.org/wiki/GitPage + commit 961dbcda7fcfd15a3e60bfb905f05286ba33508f Author: Gaetan Nadon Date: Wed Jul 8 10:03:40 2009 -0400 compositeproto: use XORG_CHANGELOG macro to create ChangeLog. #22611 Build break: Makefile.am: command not found: git-log Adding the macro in configure.ac and use it in Makefile.am Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 Tested: running autogen.sh, make and 'make dist' Signed-off-by: Gaetan Nadon Signed-off-by: Peter Hutterer diff --git a/Makefile.am b/Makefile.am index 105a360..4f4da59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 3a5fc5e..7fa9070 100644 --- a/co
x11proto-composite: Changes to 'debian-unstable'
Makefile.in | 540 --
aclocal.m4 | 665
configure| 3224 ---
debian/README.source | 73
debian/changelog | 11
debian/control | 14
debian/rules | 13
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs-autoreconf.mk | 150 -
debian/xsfbs/xsfbs.mk| 131 -
debian/xsfbs/xsfbs.sh| 522 +-
install-sh | 323 ---
missing | 360
13 files changed, 270 insertions(+), 5788 deletions(-)
New commits:
commit 227124d7bc2bd7e7bae31694d4a68cb73b56bd2f
Author: Julien Cristau
Date: Sat Sep 5 14:22:51 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 63e782b..acff063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11proto-composite (1:0.4-3) UNRELEASED; urgency=low
* Remove Conflicts/Replaces on old libxcomposite-dev, and Pre-Depends on
x11-common, which were needed for upgrades from sarge.
* Drop the XS- prefix from Vcs-* control fields.
+ * Bump Standards-Version to 3.8.3.
-- Julien Cristau Sat, 05 Sep 2009 14:07:46 +0200
diff --git a/debian/control b/debian/control
index 74c8e93..172c524 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
automake,
xutils-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-composite
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-composite.git
commit 15cb13ac772495c8b7eafe7a32d6acbd9c4c2dff
Author: Julien Cristau
Date: Sat Sep 5 14:22:34 2009 +0200
Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 971bab6..63e782b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11proto-composite (1:0.4-3) UNRELEASED; urgency=low
* Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
* Remove Conflicts/Replaces on old libxcomposite-dev, and Pre-Depends on
x11-common, which were needed for upgrades from sarge.
+ * Drop the XS- prefix from Vcs-* control fields.
-- Julien Cristau Sat, 05 Sep 2009 14:07:46 +0200
diff --git a/debian/control b/debian/control
index 224011d..74c8e93 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Build-Depends:
automake,
xutils-dev
Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-composite
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-composite.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-composite
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-composite.git
Package: x11proto-composite-dev
Architecture: all
commit 812a1bbf56243e07e2a1e9741503727be749a7a9
Author: Julien Cristau
Date: Sat Sep 5 14:19:10 2009 +0200
Remove Conflicts/Replaces on libxcomposite-dev and Pre-Depends on x11-common
These were needed for upgrades from sarge.
diff --git a/debian/changelog b/debian/changelog
index 8ff7018..971bab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ x11proto-composite (1:0.4-3) UNRELEASED; urgency=low
* Run autoreconf at build time.
* Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
+ * Remove Conflicts/Replaces on old libxcomposite-dev, and Pre-Depends on
+x11-common, which were needed for upgrades from sarge.
-- Julien Cristau Sat, 05 Sep 2009 14:07:46 +0200
diff --git a/debian/control b/debian/control
index 125f491..224011d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,6 @@ XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/proto/x11proto-composite.git
Package: x11proto-composite-dev
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-core-dev,
x11proto-fixes-dev
-Conflicts: libxcomposite-dev (<< 6.8.2-16)
-Replaces: libxcomposite-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 Composite extension wire protocol
This package provides development headers describing the wire protocol
for the Composite extension, used to let arbitrary client programs control
commit 9615508290ca6473c256ff36f61c973fc6b43ebc
Author: Julien Cristau
Date: Sat Sep 5 14:12:49 2009 +0200
Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
diff --git a/debian/changelog b/debian/changelog
index bedf2b8..8ff7018 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-composite (1:0.4-3) UNRELEASED; urgency=low
* Run autoreconf at build time.
+ * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
-- Julien Cristau Sat, 05 Sep 2009 14:07:46 +0200
diff --git a/debian/rules b/debian/rules
index d4e8f17..4471860 100755
--- a/debian/rules
+++ b/debian/rules
x11proto-composite: Changes to 'debian-unstable'
.gitignore|1 ChangeLog | 34 composite.h | 10 ++-- compositeproto.h | 48 compositeproto.txt| 59 +++--- configure | 20 configure.ac |2 - debian/changelog | 12 +- debian/control|2 - debian/xsfbs/xsfbs.mk | 27 +++--- debian/xsfbs/xsfbs.sh |7 - 11 files changed, 97 insertions(+), 125 deletions(-) New commits: commit e855952a1b0e324cf33d8e7a01f0e72e0f263698 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Fri Sep 14 22:25:01 2007 +0200 Prepare changelog for upload to unstable diff --git a/debian/changelog b/debian/changelog index cfcb23c..9bed8a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x11proto-composite (1:0.4-2) unstable; urgency=low + + * Upload to unstable. + * Add myself to Uploaders, and remove Branden with his permission. + + -- Brice Goglin <[EMAIL PROTECTED]> Fri, 14 Sep 2007 22:24:44 +0200 + x11proto-composite (1:0.4-1) experimental; urgency=low [ Timo Aaltonen ] diff --git a/debian/control b/debian/control index a1b7d38..4e8e8ef 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: x11proto-composite Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]> +Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5.0.0) Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-composite commit 575efb7249d7cf194f07e45db17e601d9c259231 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Wed Aug 29 09:36:00 2007 +0200 Do not call laptop-detect, let the only user call it directly diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 52473ca..a90ff7d 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -59,13 +59,6 @@ fi ARCHITECTURE="$(dpkg --print-installation-architecture)" -LAPTOP="" -if [ -n "$(which laptop-detect)" ]; then -if laptop-detect >/dev/null; then - LAPTOP=true -fi -fi - if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then RECONFIGURE="true" else commit 12a633f722a2ff9677728d1e2ae56767f804232a Author: Brice Goglin <[EMAIL PROTECTED]> Date: Thu Jul 12 16:06:22 2007 +0200 Fix "display the output of quilt push/pop". Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the return value of quilt, not the one of tee. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5f13302..bfca7bb 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare fi; \ if $(QUILT) next >/dev/null 2>&1; then \ echo -n "Applying patches..."; \ - if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \ + if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + cat $(STAMP_DIR)/log/patch; \ echo "successful."; \ else \ + cat $(STAMP_DIR)/log/patch; \ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ exit 1; \ fi; \ @@ -164,9 +166,11 @@ unpatch: rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ - if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \ + if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + cat $(STAMP_DIR)/log/unpatch; \ echo "successful."; \ else \ + cat $(STAMP_DIR)/log/unpatch; \ echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ exit 1; \ fi; \ commit e29b56820909668b062fdba72458ee9483a4ae44 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Mon Jul 9 21:50:47 2007 +0200 Minor fixes in the patching system. * Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920). * Display which patches are applied and removed instead of just the first one (for #428090). diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 2930c1e..5f13302 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -21,6 +21,11 @@ # Pass $(DH_OPTIONS) into the environment for debhelper's benefit. export DH_OPTIONS +# force quilt to not use ~/.quiltrc +QUILT = quilt --quiltrc /dev/null +# force QUILT_PATCHES to the default in case it is exported in the environment +QUILT_PATCHES = patches/ + # Set up parameters for the upstream build environment. # Determine (source) package name from Debian changelog. @@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare echo "Couldn't find quilt. Please install it
x11proto-composite: Changes to 'debian-unstable'
debian/changelog |6 +- debian/control |8 ++-- debian/copyright |3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) New commits: commit c450a46b9fcaf109c9bf6ec8e4cb432077d8e9d0 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Tue Aug 14 00:27:26 2007 +0200 Various fixed in debian/control and copyright diff --git a/debian/changelog b/debian/changelog index c6ec117..bc8f319 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,11 @@ x11proto-composite (1:0.3.1-3) UNRELEASED; urgency=low * Add XS-Vcs-*; drop obsolete CVS info from the description. * Remove Fabio from Uploaders, with his permission. - -- Julien Cristau <[EMAIL PROTECTED]> Fri, 04 May 2007 12:20:23 +0200 + [ Brice Goglin ] + * Update the long description. + * Add URL in debian/copyright. + + -- Brice Goglin <[EMAIL PROTECTED]> Tue, 14 Aug 2007 00:05:45 +0200 x11proto-composite (0.3.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 7e1072f..a1b7d38 100644 --- a/debian/control +++ b/debian/control @@ -15,9 +15,13 @@ Conflicts: libxcomposite-dev (<< 6.8.2-16) Replaces: libxcomposite-dev (<< 6.8.2-16) Pre-Depends: x11-common (>= 1:7.0.0) Description: X11 Composite extension wire protocol - This package provides the wire protocol for the Composite extension, used to - let arbitrary client programs control drawing of the final image. + This package provides development headers describing the wire protocol + for the Composite extension, used to let arbitrary client programs control + drawing of the final image. . More information about X.Org can be found at: + http://www.X.org> http://xorg.freedesktop.org> http://lists.freedesktop.org/mailman/listinfo/xorg> + . + This package is built from the X.org compositeproto proto module. diff --git a/debian/copyright b/debian/copyright index bdf38ec..f592565 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,6 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/proto/ + Copyright © 2003 Keith Packard Permission to use, copy, modify, distribute, and sell this software and its -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
x11proto-composite: Changes to 'debian-unstable'
.gitignore | 10 AUTHORS |1 COPYING |2 ChangeLog| 156 ++ INSTALL |8 Makefile.am | 28 Makefile.in | 100 + README |9 aclocal.m4 | 82 + composite.h | 10 compositeproto.h | 53 compositeproto.pc.in |4 compositeproto.txt | 362 + configure| 2506 --- configure.ac | 29 debian/changelog |9 debian/control |7 debian/copyright | 21 debian/rules |4 debian/xsfbs/xsfbs-autoreconf.mk | 150 ++ debian/xsfbs/xsfbs.mk| 379 + debian/xsfbs/xsfbs.sh| 907 ++ 22 files changed, 3828 insertions(+), 1009 deletions(-) New commits: commit f199943fa9ffe17e18e233fd8df21343ce3bbc91 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri May 4 12:22:45 2007 +0200 Misc packaging cleanups. * Update debian/copyright. * Install the protocol description and the upstream ChangeLog. * Add XS-Vcs-*; drop obsolete CVS info from the description. * Remove Fabio from Uploaders, with his permission. diff --git a/debian/changelog b/debian/changelog index 7e2e7b7..c6ec117 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ x11proto-composite (1:0.3.1-3) UNRELEASED; urgency=low + [ Timo Aaltonen ] * Bump the epoch so that this can be synced to Ubuntu in the future. - -- Timo Aaltonen <[EMAIL PROTECTED]> Fri, 4 May 2007 11:19:49 +0300 + [ Julien Cristau ] + * Update debian/copyright. + * Install the protocol description and the upstream ChangeLog. + * Add XS-Vcs-*; drop obsolete CVS info from the description. + * Remove Fabio from Uploaders, with his permission. + + -- Julien Cristau <[EMAIL PROTECTED]> Fri, 04 May 2007 12:20:23 +0200 x11proto-composite (0.3.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 7ab46aa..7e1072f 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,11 @@ Source: x11proto-composite Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]> +Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5.0.0) Standards-Version: 3.7.2 +XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-composite +XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-composite.git Package: x11proto-composite-dev Architecture: all @@ -19,6 +21,3 @@ Description: X11 Composite extension wire protocol More information about X.Org can be found at: http://xorg.freedesktop.org> http://lists.freedesktop.org/mailman/listinfo/xorg> - . - This module can be found as the module 'proto/Composite' at - :pserver:[EMAIL PROTECTED]:/cvs/xorg diff --git a/debian/copyright b/debian/copyright index 2426c59..bdf38ec 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,3 @@ -$Id$ - Copyright © 2003 Keith Packard Permission to use, copy, modify, distribute, and sell this software and its @@ -20,3 +18,22 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +Copyright © 2006 Sun Microsystems + +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 Sun Microsystems not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Sun Microsystems makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. diff --git a/debian/rules b/debian/rules index 7cc5e02..b9fd8ce 100755 --- a/debian/rules +++ b/debian/rules @@ -70,10 +70,10 @@ binary-indep: build install dh_testdir dh_testroot - dh_installd
x11proto-composite: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit c04fca0f3a10eae5473329d7bc2681a1216be3fc Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Fri May 4 11:29:04 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 1a3d4f1..7e2e7b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-composite (1:0.3.1-3) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen <[EMAIL PROTECTED]> Fri, 4 May 2007 11:19:49 +0300 + x11proto-composite (0.3.1-2) unstable; urgency=low [ Andres Salomon ] -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
