Merge lp:~alan-griffiths/miral/debian-control-files into lp:miral

[Alan Griffiths]

First cut at debian files

[Alexandros Frantzis (afrantzis)]

Basic structure is good. A few issues:

+ -- Alan Griffiths <alan@Octopull-desktop> Mon, 08 Aug 2016 10:41:55 +0100

Invalid email address.

+Standards-Version: 3.9.4

You can use the latest standards version 3.9.8 (only available on yakkety lintian, but it can be used with harmless warning in previous releases too).

+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
+EXACT_PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f 2)

Not used.

+COMMON_CONFIGURE_OPTIONS = \

The configure options are set, but not used.

> miral source: no-debian-copyright

Need a debian/copyright file.

> libmiral1: arch-dependent-file-not-in-arch-specific-directory usr/lib/libmiral.so.1

Should be in /usr/lib/<arch>/... especially since we claim to support multi-arch. This is an effect of not using COMMON_CONFIGURE_OPTIONS.

> miral source: no-debian-copyright

Need a debian/copyright file.

> libmiral1: arch-dependent-file-not-in-arch-specific-directory usr/lib/libmiral.so.1

Should be in /usr/lib/<arch>/... especially since we claim to support multi-arch.
A few other lintian complaints:

> miral source: no-debian-copyright

Need a debian/copyright file.

> libmiral1: arch-dependent-file-not-in-arch-specific-directory usr/lib/libmiral.so.1

Should be in /usr/lib/<arch>/... especially since we claim to support multi-arch.

> libmiral-dev: extended-description-line-too-long

Self-explanatory.

review: Needs Fixing

[Alexandros Frantzis (afrantzis)]

Somehow the lintian complaints and notes got duplicated in the previous comment...

[lp:~alan-griffiths/miral/debian-control-files]

262. By Alan Griffiths on 2016-08-08

Fix email address

263. By Alan Griffiths on 2016-08-08

Attempt to fix review comments

264. By Alan Griffiths on 2016-08-08

Fix CMakeLists.txt to match

265. By Alan Griffiths on 2016-08-08

Remove debug code

[Alexandros Frantzis (afrantzis)]

Nits:

+ cmake-data,

Not needed, cmake depend on cmake-data.

+Standards-Version: 3.9.4

Still using an ancient version (not an error, but lintian complains "ancient-standards-version")

review: Approve

[lp:~alan-griffiths/miral/debian-control-files]

266. By Alan Griffiths on 2016-08-10

Fix nits

267. By Alan Griffiths on 2016-08-10

merge lp:miral

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-04 10:35:41 +0000
+++ CMakeLists.txt	2016-08-10 09:40:43 +0000
@@ -5,6 +5,8 @@
     set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "/usr install prefix" FORCE)
 endif()
 
+include (GNUInstallDirs)
+
 cmake_policy(SET CMP0015 NEW)
 cmake_policy(SET CMP0022 NEW)
 

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2016-08-10 09:40:43 +0000
@@ -0,0 +1,5 @@
+miral (0.1.0) UNRELEASED; urgency=medium
+
+  * Initial release. (Closes: #XXXXXX)
+
+ -- Alan Griffiths <[e-mail]>  Mon, 08 Aug 2016 10:41:55 +0100

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2016-08-10 09:40:43 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2016-08-10 09:40:43 +0000
@@ -0,0 +1,67 @@
+Source: miral
+Section: x11
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Alan Griffiths <[e-mail]>
+Build-Depends: cmake,
+               pkg-config,
+               debhelper (>= 9),
+               doxygen,
+               xsltproc,
+               graphviz,
+               pkg-config,
+               python-pil,
+               google-mock (>= 1.6.0+svn437),
+               python3:any,
+               libmirserver-dev,
+               libmirclient-dev,
+               mirtest-dev,
+Standards-Version: 3.9.8
+Homepage: https://launchpad.net/miral
+# If you aren't a member of ~mir-team but need to upload packaging changes,
+# just go ahead. ~mir-team will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/miral
+
+Package: libmiral1
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Display server for Ubuntu - ABI preserving abstraction layer
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared library containing MirAL abstraction layer.
+
+Package: libmiral-dev
+Section: libdevel
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libmiral1 (= ${binary:Version}),
+         ${misc:Depends},
+Description: Display server for Ubuntu - ABI preserving abstraction layer
+ Mir is a display server running on linux systems, with a focus on efficiency
+ robust operation and a well-defined driver model.
+ .
+ Contains header files required for development using the MirAL abstraction
+ layer.
+
+Package: miral-examples
+Architecture: linux-any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Display server for Ubuntu - demonstration programs
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains demo applications that use the MirAL abstraction layer
+
+Package: miral-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends},
+Description: API documentation for MirAL
+ This package installs the MirAL abstraction layer documentation.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2016-08-10 09:40:43 +0000
@@ -0,0 +1,20 @@
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: MirAL
+Upstream-Contact: Alan Griffiths <[e-mail]>
+Source: http://launchpad.net/miral
+
+Files: *
+Copyright: 2016, Canonical Ltd.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3 as
+ published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.

=== added file 'debian/libmiral-dev.install'
--- debian/libmiral-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libmiral-dev.install	2016-08-10 09:40:43 +0000
@@ -0,0 +1,3 @@
+usr/include/miral
+usr/lib/*/pkgconfig/miral.pc
+usr/lib/*/libmiral.so

=== added file 'debian/libmiral1.install'
--- debian/libmiral1.install	1970-01-01 00:00:00 +0000
+++ debian/libmiral1.install	2016-08-10 09:40:43 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libmiral.so.1

=== added file 'debian/miral-doc.install'
--- debian/miral-doc.install	1970-01-01 00:00:00 +0000
+++ debian/miral-doc.install	2016-08-10 09:40:43 +0000
@@ -0,0 +1,1 @@
+usr/share/doc/miral-doc/

=== added file 'debian/miral-examples.install'
--- debian/miral-examples.install	1970-01-01 00:00:00 +0000
+++ debian/miral-examples.install	2016-08-10 09:40:43 +0000
@@ -0,0 +1,5 @@
+usr/bin/miral-shell
+usr/bin/miral-run
+usr/bin/miral-kiosk
+usr/share/applications/miral-shell.desktop
+usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2016-08-10 09:40:43 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
+
+%:
+	dh $@ --parallel --fail-missing --with python3
+
+COMMON_CONFIGURE_OPTIONS = \
+  -DCMAKE_INSTALL_LIBEXECDIR="lib/$(DEB_HOST_MULTIARCH)/miral"\
+
+ifeq ($(filter noopt,$(DEB_BUILD_OPTIONS)),noopt)
+	COMMON_CONFIGURE_OPTIONS += -DMIRAL_USE_LTO=OFF
+else
+	COMMON_CONFIGURE_OPTIONS += -DMIRAL_USE_LTO=ON
+endif
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(COMMON_CONFIGURE_OPTIONS)
+
+# Only build the docs when we need them
+override_dh_auto_build-indep:
+	dh_auto_build -- doc

=== modified file 'miral-kiosk/CMakeLists.txt'
--- miral-kiosk/CMakeLists.txt	2016-04-16 23:13:59 +0000
+++ miral-kiosk/CMakeLists.txt	2016-08-10 09:40:43 +0000
@@ -7,5 +7,5 @@
 target_link_libraries(miral-kiosk miral)
 
 install(TARGETS miral-kiosk
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

=== modified file 'miral-shell/CMakeLists.txt'
--- miral-shell/CMakeLists.txt	2016-07-25 09:02:46 +0000
+++ miral-shell/CMakeLists.txt	2016-08-10 09:40:43 +0000
@@ -22,5 +22,5 @@
 )
 
 install(TARGETS miral-shell
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

=== modified file 'miral/CMakeLists.txt'
--- miral/CMakeLists.txt	2016-08-04 16:26:20 +0000
+++ miral/CMakeLists.txt	2016-08-10 09:40:43 +0000
@@ -49,7 +49,6 @@
         LINK_DEPENDS ${symbol_map}
 )
 
-set(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
 set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/miral")
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/miral.pc.in
@@ -57,6 +56,6 @@
     @ONLY
 )
 
-install(TARGETS     miral                           LIBRARY DESTINATION "${LIBDIR}")
+install(TARGETS     miral                           LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
 install(DIRECTORY   ${CMAKE_SOURCE_DIR}/include/            DESTINATION "${INCLUDEDIR}")
-install(FILES       ${CMAKE_CURRENT_BINARY_DIR}/miral.pc    DESTINATION "${LIBDIR}/pkgconfig")
+install(FILES       ${CMAKE_CURRENT_BINARY_DIR}/miral.pc    DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")