Re: xcb-util: Changes to 'debian-unstable'

[Julien Cristau]

On Tue, Aug 11, 2015 at 00:08:57 +, Robert Ancell wrote:

>  debian/changelog|   12 
>  debian/control  |   19 +++
>  debian/libxcb-util-dev.install  |4 
>  debian/libxcb-util0-dev.install |4 
>  debian/libxcb-util0.install |1 -
>  debian/libxcb-util1.install |1 +
>  6 files changed, 32 insertions(+), 9 deletions(-)
> 
> New commits:
> commit c5e0a94e39e70e3e2f54c5e9235de55fa6e8e2f9
> Author: Robert Ancell 
> Date:   Tue Aug 11 12:08:50 2015 +1200
> 
> * New upstream release.

The new upstream release was never actually merged?

Cheers,
Julien


signature.asc
Description: PGP signature

Re: xcb-util: Changes to 'debian-unstable'

[Julien Cristau]

On Tue, Aug 11, 2015 at 00:19:04 +, Robert Ancell wrote:

>  debian/changelog|2 ++
>  debian/libxcb-util1.symbols |   27 +++
>  2 files changed, 29 insertions(+)
> 
> New commits:
> commit ae7fafb2a45bc2a2c54b1c1c260cc40157731a5d
> Author: Robert Ancell 
> Date:   Tue Aug 11 12:18:57 2015 +1200
> 
> * debian/libxcb-util1.symbols:
>   - Track library symbols
> 
> diff --git a/debian/changelog b/debian/changelog
> index 5bb1028..e25ea3d 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -7,6 +7,8 @@ xcb-util (0.4.0-1) UNRELEASED; urgency=medium
>  - Rename libxcb-util0 to libxcb-util1
>  - Rename libxcb-util0-dev to libxcb-util-dev
>  - Add transitional libxcb-util0-dev package
> +  * debian/libxcb-util1.symbols:
> +- Track library symbols
>  
>   -- Robert Ancell   Tue, 11 Aug 2015 12:01:14 
> +1200
>  
> diff --git a/debian/libxcb-util1.symbols b/debian/libxcb-util1.symbols
> new file mode 100644
> index 000..dc1a040
> --- /dev/null
> +++ b/debian/libxcb-util1.symbols
> @@ -0,0 +1,27 @@
> +libxcb-util.so.1 libxcb-util1 #MINVER#
> + xcb_atom_name_by_resource@Base 0.4.0
> + xcb_atom_name_by_screen@Base 0.4.0
[...]

As the library just bumped SONAME, there's no need for a dependency on
0.4.0, please use 0 instead.

Thanks,
Julien


signature.asc
Description: PGP signature

xcb-util: Changes to 'debian-unstable'

[Robert Ancell]

 debian/control |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7fbea87817f4b0365745eecdd242067ea0306815
Author: Robert Ancell robert.anc...@canonical.com
Date:   Mon Aug 17 13:51:29 2015 +1200

Add breaks/replaces so libxcb-util-dev is correctly migrated

diff --git a/debian/control b/debian/control
index 7d232ca..76b1352 100644
--- a/debian/control
+++ b/debian/control
@@ -44,11 +44,13 @@ Conflicts: libxcb-atom1-dev,
libxcb-event1-dev,
libxcb-reply1-dev,
libxcb-property1-dev
+Breaks: libxcb-util0-dev ( 0.4.0-1)
 Replaces: libxcb-atom1-dev,
   libxcb-aux0-dev,
   libxcb-event1-dev,
   libxcb-reply1-dev,
   libxcb-property1-dev
+  libxcb-util0-dev ( 0.4.0-1)
 Architecture: any
 Depends: libxcb-util1 (= ${binary:Version}),
  libxcb1-dev,

xcb-util: Changes to 'debian-unstable'

[Robert Ancell]

 debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa4bef555e10abb3601809d7d26a94c6964ae069
Author: Robert Ancell robert.anc...@canonical.com
Date:   Mon Aug 17 13:56:35 2015 +1200

Add missing comma

diff --git a/debian/control b/debian/control
index 76b1352..524e4d8 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Replaces: libxcb-atom1-dev,
   libxcb-aux0-dev,
   libxcb-event1-dev,
   libxcb-reply1-dev,
