Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -Nru mutter-3.16.2/debian/changelog mutter-3.16.3/debian/changelog
- --- mutter-3.16.2/debian/changelog 2015-06-03 21:15:06.000000000 +1000
- +++ mutter-3.16.3/debian/changelog 2015-07-04 15:18:58.000000000 +1000
- @@ -1,3 +1,32 @@
- +mutter (3.16.3-1ubuntu1) wily; urgency=low
- +
- + * Merge from Debian unstable. Remaining changes:
- + - Add Replaces for previous libmutter sonames, so that the library
- + upgrades properly.
- +
- + -- Jackson Doak <noskcaj@ubuntu.com> Thu, 02 Jul 2015 22:50:30 +0000
- +
- +mutter (3.16.3-1) unstable; urgency=medium
- +
- + * New upstream release.
- + * Refresh patches.
- +
- + -- Michael Biebl <biebl@debian.org> Thu, 02 Jul 2015 18:57:22 +0200
- +
- +mutter (3.16.2-3) unstable; urgency=medium
- +
- + * Cherry-pick upstream commit which fixes the issue that window resize
- + handles were not shown.
- + * Drop obsolete Breaks/Replaces from pre-wheezy.
- +
- + -- Michael Biebl <biebl@debian.org> Tue, 30 Jun 2015 19:42:14 +0200
- +
- +mutter (3.16.2-2) unstable; urgency=medium
- +
- + * Upload to unstable.
- +
- + -- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 14 Jun 2015 13:44:02 +0200
- +
- mutter (3.16.2-1ubuntu1) wily; urgency=medium
- * Merge with Debian, Remaining Changes
- @@ -22,8 +51,9 @@
- [ Emilio Pozuelo Monfort ]
- * New upstream release 3.16.2.
- + * Upload to experimental.
- - -- Sjoerd Simons <sjoerd@debian.org> Wed, 06 May 2015 17:25:44 +0200
- + -- Emilio Pozuelo Monfort <pochu@debian.org> Wed, 27 May 2015 19:55:29 +0200
- mutter (3.14.4-2) unstable; urgency=medium
- diff -Nru mutter-3.16.2/debian/control mutter-3.16.3/debian/control
- --- mutter-3.16.2/debian/control 2015-06-03 21:30:58.000000000 +1000
- +++ mutter-3.16.3/debian/control 2015-07-04 15:19:40.000000000 +1000
- @@ -7,7 +7,7 @@
- Priority: optional
- Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
- XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
- -Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
- +Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>
- Build-Depends: cdbs (>= 0.4.90),
- debhelper (>= 9),
- gnome-pkg-tools (>= 0.10),
- @@ -68,8 +68,6 @@
- zenity
- Provides: x-window-manager
- Recommends: gnome-session | x-session-manager
- -Replaces: mutter-common (<< 2.91.91-1)
- -Breaks: mutter-common (<< 2.91.91-1)
- Suggests: gnome-control-center (>= 1:3.4.0),
- xdg-user-dirs
- Description: lightweight GTK+ window manager
- @@ -126,7 +124,6 @@
- Section: misc
- Architecture: all
- Depends: ${misc:Depends}
- -Replaces: mutter (<< 1:2.16.3)
- Description: shared files for the Mutter window manager
- Mutter is a small window manager, using GTK+ and Clutter to do
- everything.
- diff -Nru mutter-3.16.2/debian/control.in mutter-3.16.3/debian/control.in
- --- mutter-3.16.2/debian/control.in 2015-06-03 21:16:34.000000000 +1000
- +++ mutter-3.16.3/debian/control.in 2015-07-03 08:50:28.000000000 +1000
- @@ -64,8 +64,6 @@
- zenity
- Provides: x-window-manager
- Recommends: gnome-session | x-session-manager
- -Replaces: mutter-common (<< 2.91.91-1)
- -Breaks: mutter-common (<< 2.91.91-1)
- Suggests: gnome-control-center (>= 1:3.4.0),
- xdg-user-dirs
- Description: lightweight GTK+ window manager
- @@ -122,7 +120,6 @@
- Section: misc
- Architecture: all
- Depends: ${misc:Depends}
- -Replaces: mutter (<< 1:2.16.3)
- Description: shared files for the Mutter window manager
- Mutter is a small window manager, using GTK+ and Clutter to do
- everything.
- diff -Nru mutter-3.16.2/debian/patches/01_Wcast-align.patch mutter-3.16.3/debian/patches/01_Wcast-align.patch
- --- mutter-3.16.2/debian/patches/01_Wcast-align.patch 2015-06-03 21:17:40.000000000 +1000
- +++ mutter-3.16.3/debian/patches/01_Wcast-align.patch 2015-07-03 08:50:28.000000000 +1000
- @@ -1,8 +1,8 @@
- -Index: mutter-3.14.1/configure.ac
- +Index: mutter-3.16.3/configure.ac
- ===================================================================
- ---- mutter-3.14.1.orig/configure.ac 2014-10-15 23:47:04.942780626 +0200
- -+++ mutter-3.14.1/configure.ac 2014-10-15 23:47:04.938780626 +0200
- -@@ -362,11 +362,6 @@
- +--- mutter-3.16.3.orig/configure.ac 2015-07-02 18:53:12.248070631 +0200
- ++++ mutter-3.16.3/configure.ac 2015-07-02 18:53:12.248070631 +0200
- +@@ -379,11 +379,6 @@
- esac
- case " $CFLAGS " in
- diff -Nru mutter-3.16.2/doc/reference/html/annotation-glossary.html mutter-3.16.3/doc/reference/html/annotation-glossary.html
- --- mutter-3.16.2/doc/reference/html/annotation-glossary.html 2015-05-14 23:25:00.000000000 +1000
- +++ mutter-3.16.3/doc/reference/html/annotation-glossary.html 2015-07-02 22:18:51.000000000 +1000
- @@ -7,13 +7,15 @@
- <link rel="home" href="index.html" title="Mutter Reference Manual">
- <link rel="up" href="index.html" title="Mutter Reference Manual">
- <link rel="prev" href="deprecated-api-index.html" title="Index of deprecated API">
- -<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
- +<meta name="generator" content="GTK-Doc V1.24.1 (XML mode)">
- <link rel="stylesheet" href="style.css" type="text/css">
- </head>
- <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
- <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
- <td width="100%" align="left" class="shortcuts"><span id="nav_glossary"><a class="shortcut" href="#glsA">A</a>
- <span class="dim">|</span>
- + <a class="shortcut" href="#glsC">C</a>
- + <span class="dim">|</span>
- <a class="shortcut" href="#glsE">E</a>
- <span class="dim">|</span>
- <a class="shortcut" href="#glsN">N</a>
- @@ -36,6 +38,9 @@
- <dd class="glossdef"><p>NULL is OK, both for passing and for returning.</p></dd>
- <dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt>
- <dd class="glossdef"><p>Parameter points to an array of items.</p></dd>
- +<a name="glsC"></a><h3 class="title">C</h3>
- +<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt>
- +<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
- <a name="glsE"></a><h3 class="title">E</h3>
- <dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
- <dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
- @@ -63,7 +68,6 @@
- <dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
- </div>
- <div class="footer">
- -<hr>
- - Generated by GTK-Doc V1.21.1</div>
- +<hr>Generated by GTK-Doc V1.24.1</div>
- </body>
- </html>
- \ No newline at end of file
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement