[waffle] [PATCH v3 3/3] waffle: add debian packaging

Mon Jan 13 23:11:10 PST 2014

On Mon, Jan 13, 2014 at 5:26 PM, Brian Paul <brianp at vmware.com> wrote:
> On 01/13/2014 04:55 PM, Jordan Justen wrote:
>>
>> This builds 4 packages:
>>   * libwaffle-1
>>   * libwaffle-dev (pkgconfig, includes)
>>   * libwaffle-doc (man pages)
>>   * waffle-utils (wflinfo w/man page)
>>
>> v3:
>>   * Added to v3 of wflinfo series
>>   * Changed copyright to Intel
>>
>> Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
>> ---
>>   debian/changelog             |  5 ++++
>>   debian/compat                |  1 +
>>   debian/control               | 57
>> ++++++++++++++++++++++++++++++++++++++++++++
>>   debian/copyright             | 33 +++++++++++++++++++++++++
>>   debian/libwaffle-1.install   |  1 +
>>   debian/libwaffle-dev.install |  2 ++
>>   debian/libwaffle-doc.install |  2 ++
>>   debian/rules                 | 21 ++++++++++++++++
>>   debian/waffle-utils.install  |  2 ++
>>   9 files changed, 124 insertions(+)
>>   create mode 100644 debian/changelog
>>   create mode 100644 debian/compat
>>   create mode 100644 debian/control
>>   create mode 100644 debian/copyright
>>   create mode 100644 debian/libwaffle-1.install
>>   create mode 100644 debian/libwaffle-dev.install
>>   create mode 100644 debian/libwaffle-doc.install
>>   create mode 100755 debian/rules
>>   create mode 100644 debian/waffle-utils.install
>>
>> diff --git a/debian/changelog b/debian/changelog
>> new file mode 100644
>> index 0000000..d50b18a
>> --- /dev/null
>> +++ b/debian/changelog
>> @@ -0,0 +1,5 @@
>> +waffle (1.3.0) unstable; urgency=low
>> +
>> +  * Add debian packaging
>> +
>> + -- Jordan Justen <jordan.l.justen at intel.com>  Mon, 30 Dec 2013 14:50:51
>> -0800
>> diff --git a/debian/compat b/debian/compat
>> new file mode 100644
>> index 0000000..f11c82a
>> --- /dev/null
>> +++ b/debian/compat
>> @@ -0,0 +1 @@
>> +9
>> \ No newline at end of file
>> diff --git a/debian/control b/debian/control
>> new file mode 100644
>> index 0000000..b32fa07
>> --- /dev/null
>> +++ b/debian/control
>> @@ -0,0 +1,57 @@
>> +Source: waffle
>> +Priority: optional
>> +Section: libs
>> +Maintainer: Jordan Justen <jordan.l.justen at intel.com>
>> +Build-Depends: binutils (>> 2.18),
>> +               cmake,
>> +               debhelper (>= 9),
>> +               docbook-xls,
>> +               libegl1-mesa-dev | libegl-dev,
>> +               libgl1-mesa-dev | libgl-dev,
>> +               libglu1-mesa-dev | libglu-dev,
>> +               libgbm-dev,
>> +               libwayland-dev,
>> +               libx11-dev,
>> +               pkg-config,
>> +               xsltproc
>> +Standards-Version: 3.9.5
>> +Homepage:
>> https://urldefense.proofpoint.com/v1/url?u=http://people.freedesktop.org/~chadversary/waffle&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=4Ee2aLuF%2BZDtxBGN2kuCAvxWpu7nT3GllQcQCkVD4D4%3D%0A&s=23a31b797d48c99a64428e7f7fd6265f3ff754bec72f42bd88533707f000c8ba
>> +Vcs-Git: git://people.freedesktop.org/~chadversary/waffle.git
>> +Vcs-Browser:
>> https://urldefense.proofpoint.com/v1/url?u=http://cgit.freedesktop.org/~chadversary/waffle&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=4Ee2aLuF%2BZDtxBGN2kuCAvxWpu7nT3GllQcQCkVD4D4%3D%0A&s=db61fa19a638054d77047c5a1dfa17d895537e06221a2f77abc11285539051cb
>>
>> +
>> +Package: libwaffle-1
>> +Architecture: any
>> +Depends: ${shlibs:Depends}, ${misc:Pre-Depends}, ${misc:Depends}
>> +Description: Waffle library utilities
>> + A library for selecting GL API and window system at runtime
>
> Minor nit: s/GL/an OpenGL/

I pulled this text from the first line of the README.txt. I also see a
similar issue on the web-page and the other distro packages.

Maybe this can be addressed as a separate cleanup?

-Jordan

