diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 32 | ||||
| -rw-r--r-- | debian/control | 69 | ||||
| -rwxr-xr-x | debian/rules | 5 |
3 files changed, 37 insertions, 69 deletions
diff --git a/debian/changelog b/debian/changelog index 463470f60..66f838f36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,35 @@ +unity (7.4.0+16.04.20151102-0ubuntu1) xenial; urgency=medium + + [ Marco Trevisan (Treviño) ] + * Bumping version to 7.4.0 + * Fix building in xenial + + [ Didier Roche ] + * Remove unity2d transitional packages. We are post trusty LTS, they + are not needed anymore + + [ Marco Trevisan (Treviño) ] + * ApplicationLauncherIcon: if an app is not running and has no desktop + file, add QL item to add to dash + * PanelService: unset the idle ID before removal on callback (LP: + #1501289) + * Unity: use compiz cursorCache to get properly updated cursors (LP: + #1359211) + * UnityScreen: add SpreadAppWindows option and trigger it on + Super+Ctrl+[Shift]+W + + [ Stephen M. Webb ] + * changed the wording of the help message and warning message for the + --reset option (LP: #1486498) + + -- Marco Trevisan (Treviño) <mail@3v1n0.net> Mon, 02 Nov 2015 13:29:58 +0000 + +unity (7.3.3-0ubuntu1) UNRELEASED; urgency=medium + + * Releasing Unity 7.3.3 + + -- Marco Trevisan (Treviño) <marco@ubuntu.com> Mon, 26 Oct 2015 15:37:22 +0100 + unity (7.3.2+15.10.20151016-0ubuntu1) wily; urgency=medium [ Marco Trevisan (Treviño) ] diff --git a/debian/control b/debian/control index 07d2050b2..3df374ba7 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Build-Depends: cmake, - compiz-dev (>= 1:0.9.11), + compiz-dev (>= 1:0.9.12.2), debhelper (>= 9.0.0~), dbus-test-runner, dh-migrations, @@ -13,7 +13,7 @@ Build-Depends: cmake, gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140219), intltool (>= 0.35.0), libatk1.0-dev, - libbamf3-dev (>= 0.5.0+13.10.20130731), + libbamf3-dev (>= 0.5.2~bzr0), libboost-dev, libcairo2-dev, libdbus-1-dev, @@ -201,68 +201,3 @@ Description: Autopiloted tests for Unity bindings to be able to write tests in python as well as the full test suite for Unity. -Package: unity-2d -Depends: unity, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package for unity-2d -> unity migration. - It can safely be removed. - -Package: libunity-2d-private0 -Depends: unity, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package for unity-2d -> unity migration. - It can safely be removed. - -Package: libunity-2d-private-dev -Depends: unity, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package for unity-2d -> unity migration. - It can safely be removed. - -Package: unity-2d-panel -Depends: unity, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package for unity-2d -> unity migration. - It can safely be removed. - -Package: unity-2d-spread -Depends: unity, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package for unity-2d -> unity migration. - It can safely be removed. - -Package: unity-2d-common -Depends: unity, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package for unity-2d -> unity migration. - It can safely be removed. - -Package: unity-2d-shell -Depends: unity, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package for unity-2d -> unity migration. - It can safely be removed. - -Package: unity-2d-dbg -Priority: extra -Depends: unity, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package - This is a transitional dummy package for unity-2d -> unity migration. - It can safely be removed. - diff --git a/debian/rules b/debian/rules index 60ad382f4..9869be6a7 100755 --- a/debian/rules +++ b/debian/rules @@ -27,11 +27,12 @@ cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOM ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures))) cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON endif + +# Workaround for bug #1511542 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), arm64)) - cmake_pch_options := -Duse_pch=OFF + cmake_pch_options := -DENABLE_UNIT_TESTS=OFF endif - override_dh_auto_configure: dh_auto_configure -- $(cmake_base_options) $(cmake_gl_options) $(cmake_pch_options) |