-  libxcb-property1-dev
+  libxcb-property1-dev,
   libxcb-util0-dev ( 0.4.0-1)
 Architecture: any
 Depends: libxcb-util1 (= ${binary:Version}),

Re: Fwd: Re: xcb-util: Changes to 'debian-unstable'

[Robert Ancell]

You said it's not worth the trouble - I don't think it's any signficant
trouble...

There's no transition required that I know of - all existing packages will
continue to build fine using the transitional libxcb-util0-dev package and
over time build-dependencies will be updated and this package can be
removed. It's marked as oldlibs/extra so the automatic tools will pick this
up.

--Robert

[1] https://wiki.debian.org/Renaming_a_Package

On Tue, Aug 11, 2015 at 5:38 PM Timo Aaltonen tjaal...@debian.org wrote:

 On 11.08.2015 08:03, Timo Aaltonen wrote:
 
  so will you handle the migration on Debian too? since pkg-xorg won't

 right, so with another look it indeed looks like the sover got bumped in
 _this_ version and not before.. ugh, sorry about that!

 still needs the transition

 --
 t

Re: Fwd: Re: xcb-util: Changes to 'debian-unstable'

[Timo Aaltonen]

On 12.08.2015 00:35, Robert Ancell wrote:
 You said it's not worth the trouble - I don't think it's any
 signficant trouble...

No I just ignored the simple fact that the update bumped soname, so what
you did was absolutely correct.. oops

 There's no transition required that I know of - all existing packages
 will continue to build fine using the transitional libxcb-util0-dev
 package and over time build-dependencies will be updated and this
 package can be removed. It's marked as oldlibs/extra so the automatic
 tools will pick this up.

guess you're right, and I should not intervene in these matters until
feeling capable :)


-- 
t


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/55ca6d3c.7040...@debian.org

Re: xcb-util: Changes to 'debian-unstable'

[Timo Aaltonen]

On 11.08.2015 03:08, Robert Ancell wrote:
   - Rename libxcb-util0 to libxcb-util1
   - Rename libxcb-util0-dev to libxcb-util-dev
   - Add transitional libxcb-util0-dev package

hrm, thought I was clear this was a bad idea?


-- 
t


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/55c981b1.8030...@debian.org

Re: Fwd: Re: xcb-util: Changes to 'debian-unstable'

[Timo Aaltonen]

On 11.08.2015 08:03, Timo Aaltonen wrote:
 
 so will you handle the migration on Debian too? since pkg-xorg won't

right, so with another look it indeed looks like the sover got bumped in
_this_ version and not before.. ugh, sorry about that!

still needs the transition

-- 
t


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/55c98a62.30...@debian.org

xcb-util: Changes to 'debian-unstable'

[Robert Ancell]

 debian/changelog|   12 
 debian/control  |   19 +++
 debian/libxcb-util-dev.install  |4 
 debian/libxcb-util0-dev.install |4 
 debian/libxcb-util0.install |1 -
 debian/libxcb-util1.install |1 +
 6 files changed, 32 insertions(+), 9 deletions(-)

New commits:
commit c5e0a94e39e70e3e2f54c5e9235de55fa6e8e2f9
Author: Robert Ancell robert.anc...@canonical.com
Date:   Tue Aug 11 12:08:50 2015 +1200

* New upstream release.
* debian/control:
  - Use standards version 3.9.6
  - Drop build-depends on x11proto-core-dev
  - Rename libxcb-util0 to libxcb-util1
  - Rename libxcb-util0-dev to libxcb-util-dev
  - Add transitional libxcb-util0-dev package

diff --git a/debian/changelog b/debian/changelog
index a6defe5..5bb1028 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xcb-util (0.4.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+- Use standards version 3.9.6
+- Drop build-depends on x11proto-core-dev
+- Rename libxcb-util0 to libxcb-util1
+- Rename libxcb-util0-dev to libxcb-util-dev
+- Add transitional libxcb-util0-dev package
+
+ -- Robert Ancell robert.anc...@canonical.com  Tue, 11 Aug 2015 12:01:14 
+1200
+
 xcb-util (0.3.8-3) unstable; urgency=medium
 
   * debian/control, debian/rules:
diff --git a/debian/control b/debian/control
index bd8e983..a02c02b 100644
--- a/debian/control
+++ b/debian/control
@@ -17,12 +17,12 @@ Build-Depends: cdbs ( = 0.4.93),
automake,
xutils-dev,
dh-autoreconf
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://xcb.freedesktop.org
 Vcs-Git: git://git.debian.org/pkg-xorg/lib/xcb-util.git
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xcb-util.git
 
-Package: libxcb-util0
+Package: libxcb-util1
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -39,7 +39,7 @@ Description: utility libraries for X C Binding -- atom, aux 
and event
  libraries also provide client-side code which is not strictly part of
  the X protocol but which have traditionally been provided by Xlib.
 
-Package: libxcb-util0-dev
+Package: libxcb-util-dev
 Conflicts: libxcb-atom1-dev,
libxcb-aux0-dev,
libxcb-event1-dev,
@@ -51,7 +51,7 @@ Replaces: libxcb-atom1-dev,
   libxcb-reply1-dev,
   libxcb-property1-dev
 Architecture: any
-Depends: libxcb-util0 (= ${binary:Version}),
+Depends: libxcb-util1 (= ${binary:Version}),
  libxcb1-dev,
  ${misc:Depends}
 Multi-Arch: same
@@ -65,3 +65,14 @@ Description: utility libraries for X C Binding -- atom, aux 
and event
  and interfaces which make the raw X protocol more usable. Some of the
  libraries also provide client-side code which is not strictly part of
  the X protocol but which have traditionally been provided by Xlib.
+
+Package: libxcb-util0-dev
+Section: libdevel
+Architecture: any
+Depends: libxcb-util-dev (= ${binary:Version})
+Multi-Arch: same
+Description: dummy transitional package for utility libraries for X C Binding 
-- atom, aux and event
+ This is a transitional dummy package for libxcb-util0-dev to
+ libxcb-util-dev migration.
+ .
+ This package can be safely removed.
diff --git a/debian/libxcb-util-dev.install b/debian/libxcb-util-dev.install
new file mode 100644
index 000..7d0ad47
--- /dev/null
+++ b/debian/libxcb-util-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/*.h
+usr/lib/*/libxcb-util.a
+usr/lib/*/libxcb-util.so
+usr/lib/*/pkgconfig/*.pc
diff --git a/debian/libxcb-util0-dev.install b/debian/libxcb-util0-dev.install
deleted file mode 100644
index 7d0ad47..000
--- a/debian/libxcb-util0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/xcb/*.h
-usr/lib/*/libxcb-util.a
-usr/lib/*/libxcb-util.so
-usr/lib/*/pkgconfig/*.pc
diff --git a/debian/libxcb-util0.install b/debian/libxcb-util0.install
deleted file mode 100644
index bdc40ab..000
--- a/debian/libxcb-util0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libxcb-util.so.*
diff --git a/debian/libxcb-util1.install b/debian/libxcb-util1.install
new file mode 100644
index 000..bdc40ab
--- /dev/null
+++ b/debian/libxcb-util1.install
@@ -0,0 +1 @@
+usr/lib/*/libxcb-util.so.*


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zox7h-0007nf...@moszumanska.debian.org

xcb-util: Changes to 'debian-unstable'

[Robert Ancell]

 debian/control |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d32ccc34697a307735193af63e98d122922cee67
Author: Robert Ancell robert.anc...@canonical.com
Date:   Tue Aug 11 12:11:13 2015 +1200

Remove build-depends as mentioned in changelog

diff --git a/debian/control b/debian/control
index a02c02b..fda9a6b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: cdbs ( = 0.4.93),
pkg-config,
m4,
libtool,
-   x11proto-core-dev (= 7.0.12),
autotools-dev,
autoconf,
automake,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zox9y-0008mk...@moszumanska.debian.org

xcb-util: Changes to 'debian-unstable'

[Robert Ancell]

 debian/changelog|2 ++
 debian/libxcb-util1.symbols |   27 +++
 2 files changed, 29 insertions(+)

New commits:
commit ae7fafb2a45bc2a2c54b1c1c260cc40157731a5d
Author: Robert Ancell robert.anc...@canonical.com
Date:   Tue Aug 11 12:18:57 2015 +1200

* debian/libxcb-util1.symbols:
  - Track library symbols

diff --git a/debian/changelog b/debian/changelog
index 5bb1028..e25ea3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xcb-util (0.4.0-1) UNRELEASED; urgency=medium
 - Rename libxcb-util0 to libxcb-util1
 - Rename libxcb-util0-dev to libxcb-util-dev
 - Add transitional libxcb-util0-dev package
+  * debian/libxcb-util1.symbols:
+- Track library symbols
 
  -- Robert Ancell robert.anc...@canonical.com  Tue, 11 Aug 2015 12:01:14 
+1200
 
diff --git a/debian/libxcb-util1.symbols b/debian/libxcb-util1.symbols
new file mode 100644
index 000..dc1a040
--- /dev/null
+++ b/debian/libxcb-util1.symbols
@@ -0,0 +1,27 @@
+libxcb-util.so.1 libxcb-util1 #MINVER#
+ xcb_atom_name_by_resource@Base 0.4.0
+ xcb_atom_name_by_screen@Base 0.4.0
+ xcb_atom_name_unique@Base 0.4.0
+ xcb_aux_change_gc@Base 0.4.0
+ xcb_aux_change_gc_checked@Base 0.4.0
+ xcb_aux_change_keyboard_control@Base 0.4.0
+ xcb_aux_change_window_attributes@Base 0.4.0
+ xcb_aux_change_window_attributes_checked@Base 0.4.0
+ xcb_aux_clear_window@Base 0.4.0
+ xcb_aux_configure_window@Base 0.4.0
+ xcb_aux_create_gc@Base 0.4.0
+ xcb_aux_create_gc_checked@Base 0.4.0
+ xcb_aux_create_window@Base 0.4.0
+ xcb_aux_create_window_checked@Base 0.4.0
+ xcb_aux_find_visual_by_attrs@Base 0.4.0
+ xcb_aux_find_visual_by_id@Base 0.4.0
+ xcb_aux_get_depth@Base 0.4.0
+ xcb_aux_get_depth_of_visual@Base 0.4.0
+ xcb_aux_get_screen@Base 0.4.0
+ xcb_aux_get_visualtype@Base 0.4.0
+ xcb_aux_parse_color@Base 0.4.0
+ xcb_aux_set_line_attributes_checked@Base 0.4.0
+ xcb_aux_sync@Base 0.4.0
+ xcb_event_get_error_label@Base 0.4.0
+ xcb_event_get_label@Base 0.4.0
+ xcb_event_get_request_label@Base 0.4.0


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zoxhu-0001q4...@moszumanska.debian.org

xcb-util: Changes to 'debian-unstable'

[Robert Ancell]

 debian/control |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 89ed0f8a8fc56a1972e0ca4c990090ecabff42d7
Author: Robert Ancell robert.anc...@canonical.com
Date:   Tue Aug 11 12:28:27 2015 +1200

Add misc:Depends to transition libxcb-util0-dev to keep lintian happy

diff --git a/debian/control b/debian/control
index fda9a6b..7d232ca 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,8 @@ Description: utility libraries for X C Binding -- atom, aux 
and event
 Package: libxcb-util0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcb-util-dev (= ${binary:Version})
+Depends: libxcb-util-dev (= ${binary:Version}),
+ ${misc:Depends}
 Multi-Arch: same
 Description: dummy transitional package for utility libraries for X C Binding 
-- atom, aux and event
  This is a transitional dummy package for libxcb-util0-dev to


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zoxqe-0003qy...@moszumanska.debian.org

xcb-util: Changes to 'debian-unstable'

[Arnaud Fontaine]

 debian/changelog |   11 ++
 debian/control   |5 +--
 debian/copyright |   89 +++
 debian/rules |1 
 4 files changed, 65 insertions(+), 41 deletions(-)

New commits:
commit 7ee6ee78c050145edf42a612d53904e75db6a413
Author: Arnaud Fontaine ar...@debian.org
Date:   Tue Aug 26 20:25:12 2014 +0200

Upload xcb-util 0.3.8-3 to unstable.

diff --git a/debian/changelog b/debian/changelog
index 463d2ae..a6defe5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xcb-util (0.3.8-3) UNRELEASED; urgency=medium
+xcb-util (0.3.8-3) unstable; urgency=medium
 
   * debian/control, debian/rules:
 + Use dh-autoreconf to make porters' task easier. Thanks to Breno
@@ -6,7 +6,7 @@ xcb-util (0.3.8-3) UNRELEASED; urgency=medium
   * debian/control: bump Standards-Version to 3.9.5.
 + debian/copyright: switch to machine-readable format.
 
- -- Arnaud Fontaine ar...@debian.org  Tue, 26 Aug 2014 20:13:53 +0200
+ -- Arnaud Fontaine ar...@debian.org  Tue, 26 Aug 2014 20:24:41 +0200
 
 xcb-util (0.3.8-2) unstable; urgency=low
 
@@ -139,4 +139,3 @@ xcb-util (0.2-1) experimental; urgency=low
   * Initial release (Closes: #437681)
 
  -- Julien Danjou a...@debian.org  Tue, 25 Mar 2008 19:14:42 +0100
-

commit 76b555b54607aab543286f006029e057293750e9
Author: Arnaud Fontaine ar...@debian.org
Date:   Thu May 31 16:08:32 2012 +0900

Bump Standards-Version to 3.9.5.

Switch debian/copyright to machine-readable format.

diff --git a/debian/changelog b/debian/changelog
index c08b2aa..463d2ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xcb-util (0.3.8-3) UNRELEASED; urgency=medium
   * debian/control, debian/rules:
 + Use dh-autoreconf to make porters' task easier. Thanks to Breno
   Leitao. Closes: #748983.
+  * debian/control: bump Standards-Version to 3.9.5.
++ debian/copyright: switch to machine-readable format.
 
  -- Arnaud Fontaine ar...@debian.org  Tue, 26 Aug 2014 20:13:53 +0200
 
diff --git a/debian/control b/debian/control
index ce2126e..bd8e983 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: cdbs ( = 0.4.93),
automake,
xutils-dev,
dh-autoreconf
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
 Homepage: http://xcb.freedesktop.org
 Vcs-Git: git://git.debian.org/pkg-xorg/lib/xcb-util.git
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xcb-util.git
diff --git a/debian/copyright b/debian/copyright
index affc21b..ea66b22 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,40 +1,53 @@
-This package was debianized by  Julien Danjou a...@debian.org on Tue, 25 Mar
-2008 19:14:42 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xcb-util
+Upstream-Contact: XCB Mailing List x...@lists.freedesktop.org
+Source: http://xcb.freedesktop.org
 
-It was downloaded from http://xcb.freedesktop.org
+Files: *
+Copyright: 2008-2009 Julien Danjou jul...@danjou.info
+   2008 Bart Massey b...@cs.pdx.edu
+   2008 Ian Osgood i...@quirkster.com
+   2008 Jamey Sharp ja...@minilop.net
+License: MIT/X Consortium License
+ Permission is hereby granted, free of  charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction,  including without limitation the rights
+ to use,  copy, modify,  merge, publish,  distribute, sublicense,  and/or sell
+ copies  of the  Software,  and to  permit  persons to  whom  the Software  is
+ furnished to do so, subject to the following conditions:
+ .
+ The above  copyright notice and this  permission notice shall be  included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE  IS PROVIDED AS IS,  WITHOUT WARRANTY OF ANY  KIND, EXPRESS OR
+ IMPLIED,  INCLUDING BUT  NOT LIMITED  TO THE  WARRANTIES OF  MERCHANTABILITY,
+ FITNESS FOR A  PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO  EVENT SHALL THE
+ AUTHORS BE  LIABLE FOR ANY CLAIM,  DAMAGES OR OTHER LIABILITY,  WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except  as contained  in  this notice,  the  names of  the  authors or  their
+ institutions shall  not be used  in advertising  or otherwise to  promote the
+ sale,  use  or  other  dealings   in  this  Software  without  prior  written
+ authorization from the authors.
 
-Upstream Authors: Bart Massey, Jamey Sharp, and Josh Triplett.
-
-Copyright: 
-
-Copyright © 2006 Ian Osgood
-Copyright © 2001-2008 Bart Massey, Jamey Sharp, and Josh Triplett.
-Copyright © 2000 Keith Packard
-
-License:
-
-Permission is  hereby granted, free of  charge, to any  person obtaining a
-copy of this software and associated documentation files (the Software),
-to deal in the  Software 

xcb-util: Changes to 'debian-unstable'

[Steve Langasek]

 debian/changelog |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 18b41ad268290f93afc76a51ade3aea5cb82e38d
Author: Steve Langasek steve.langa...@ubuntu.com
Date:   Thu Feb 9 16:42:05 2012 -0800

releasing version 0.3.8-2

diff --git a/debian/changelog b/debian/changelog
index a635e1f..a54e0a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xcb-util (0.3.8-2) UNRELEASED; urgency=low
+xcb-util (0.3.8-2) unstable; urgency=low
 
-  [ Tom Ellis ]
-  * Convert to multi-arch. (Closes: #640521, LP: #925388)
+  * Convert to multi-arch.  Thanks to Tom Ellis tom.el...@canonical.com
+and Riku Voipio riku.voi...@iki.fi.  (Closes: #640521, LP: #925388)
 
- -- Tom Ellis trel...@ubuntu.com  Wed, 08 Feb 2012 11:28:48 +
+ -- Steve Langasek vor...@debian.org  Thu, 09 Feb 2012 16:40:57 -0800
 
 xcb-util (0.3.8-1) unstable; urgency=low
 

commit cae0a6c1824578ef32fbcd38cba3cee96e641cba
Author: Steve Langasek steve.langa...@ubuntu.com
Date:   Thu Feb 9 16:40:49 2012 -0800

reference the Debian bug # too, not just the LP one

diff --git a/debian/changelog b/debian/changelog
index dcf158e..a635e1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xcb-util (0.3.8-2) UNRELEASED; urgency=low
 
-  * Convert to multi-arch. (LP: #925388)
+  [ Tom Ellis ]
+  * Convert to multi-arch. (Closes: #640521, LP: #925388)
 
  -- Tom Ellis trel...@ubuntu.com  Wed, 08 Feb 2012 11:28:48 +
 


-- 
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/e1rvekm-000869...@vasks.debian.org

xcb-util: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog|4 
 debian/control  |7 +--
 debian/libxcb-util0-dev.install |6 +++---
 debian/libxcb-util0.install |2 +-
 debian/rules|2 ++
 5 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 317651922039b9b734d74ddd3678d50f1cd01c21
Author: Tom Ellis trel...@ubuntu.com
Date:   Wed Feb 8 14:13:21 2012 +0200

Convert to multi-arch

diff --git a/debian/changelog b/debian/changelog
index 208f6a0..85b9ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xcb-util (0.3.8-1) unstable; urgency=low
 
+  [ Arnaud Fontaine ]
   * New upstream release.
 + xcb-util has been split up into several modules.
 + Build-Depends on libxcb1-dev = 1.6. Closes: #544865.
@@ -8,6 +9,9 @@ xcb-util (0.3.8-1) unstable; urgency=low
 + Now maintain as part of pkg-xorg team.
   * Switch to 3.0 (quilt) source format.
 
+  [ Tom Ellis ]
+  * Convert to multi-arch. (LP: #925388)
+
  -- Arnaud Fontaine ar...@debian.org  Fri, 06 May 2011 21:44:09 +0900
 
 xcb-util (0.3.6-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d4997e4..9babb31 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Julien Danjou a...@debian.org,
Arnaud Fontaine ar...@debian.org
-Build-Depends: cdbs,
-   debhelper (= 5),
+Build-Depends: cdbs ( = 0.4.93),
+   debhelper (= 8.1.3),
libxcb1-dev (= 1.6),
gperf,
pkg-config,
@@ -24,7 +24,9 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/lib/xcb-util.git
 Package: libxcb-util0
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: utility libraries for X C Binding -- atom, aux and event
  This package contains the library files needed to run software using
  libxcb-util.
@@ -51,6 +53,7 @@ Architecture: any
 Depends: libxcb-util0 (= ${binary:Version}),
  libxcb1-dev,
  ${misc:Depends}
+Multi-Arch: same
 Description: utility libraries for X C Binding -- atom, aux and event
  This package contains the header and library files needed to build software
  using libxcb-util.
diff --git a/debian/libxcb-util0-dev.install b/debian/libxcb-util0-dev.install
index 489c554..7d0ad47 100644
--- a/debian/libxcb-util0-dev.install
+++ b/debian/libxcb-util0-dev.install
@@ -1,4 +1,4 @@
 usr/include/xcb/*.h
-usr/lib/libxcb-util.a
-usr/lib/libxcb-util.so
-usr/lib/pkgconfig/*.pc
+usr/lib/*/libxcb-util.a
+usr/lib/*/libxcb-util.so
+usr/lib/*/pkgconfig/*.pc
diff --git a/debian/libxcb-util0.install b/debian/libxcb-util0.install
index 7223d2c..bdc40ab 100644
--- a/debian/libxcb-util0.install
+++ b/debian/libxcb-util0.install
@@ -1 +1 @@
-usr/lib/libxcb-util.so.*
+usr/lib/*/libxcb-util.so.*
diff --git a/debian/rules b/debian/rules
index 8938b7d..7f1acee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@ DEB_DH_MAKESHLIBS_ARGS=-V
 
 ORIG_MAJOR=$(shell git describe upstream | cut -d- -f1)
 ORIG_GIT=$(shell git describe upstream | cut -d- -f2)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 post-patches:: configure-stamp
 configure-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/e1rv6pa-0004rr...@vasks.debian.org

xcb-util: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit c51e92c0e99ae685d512bc0ff91603c60896463f
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Wed Feb 8 22:40:16 2012 +0200

fix the changelog entry of the previous commit

diff --git a/debian/changelog b/debian/changelog
index 85b9ceb..dcf158e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xcb-util (0.3.8-2) UNRELEASED; urgency=low
+
+  * Convert to multi-arch. (LP: #925388)
+
+ -- Tom Ellis trel...@ubuntu.com  Wed, 08 Feb 2012 11:28:48 +
+
 xcb-util (0.3.8-1) unstable; urgency=low
 
   [ Arnaud Fontaine ]
@@ -9,9 +15,6 @@ xcb-util (0.3.8-1) unstable; urgency=low
 + Now maintain as part of pkg-xorg team.
   * Switch to 3.0 (quilt) source format.
 
-  [ Tom Ellis ]
-  * Convert to multi-arch. (LP: #925388)
-
  -- Arnaud Fontaine ar...@debian.org  Fri, 06 May 2011 21:44:09 +0900
 
 xcb-util (0.3.6-1) unstable; urgency=low


-- 
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/e1rvejq-0001aa...@vasks.debian.org

xcb-util: Changes to 'debian/unstable'

[Arnaud Fontaine]

New branch 'debian/unstable' available with the following commits:
commit cdec5e2e6cbab9419779db0954a84fd59da2
Author: Arnaud Fontaine ar...@debian.org
Date:   Fri May 6 18:29:49 2011 +0900

xcb-util is now maintained as part of pkg-xorg team.

Signed-off-by: Arnaud Fontaine ar...@debian.org

commit f56a9c417dfa1e67711429ba418973cfc6e794eb
Author: Arnaud Fontaine ar...@debian.org
Date:   Fri May 6 18:05:10 2011 +0900

Remove Conflicts and Replaces.

There is nothing preventing old libxcb-{aux,event,reply,property} to be
installed along with libxcb-util as they don't share the same files.

Signed-off-by: Arnaud Fontaine ar...@debian.org

commit 56ffecf2dfb48cb9406e8e0ea67dcb30846913c3
Author: Arnaud Fontaine ar...@debian.org
Date:   Fri May 6 15:25:31 2011 +0900

Closing #544865.

Signed-off-by: Arnaud Fontaine ar...@debian.org

commit ba9f828ee1e94dc377492e619c0ea2b095a90d92
Author: Arnaud Fontaine ar...@debian.org
Date:   Fri May 6 14:54:51 2011 +0900

Clean up unecessary files of Git Debian packages.

Signed-off-by: Arnaud Fontaine ar...@debian.org

commit 5f15e822b5ac375c11fb05e568b55616137c24b7
Author: Arnaud Fontaine ar...@debian.org
Date:   Fri May 6 14:45:33 2011 +0900

Only run autogen.sh if configure script does not already exist.

Signed-off-by: Arnaud Fontaine ar...@debian.org

commit c33125c9afccb6e8d8d96b4104f2db06515482f2
Author: Arnaud Fontaine ar...@debian.org
Date:   Fri May 6 12:25:51 2011 +0900

Debian packaging.

Signed-off-by: Arnaud Fontaine ar...@debian.org

commit 8120792a02898625ed344828ad378b54b308e029
Author: Arnaud Fontaine ar...@debian.org
Date:   Tue Apr 26 01:30:17 2011 +0900

Release 0.3.8

Signed-off-by: Arnaud Fontaine ar...@debian.org

commit 9c9d66a4dbe71328b9e38dc6d45b99eb06d19553
Author: Arnaud Fontaine ar...@debian.org
Date:   Tue Apr 26 01:30:13 2011 +0900

Fix package name

Signed-off-by: Arnaud Fontaine ar...@debian.org

commit eb0b55aa4ea037ebbe76c5820c3b1f4be30fcd33
Author: Dirk Wallenstein hals...@t-online.de
Date:   Tue Apr 5 09:58:28 2011 +0200

Use an absolute URL for the m4 submodule

A relative submodule URL requires m4 duplicates relative to every fork or 
local
mirror of this module.  To select a different protocol with an absolute
submodule URL, the url.base.insteadOf configuration option can be used.

Signed-off-by: Dirk Wallenstein hals...@t-online.de
Reviewed-by: Arnaud Fontaine ar...@debian.org
Reviewed-by: Gaetan Nadon mems...@videotron.ca

commit 4824b7dc328751dcfc48a3c2ae0f2be3df217ebd
Author: Jon TURNEY jon.tur...@dronecode.org.uk
Date:   Tue Mar 22 15:34:46 2011 +

Link with -no-undefined

Use -no-undefined to assure libtool that the library has no unresolved
symbols at link time, so that libtool will build a shared library for
platforms require that all symbols are resolved when the library is linked.

Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
Acked-by: Julien Cristau jcris...@debian.org
Reviewed-by: Arnaud Fontaine ar...@debian.org

commit fd626329982cc2766e5a85a75ea2800b7aa3f114
Author: Gaetan Nadon mems...@videotron.ca
Date:   Thu Mar 10 19:50:36 2011 -0500

pkg-config files: remove LIBS which is unrequired and undesirable

LIBS is not supplied by the package configuration, it may be anything
the builder sets through the command line. Only -lxcb-util is needed.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
Reviewed-by: Arnaud Fontaine ar...@debian.org

commit 363622a64830c75ee1c014f49f72c698a390f24d
Author: Gaetan Nadon mems...@videotron.ca
Date:   Thu Mar 10 19:50:35 2011 -0500

Remove the Doxyfile which is unused, out dated and wrong.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
Reviewed-by: Arnaud Fontaine ar...@debian.org

commit ca5b57231c0e9a3d4eda3530c4973323ed7f6977
Author: Gaetan Nadon mems...@videotron.ca
Date:   Thu Mar 10 19:50:35 2011 -0500

Fix distcheck due to xcb_atom.h

Make does not see this target as being located in the builddir.
The main issue is that built source is not build in the directory.

Rather than investing efforts in workarounds, this patch
builds the library the same way all other xorg libraries are built.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
Reviewed-by: Arnaud Fontaine ar...@debian.org

commit 0de786c46a81fa10e07ad77ff0992a44abe4ac2b
Author: Gaetan Nadon mems...@videotron.ca
Date:   Sun Mar 6 17:52:44 2011 -0500

config: generate ChangeLog and INSTALL

By copying a snippet of Makefile for xorg modules.
One side-effect is that Makefile.in is no longer
deleted on maintainer clean. This should never be done as
it leaves your configuration in a half-broken state.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
Signed-off-by: Arnaud Fontaine ar...@mini-dweeb.org

commit 

xcb-util: Changes to 'debian-unstable'

[Arnaud Fontaine]

 debian/changelog |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ccd3ffd8bcd19f6ef1b75c90ae3a2681ac8c2e96
Author: Arnaud Fontaine ar...@debian.org
Date:   Fri May 6 21:44:30 2011 +0900

State in debian/changelog that it is now maintained as part of pkg-xorg 
team.

Signed-off-by: Arnaud Fontaine ar...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 601c8c1..208f6a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ xcb-util (0.3.8-1) unstable; urgency=low
 + Build-Depends on libxcb1-dev = 1.6. Closes: #544865.
   * debian/control:
 + Bump Standards-Version to 3.9.2. No changes needed.
++ Now maintain as part of pkg-xorg team.
   * Switch to 3.0 (quilt) source format.
 
- -- Arnaud Fontaine ar...@debian.org  Fri, 06 May 2011 12:08:29 +0900
+ -- Arnaud Fontaine ar...@debian.org  Fri, 06 May 2011 21:44:09 +0900
 
 xcb-util (0.3.6-1) unstable; urgency=low
 


-- 
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/e1qikqb-0006hp...@alioth.debian.org