diff options
| author | Iain Lane <iain@orangesquash.org.uk> | 2019-09-24 11:39:19 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2019-09-24 11:41:34 +0200 |
| commit | d2b4da39c4c10f6d070c41b57802a349bbb863b8 (patch) | |
| tree | 0b546d76a75cec9d6548d4acf5a5b65ce8d058c5 | |
| parent | e1fec42e13a644a19d32621cbafedbbd8db22b5b (diff) | |
Import Upstream version 7.5.0+19.04.201908277.5.0+19.04.20190827-0ubuntu1
| -rw-r--r-- | .bzr-builddeb/default.conf | 2 | ||||
| -rw-r--r-- | .bzrignore | 7 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | services/CMakeLists.txt | 2 |
5 files changed, 10 insertions, 11 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf deleted file mode 100644 index 6c96a9847..000000000 --- a/.bzr-builddeb/default.conf +++ /dev/null @@ -1,2 +0,0 @@ -[BUILDDEB] -split = True diff --git a/.bzrignore b/.bzrignore deleted file mode 100644 index 9f5965cb0..000000000 --- a/.bzrignore +++ /dev/null @@ -1,7 +0,0 @@ -build -services/panel-marshal.c -services/panel-marshal.h -.AUTHORS.sed -tests/autopilot/dist -tests/autopilot/unity.egg-info -.bzr-repo diff --git a/CMakeLists.txt b/CMakeLists.txt index 03bbea326..249b8fccd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,7 +209,7 @@ if (BOOT_LOGGER) SET (BOOT_LOGGER_FLAG "-DENABLE_LOGGER") endif (BOOT_LOGGER) -SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations") +SET (MAINTAINER_CXXFLAGS "-Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations") option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON) if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS) diff --git a/debian/changelog b/debian/changelog index f6eb3270a..ebeef1fbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +unity (7.5.0+19.04.20190827-0ubuntu1) eoan; urgency=medium + + * Disable Werror. It doesn't make sense to fail on compiler warnings for the + distro. + * Rebuild against libgnome-desktop-3-18 + + -- Iain Lane <iain@orangesquash.org.uk> Tue, 27 Aug 2019 11:10:00 +0100 + unity (7.5.0+19.04.20190304-0ubuntu1) disco; urgency=medium [ disco/unity: Failed to merge https://git.launchpad.net/unity. ] diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt index fe5dff1f8..2829cd269 100644 --- a/services/CMakeLists.txt +++ b/services/CMakeLists.txt @@ -34,7 +34,7 @@ set(PANEL_SOURCES set(CFLAGS ${SERVICE_DEPS_CFLAGS} ${SERVICE_DEPS_CFLAGS_OTHER} - "-Werror -Wall -Wno-error=deprecated-declarations" + "-Wall -Wno-error=deprecated-declarations" ) string (REPLACE ";" " " CFLAGS "${CFLAGS}") |