> more GL->OpenGL below.
>
>
>> +
>> +Package: libwaffle-dev
>> +Architecture: any
>> +Section: libdevel
>> +Depends: libwaffle-1 (= ${binary:Version})
>> +Suggests: libwaffle-doc
>> +Description: Waffle library utilities
>> + A library for selecting GL API and window system at runtime
>> + .
>> + This package provides the development environment for compiling
>> + programs against the waffle library.
>> +
>> +Package: libwaffle-doc
>> +Architecture: all
>> +Section: doc
>> +Description: Waffle library utilities
>> + A library for selecting GL API and window system at runtime
>> + .
>> + This package provides the documentation files for the waffle
>> + library.
>> +
>> +Package: waffle-utils
>> +Architecture: any
>> +Section: utils
>> +Depends: libwaffle-1 (= ${binary:Version})
>> +Description: Waffle library utilities
>> + A library for selecting GL API and window system at runtime
>> + .
>> + This package contains waffle utilities.
>> + * wflinfo: Creates a GL context and prints information about
>> +            the created context.
>> diff --git a/debian/copyright b/debian/copyright
>> new file mode 100644
>> index 0000000..891b397
>> --- /dev/null
>> +++ b/debian/copyright
>> @@ -0,0 +1,33 @@
>> +Format:
>> https://urldefense.proofpoint.com/v1/url?u=http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=4Ee2aLuF%2BZDtxBGN2kuCAvxWpu7nT3GllQcQCkVD4D4%3D%0A&s=66ed7a00fc1dde0db2110fc43b5054b5cccdc1f26bebffb85d231d0551f36dcf
>>
>> +Upstream-Name: waffle
>> +Upstream-Contact: Chad Versace <chad.versace at linux.intel.com>
>> +Source:
>> https://urldefense.proofpoint.com/v1/url?u=http://cgit.freedesktop.org/~chadversary/waffle&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=4Ee2aLuF%2BZDtxBGN2kuCAvxWpu7nT3GllQcQCkVD4D4%3D%0A&s=db61fa19a638054d77047c5a1dfa17d895537e06221a2f77abc11285539051cb
>>
>> +
>> +Files: *
>> +Copyright: Intel Corproation
>> +License: BSD-2-clause
>> +
>> +License: BSD-2-clause
>> + Copyright 2012 Intel Corporation
>> + All rights reserved.
>> + .
>> + Redistribution and use in source and binary forms, with or without
>> + modification, are permitted provided that the following conditions are
>> met:
>> + .
>> + - Redistributions of source code must retain the above copyright notice,
>> this
>> +   list of conditions and the following disclaimer.
>> + .
>> + - Redistributions in binary form must reproduce the above copyright
>> notice,
>> +   this list of conditions and the following disclaimer in the
>> documentation
>> +   and/or other materials provided with the distribution.
>> + .
>> + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
>> IS"
>> + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>> THE
>> + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>> PURPOSE ARE
>> + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
>> LIABLE
>> + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>> CONSEQUENTIAL
>> + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
>> OR
>> + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
>> HOWEVER
>> + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
>> LIABILITY,
>> + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
>> THE USE
>> + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>> diff --git a/debian/libwaffle-1.install b/debian/libwaffle-1.install
>> new file mode 100644
>> index 0000000..c5f7935
>> --- /dev/null
>> +++ b/debian/libwaffle-1.install
>> @@ -0,0 +1 @@
>> +usr/lib/*/libwaffle-1.so.*
>> \ No newline at end of file
>> diff --git a/debian/libwaffle-dev.install b/debian/libwaffle-dev.install
>> new file mode 100644
>> index 0000000..c1a5d18
>> --- /dev/null
>> +++ b/debian/libwaffle-dev.install
>> @@ -0,0 +1,2 @@
>> +usr/lib/*/libwaffle-1.so
>> +usr/lib/*/pkgconfig
>> \ No newline at end of file
>> diff --git a/debian/libwaffle-doc.install b/debian/libwaffle-doc.install
>> new file mode 100644
>> index 0000000..8bf7f4f
>> --- /dev/null
>> +++ b/debian/libwaffle-doc.install
>> @@ -0,0 +1,2 @@
>> +usr/share/man/man3
>> +usr/share/man/man7
>> diff --git a/debian/rules b/debian/rules
>> new file mode 100755
>> index 0000000..6b246bd
>> --- /dev/null
>> +++ b/debian/rules
>> @@ -0,0 +1,21 @@
>> +#!/usr/bin/make -f
>> +# Copyright (c) 2013 Intel Corporation
>> +
>> +DEB_DESTDIR := $(CURDIR)/debian/tmp
>> +
>> +%:
>> +       dh $@ --buildsystem cmake
>> +
>> +override_dh_auto_configure:
>> +       dh_auto_configure -- \
>> +               -DCMAKE_BINARY_DIR=$(CURDIR)/debian/tmp \
>> +               -DCMAKE_INSTALL_PREFIX=/usr \
>> +               -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
>> +               -DCMAKE_BUILD_TYPE=Release \
>> +               -Dwaffle_has_gbm=1 \
>> +               -Dwaffle_has_glx=1 \
>> +               -Dwaffle_has_x11_egl=1 \
>> +               -Dwaffle_has_wayland=1 \
>> +               -Dwaffle_build_manpages=1 \
>> +               -Dwaffle_build_htmldocs=0 \
>> +               -Dwaffle_build_examples=0
>> diff --git a/debian/waffle-utils.install b/debian/waffle-utils.install
>> new file mode 100644
>> index 0000000..98d1583
>> --- /dev/null
>> +++ b/debian/waffle-utils.install
>> @@ -0,0 +1,2 @@
>> +usr/bin
>> +usr/share/man/man1
>>
>
> _______________________________________________
> waffle mailing list
> waffle at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/waffle