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

[Cosme Domínguez]

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

[Bryce Harrington (bryce)]

Thanks, looks good.

review: Approve (packaging)

=== 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 @@
-See /usr/share/doc/quilt/README.source
-
- -- Bryce Harrington <[e-mail]>, Wed, 24 Nov 2010 16:43:12 -0800

=== 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 @@
+wayland (0.1~git20110214.e4762a6a-0ubuntu2) oneiric; urgency=low
+
+  * Simplify debian/rules code
+  * Fix almost all lintian complaints (LP: #724608)
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Cosme Domínguez Díaz <[e-mail]>  Tue, 17 May 2011 21:54:23 +0000
+
 wayland (0.1~git20110214.e4762a6a-0ubuntu1) natty; urgency=low
 
   * Update to new git snapshot from 2011-02-14 up to commit e4762a6a. (This

=== 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 @@
-5
+8

=== 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 @@
 Maintainer: Ubuntu Core Developers <[e-mail]>
 Uploaders: Bryce Harrington <[e-mail]>
 Build-Depends:
- debhelper (>= 5),
+ debhelper (>= 8),
  pkg-config,
  dpkg-dev (>= 1.14.17),
- automake,
- libtool,
- quilt,
+ dh-autoreconf,
  libcairo2-dev (>= 1.10.2-2),
  libdrm-dev (>= 2.4.23) [!hurd-i386],
  libegl1-mesa-dev (>= 7.10.1~git20110215.cc1636b6-0ubuntu2),
@@ -25,6 +23,7 @@
  libxcb-xfixes0-dev,
  libxkbcommon-dev
 Standards-Version: 3.9.1
+Homepage: http://wayland.freedesktop.org
 
 Package: wayland
 Architecture: any
@@ -37,7 +36,7 @@
  libgles2-mesa,
  libwayland-server0 (= ${binary:Version}),
  libwayland-client0 (= ${binary:Version})
-Description: display server -- A nano, non-X11 graphical display server
+Description: nano, non-X11 graphical display server
  The Wayland display server is a minimal graphics server which relies on
  the kernel for modesetting, batchbuffer submission, and hardware
  initialization.  It leaves window management and most desktop policy to
@@ -58,7 +57,7 @@
  libdrm-dev,
  wayland (= ${binary:Version})
 Pre-Depends: x11-common (>= 1:7.0.0)
-Description: display server -- A nano, non-X11 graphical display server
+Description: nano, non-X11 graphical display server (development files)
  The Wayland display server is a minimal graphics server which relies on
  the kernel for modesetting, batchbuffer submission, and hardware
  initialization.  It leaves window management and most desktop policy to
@@ -73,7 +72,7 @@
 Depends: wayland (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Section: debug
 Priority: extra
-Description: display server -- A nano, non-X11 graphical display server
+Description: nano, non-X11 graphical display server (debugging symbols)
  The Wayland display server is a minimal graphics server which relies on
  the kernel for modesetting, batchbuffer submission, and hardware
  initialization.  It leaves window management and most desktop policy to
@@ -87,7 +86,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: display server -- A nano, non-X11 graphical display server
+Description: nano, non-X11 graphical display server (client shared libs)
  The Wayland display server is a minimal graphics server which relies on
  the kernel for modesetting, batchbuffer submission, and hardware
  initialization.  It leaves window management and most desktop policy to
@@ -97,10 +96,10 @@
  This package provides shared libraries for use by clients.
 
 Package: libwayland-server-dev
-Section: libs
+Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: display server -- A nano, non-X11 graphical display server
+Description: nano, non-X11 graphical display server (server dev files)
  The Wayland display server is a minimal graphics server which relies on
  the kernel for modesetting, batchbuffer submission, and hardware
  initialization.  It leaves window management and most desktop policy to
@@ -113,7 +112,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: display server -- A nano, non-X11 graphical display server
+Description: nano, non-X11 graphical display server (server shared libs)
  The Wayland display server is a minimal graphics server which relies on
  the kernel for modesetting, batchbuffer submission, and hardware
  initialization.  It leaves window management and most desktop policy to
@@ -123,10 +122,10 @@
  This package provides shared server libraries.
 
 Package: libwayland-client-dev
-Section: libs
+Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: display server -- A nano, non-X11 graphical display server
+Description: nano, non-X11 graphical display server (client dev files)
  The Wayland display server is a minimal graphics server which relies on
  the kernel for modesetting, batchbuffer submission, and hardware
  initialization.  It leaves window management and most desktop policy to

=== 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 @@
  .
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
 Files: data/*

=== 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 @@
 #!/usr/bin/make -f
-# debian/rules for the Debian xserver-xorg-driver-ati package.
-# Copyright © 2004 Scott James Remnant <[e-mail]>
-# Copyright © 2005 Daniel Stone <[e-mail]>
-# Copyright © 2005 David Nusinow <[e-mail]>
-
-# comment this to turn off verbose mode.
-export DH_VERBOSE=1
 
 include debian/xsfbs/xsfbs.mk
 
-CFLAGS = -Wall -g -fvisibility=hidden
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+NUMJOBS = $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-	confflags += --build=$(DEB_HOST_GNU_TYPE)
 else
-	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+	DEB_BUILD_OPTIONS += parallel=$(NUMJOBS)
+	export DEB_BUILD_OPTIONS
 endif
 
-configure: $(STAMP_DIR)/patch
-	dh_testdir
-	autoreconf -vfi
-
-build/config.status: configure
-	dh_testdir
-	test -d build || mkdir build
-	cd build && \
-	../configure --prefix=/usr \
+override_dh_auto_configure:
+	dh_auto_configure -- --prefix=/usr \
 		--program-prefix="wayland-" \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--sysconfdir=\$${prefix}/etc \
-		$(confflags) \
-		CFLAGS="$(CFLAGS) -I$(CURDIR)/build/wayland"
-
-.PHONY: build
-build: build-stamp
-build-stamp: build/config.status
-	dh_testdir
-	cd build && $(MAKE)
-	>$@
-
-clean: clean-patched unpatch
-	rm -rf .pc
-	rm -r stampdir
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	rm -f config.cache config.log config.status
-	rm -f */config.cache */config.log */config.status
-	rm -f conftest* */conftest*
-	rm -rf autom4te.cache */autom4te.cache
-	rm -rf build
-	rm -f compile config.guess config.sub configure depcomp install-sh
-	rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	cp compositor/70-wayland.rules build/
-	cp data/*.png build/data/
-
-	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	test -d $(CURDIR)/debian/tmp/lib/udev/rules.d || mkdir -p $(CURDIR)/debian/tmp/lib/udev/rules.d
-	cp compositor/70-wayland.rules $(CURDIR)/debian/tmp/lib/udev/rules.d/
-
-	#XXX probably better to patch source to install libs properly
-	test -d $(CURDIR)/debian/tmp/usr/lib/pkgconfig || mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
-	cp build/wayland/.libs/*.a $(CURDIR)/debian/tmp/usr/lib/
-	cp build/wayland/.libs/*.so $(CURDIR)/debian/tmp/usr/lib/
-	cp build/wayland/.libs/*.so.* $(CURDIR)/debian/tmp/usr/lib/
-	cp build/wayland/*.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig/
-
-	#test -d $(CURDIR)/debian/tmp/usr/bin || mkdir -p $(CURDIR)/debian/tmp/usr/bin
-	cp build/clients/.libs/*.a $(CURDIR)/debian/tmp/usr/lib/
-
-	#XXX probably better to patch source to install data in the Makefile
-	test -d $(CURDIR)/debian/tmp/usr/share/wayland || mkdir -p $(CURDIR)/debian/tmp/usr/share/wayland
-	cp build/data/*.png $(CURDIR)/debian/tmp/usr/share/wayland/
-
-	test -d $(CURDIR)/debian/tmp/usr/bin || mkdir -p $(CURDIR)/debian/tmp/usr/bin
-	cp $(CURDIR)/debian/wstart $(CURDIR)/debian/tmp/usr/bin
-
-
-# Build architecture-dependent files here.
-binary-arch: DH_OPTIONS=-s
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-
-	dh_installdocs
-	dh_installchangelogs ChangeLog
-	dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=usr/share/man/man4
-	dh_installman
-	dh_installudev
-	dh_link
+		--sysconfdir=\$${prefix}/etc
+
+override_dh_install:
+	cp debian/wstart debian/tmp/usr/bin
+	cp wayland/.libs/libwayland-util.a debian/tmp/usr/lib/
+	test -d debian/tmp/lib/udev/rules.d || \
+		mkdir -p debian/tmp/lib/udev/rules.d
+	cp compositor/70-wayland.rules debian/tmp/lib/udev/rules.d/
+	dh_install --list-missing --exclude=.la --exclude=usr/share/man/man4
+
+override_dh_strip:
 	dh_strip -pwayland --dbg-package=wayland-dbg
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	#dh_shlibdeps -- --warnings=6
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+
+%:
+	dh $@ --parallel --with autoreconf