Merge lp:~costamagnagianfranco/compiz/compiz into lp:compiz/0.9.12

[LocutusOfBorg]

Move libjpeg8-dev to libjpeg-dev and libpng12-dev to libpng-dev, to ease libpng12 removal

[Sam Spilsbury (smspillaz)]

LGTM

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-26 13:33:29 +0000
+++ debian/changelog	2016-05-30 13:36:09 +0000
@@ -1,3 +1,13 @@
+compiz (1:0.9.12.2+16.10.20160526-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Graham Inggs ]
+  * Move libjpeg8-dev to libjpeg-dev
+
+  [ Gianfranco Costamagna ]
+  * Move libpng12-dev to libpng-dev, to ease libpng12 removal.
+
+ -- Gianfranco Costamagna <[e-mail]>  Mon, 30 May 2016 15:27:49 +0200
+
 compiz (1:0.9.12.2+16.10.20160526-0ubuntu1) yakkety; urgency=medium
 
   [ Alberts Muktupāvels ]

=== modified file 'debian/control'
--- debian/control	2016-03-11 14:10:05 +0000
+++ debian/control	2016-05-30 13:36:09 +0000
@@ -24,7 +24,7 @@
                libice-dev (>= 1:1.0.1), 
                libmetacity-dev (>= 1:3.16.0),
                libpango1.0-dev,
-               libpng12-dev | libpng-dev,
+               libpng-dev,
                librsvg2-dev, 
                libsm-dev (>= 1:1.0.1),
                libwnck-3-dev,
@@ -46,7 +46,7 @@
                libstartup-notification0-dev (>= 0.7),
                x11proto-gl-dev (>= 1.4.8),
                libglu1-mesa-dev [!armhf !armel],
-               libjpeg8-dev,
+               libjpeg-dev,
                libnotify-dev,
                libx11-xcb-dev,
                libprotobuf-dev,