Ubuntu
wayland package

Merge lp:~cosme/ubuntu/oneiric/wayland/wayland into lp:ubuntu/oneiric/wayland

  1. Oneiric (11.10)
  2. wayland
  3. Merge into oneiric
Proposed by Cosme Domínguez
Status: Merged
Merge reported by: Bryce Harrington
Merged at revision: not available
Proposed branch: lp:~cosme/ubuntu/oneiric/wayland/wayland
Merge into: lp:ubuntu/oneiric/wayland
Diff against target: 295 lines (+41/-134)
6 files modified
debian/README.source (+0/-3)
debian/changelog (+8/-0)
debian/compat (+1/-1)
debian/control (+12/-13)
debian/copyright (+1/-1)
debian/rules (+19/-116)
To merge this branch: bzr merge lp:~cosme/ubuntu/oneiric/wayland/wayland
Reviewer Review Type Date Requested Status
Bryce Harrington packaging Approve
Review via email: mp+61327@code.launchpad.net

Description of the change

  * Simplify debian/rules code
  * Fix almost all lintian complaints (LP: #724608)
  * Switch to dpkg-source 3.0 (quilt) format

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks, looks good.

review: Approve (packaging)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'debian/README.source'
--- debian/README.source 2011-02-21 18:35:33 +0000
+++ debian/README.source 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1See /usr/share/doc/quilt/README.source
2
3 -- Bryce Harrington <bryce@ubuntu.com>, Wed, 24 Nov 2010 16:43:12 -0800
40
=== modified file 'debian/changelog'
--- debian/changelog 2011-02-23 18:13:23 +0000
+++ debian/changelog 2011-05-17 22:28:16 +0000
@@ -1,3 +1,11 @@
1wayland (0.1~git20110214.e4762a6a-0ubuntu2) oneiric; urgency=low
2
3 * Simplify debian/rules code
4 * Fix almost all lintian complaints (LP: #724608)
5 * Switch to dpkg-source 3.0 (quilt) format
6
7 -- Cosme Domínguez Díaz <cosme.ddiaz@gmail.com> Tue, 17 May 2011 21:54:23 +0000
8
1wayland (0.1~git20110214.e4762a6a-0ubuntu1) natty; urgency=low9wayland (0.1~git20110214.e4762a6a-0ubuntu1) natty; urgency=low
210
3 * Update to new git snapshot from 2011-02-14 up to commit e4762a6a. (This11 * Update to new git snapshot from 2011-02-14 up to commit e4762a6a. (This
412
=== modified file 'debian/compat'
--- debian/compat 2011-02-21 18:35:33 +0000
+++ debian/compat 2011-05-17 22:28:16 +0000
@@ -1,1 +1,1 @@
1518
22
=== modified file 'debian/control'
--- debian/control 2011-02-21 18:35:33 +0000
+++ debian/control 2011-05-17 22:28:16 +0000
@@ -4,12 +4,10 @@
4Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Uploaders: Bryce Harrington <bryce@canonical.com>5Uploaders: Bryce Harrington <bryce@canonical.com>
6Build-Depends:6Build-Depends:
7 debhelper (>= 5),7 debhelper (>= 8),
8 pkg-config,8 pkg-config,
9 dpkg-dev (>= 1.14.17),9 dpkg-dev (>= 1.14.17),
10 automake,10 dh-autoreconf,
11 libtool,
12 quilt,
13 libcairo2-dev (>= 1.10.2-2),11 libcairo2-dev (>= 1.10.2-2),
14 libdrm-dev (>= 2.4.23) [!hurd-i386],12 libdrm-dev (>= 2.4.23) [!hurd-i386],
15 libegl1-mesa-dev (>= 7.10.1~git20110215.cc1636b6-0ubuntu2),13 libegl1-mesa-dev (>= 7.10.1~git20110215.cc1636b6-0ubuntu2),
@@ -25,6 +23,7 @@
25 libxcb-xfixes0-dev,23 libxcb-xfixes0-dev,
26 libxkbcommon-dev24 libxkbcommon-dev
27Standards-Version: 3.9.125Standards-Version: 3.9.1
26Homepage: http://wayland.freedesktop.org
2827
29Package: wayland28Package: wayland
30Architecture: any29Architecture: any
@@ -37,7 +36,7 @@
37 libgles2-mesa,36 libgles2-mesa,
38 libwayland-server0 (= ${binary:Version}),37 libwayland-server0 (= ${binary:Version}),
39 libwayland-client0 (= ${binary:Version})38 libwayland-client0 (= ${binary:Version})
40Description: display server -- A nano, non-X11 graphical display server39Description: nano, non-X11 graphical display server
41 The Wayland display server is a minimal graphics server which relies on40 The Wayland display server is a minimal graphics server which relies on
42 the kernel for modesetting, batchbuffer submission, and hardware41 the kernel for modesetting, batchbuffer submission, and hardware
43 initialization. It leaves window management and most desktop policy to42 initialization. It leaves window management and most desktop policy to
@@ -58,7 +57,7 @@
58 libdrm-dev,57 libdrm-dev,
59 wayland (= ${binary:Version})58 wayland (= ${binary:Version})
60Pre-Depends: x11-common (>= 1:7.0.0)59Pre-Depends: x11-common (>= 1:7.0.0)
61Description: display server -- A nano, non-X11 graphical display server60Description: nano, non-X11 graphical display server (development files)
62 The Wayland display server is a minimal graphics server which relies on61 The Wayland display server is a minimal graphics server which relies on
63 the kernel for modesetting, batchbuffer submission, and hardware62 the kernel for modesetting, batchbuffer submission, and hardware
64 initialization. It leaves window management and most desktop policy to63 initialization. It leaves window management and most desktop policy to
@@ -73,7 +72,7 @@
73Depends: wayland (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}72Depends: wayland (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
74Section: debug73Section: debug
75Priority: extra74Priority: extra
76Description: display server -- A nano, non-X11 graphical display server75Description: nano, non-X11 graphical display server (debugging symbols)
77 The Wayland display server is a minimal graphics server which relies on76 The Wayland display server is a minimal graphics server which relies on
78 the kernel for modesetting, batchbuffer submission, and hardware77 the kernel for modesetting, batchbuffer submission, and hardware
79 initialization. It leaves window management and most desktop policy to78 initialization. It leaves window management and most desktop policy to
@@ -87,7 +86,7 @@
87Section: libs86Section: libs
88Architecture: any87Architecture: any
89Depends: ${shlibs:Depends}, ${misc:Depends}88Depends: ${shlibs:Depends}, ${misc:Depends}
90Description: display server -- A nano, non-X11 graphical display server89Description: nano, non-X11 graphical display server (client shared libs)
91 The Wayland display server is a minimal graphics server which relies on90 The Wayland display server is a minimal graphics server which relies on
92 the kernel for modesetting, batchbuffer submission, and hardware91 the kernel for modesetting, batchbuffer submission, and hardware
93 initialization. It leaves window management and most desktop policy to92 initialization. It leaves window management and most desktop policy to
@@ -97,10 +96,10 @@
97 This package provides shared libraries for use by clients.96 This package provides shared libraries for use by clients.
9897
99Package: libwayland-server-dev98Package: libwayland-server-dev
100Section: libs99Section: libdevel
101Architecture: any100Architecture: any
102Depends: ${shlibs:Depends}, ${misc:Depends}101Depends: ${shlibs:Depends}, ${misc:Depends}
103Description: display server -- A nano, non-X11 graphical display server102Description: nano, non-X11 graphical display server (server dev files)
104 The Wayland display server is a minimal graphics server which relies on103 The Wayland display server is a minimal graphics server which relies on
105 the kernel for modesetting, batchbuffer submission, and hardware104 the kernel for modesetting, batchbuffer submission, and hardware
106 initialization. It leaves window management and most desktop policy to105 initialization. It leaves window management and most desktop policy to
@@ -113,7 +112,7 @@
113Section: libs112Section: libs
114Architecture: any113Architecture: any
115Depends: ${shlibs:Depends}, ${misc:Depends}114Depends: ${shlibs:Depends}, ${misc:Depends}
116Description: display server -- A nano, non-X11 graphical display server115Description: nano, non-X11 graphical display server (server shared libs)
117 The Wayland display server is a minimal graphics server which relies on116 The Wayland display server is a minimal graphics server which relies on
118 the kernel for modesetting, batchbuffer submission, and hardware117 the kernel for modesetting, batchbuffer submission, and hardware
119 initialization. It leaves window management and most desktop policy to118 initialization. It leaves window management and most desktop policy to
@@ -123,10 +122,10 @@
123 This package provides shared server libraries.122 This package provides shared server libraries.
124123
125Package: libwayland-client-dev124Package: libwayland-client-dev
126Section: libs125Section: libdevel
127Architecture: any126Architecture: any
128Depends: ${shlibs:Depends}, ${misc:Depends}127Depends: ${shlibs:Depends}, ${misc:Depends}
129Description: display server -- A nano, non-X11 graphical display server128Description: nano, non-X11 graphical display server (client dev files)
130 The Wayland display server is a minimal graphics server which relies on129 The Wayland display server is a minimal graphics server which relies on
131 the kernel for modesetting, batchbuffer submission, and hardware130 the kernel for modesetting, batchbuffer submission, and hardware
132 initialization. It leaves window management and most desktop policy to131 initialization. It leaves window management and most desktop policy to
133132
=== modified file 'debian/copyright'
--- debian/copyright 2011-02-23 18:13:23 +0000
+++ debian/copyright 2011-05-17 22:28:16 +0000
@@ -74,7 +74,7 @@
74 .74 .
75 You should have received a copy of the GNU General Public License75 You should have received a copy of the GNU General Public License
76 along with this program; if not, write to the Free Software Foundation,76 along with this program; if not, write to the Free Software Foundation,
77 Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.77 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
7878
7979
80Files: data/*80Files: data/*
8181
=== modified file 'debian/rules'
--- debian/rules 2011-02-21 18:35:33 +0000
+++ debian/rules 2011-05-17 22:28:16 +0000
@@ -1,130 +1,33 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# debian/rules for the Debian xserver-xorg-driver-ati package.
3# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
4# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
5# Copyright © 2005 David Nusinow <dnusinow@debian.org>
6
7# comment this to turn off verbose mode.
8export DH_VERBOSE=1
92
10include debian/xsfbs/xsfbs.mk3include debian/xsfbs/xsfbs.mk
114
12CFLAGS = -Wall -g -fvisibility=hidden5NUMJOBS = $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
13ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
14 CFLAGS += -O0
15else
16 CFLAGS += -O2
17endif
18ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))6ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
19 NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))7 NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
20 MAKEFLAGS += -j$(NUMJOBS)8 MAKEFLAGS += -j$(NUMJOBS)
21endif
22
23DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
24DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
25DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
26ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
27 confflags += --build=$(DEB_HOST_GNU_TYPE)
28else9else
29 confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)10 DEB_BUILD_OPTIONS += parallel=$(NUMJOBS)
11 export DEB_BUILD_OPTIONS
30endif12endif
3113
32configure: $(STAMP_DIR)/patch14override_dh_auto_configure:
33 dh_testdir15 dh_auto_configure -- --prefix=/usr \
34 autoreconf -vfi
35
36build/config.status: configure
37 dh_testdir
38 test -d build || mkdir build
39 cd build && \
40 ../configure --prefix=/usr \
41 --program-prefix="wayland-" \16 --program-prefix="wayland-" \
42 --mandir=\$${prefix}/share/man \17 --mandir=\$${prefix}/share/man \
43 --infodir=\$${prefix}/share/info \18 --infodir=\$${prefix}/share/info \
44 --sysconfdir=\$${prefix}/etc \19 --sysconfdir=\$${prefix}/etc
45 $(confflags) \20
46 CFLAGS="$(CFLAGS) -I$(CURDIR)/build/wayland"21override_dh_install:
4722 cp debian/wstart debian/tmp/usr/bin
48.PHONY: build23 cp wayland/.libs/libwayland-util.a debian/tmp/usr/lib/
49build: build-stamp24 test -d debian/tmp/lib/udev/rules.d || \
50build-stamp: build/config.status25 mkdir -p debian/tmp/lib/udev/rules.d
51 dh_testdir26 cp compositor/70-wayland.rules debian/tmp/lib/udev/rules.d/
52 cd build && $(MAKE)27 dh_install --list-missing --exclude=.la --exclude=usr/share/man/man4
53 >$@28
5429override_dh_strip:
55clean: clean-patched unpatch
56 rm -rf .pc
57 rm -r stampdir
58clean-patched:
59 dh_testdir
60 dh_testroot
61 rm -f build-stamp
62
63 rm -f config.cache config.log config.status
64 rm -f */config.cache */config.log */config.status
65 rm -f conftest* */conftest*
66 rm -rf autom4te.cache */autom4te.cache
67 rm -rf build
68 rm -f compile config.guess config.sub configure depcomp install-sh
69 rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
70
71 dh_clean
72
73install: build
74 dh_testdir
75 dh_testroot
76 dh_clean -k
77 dh_installdirs
78
79 cp compositor/70-wayland.rules build/
80 cp data/*.png build/data/
81
82 cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
83 test -d $(CURDIR)/debian/tmp/lib/udev/rules.d || mkdir -p $(CURDIR)/debian/tmp/lib/udev/rules.d
84 cp compositor/70-wayland.rules $(CURDIR)/debian/tmp/lib/udev/rules.d/
85
86 #XXX probably better to patch source to install libs properly
87 test -d $(CURDIR)/debian/tmp/usr/lib/pkgconfig || mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
88 cp build/wayland/.libs/*.a $(CURDIR)/debian/tmp/usr/lib/
89 cp build/wayland/.libs/*.so $(CURDIR)/debian/tmp/usr/lib/
90 cp build/wayland/.libs/*.so.* $(CURDIR)/debian/tmp/usr/lib/
91 cp build/wayland/*.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig/
92
93 #test -d $(CURDIR)/debian/tmp/usr/bin || mkdir -p $(CURDIR)/debian/tmp/usr/bin
94 cp build/clients/.libs/*.a $(CURDIR)/debian/tmp/usr/lib/
95
96 #XXX probably better to patch source to install data in the Makefile
97 test -d $(CURDIR)/debian/tmp/usr/share/wayland || mkdir -p $(CURDIR)/debian/tmp/usr/share/wayland
98 cp build/data/*.png $(CURDIR)/debian/tmp/usr/share/wayland/
99
100 test -d $(CURDIR)/debian/tmp/usr/bin || mkdir -p $(CURDIR)/debian/tmp/usr/bin
101 cp $(CURDIR)/debian/wstart $(CURDIR)/debian/tmp/usr/bin
102
103
104# Build architecture-dependent files here.
105binary-arch: DH_OPTIONS=-s
106binary-arch: build install
107 dh_testdir
108 dh_testroot
109
110 dh_installdocs
111 dh_installchangelogs ChangeLog
112 dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=usr/share/man/man4
113 dh_installman
114 dh_installudev
115 dh_link
116 dh_strip -pwayland --dbg-package=wayland-dbg30 dh_strip -pwayland --dbg-package=wayland-dbg
117 dh_compress31
118 dh_fixperms32%:
119 dh_installdeb33 dh $@ --parallel --with autoreconf
120 #dh_shlibdeps -- --warnings=6
121 dh_gencontrol
122 dh_md5sums
123 dh_builddeb
124
125# Build architecture-independent files here.
126binary-indep: build install
127# Nothing to do
128
129binary: binary-indep binary-arch
130.PHONY: build clean binary-indep binary-arch binary install

Subscribers

People subscribed via source and target branches