Advertisement
Guest User

Untitled

a guest
Jul 4th, 2015
269
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.96 KB | None | 0 0
  1. diff -Nru mutter-3.16.2/debian/changelog mutter-3.16.3/debian/changelog
  2. --- mutter-3.16.2/debian/changelog  2015-06-03 21:15:06.000000000 +1000
  3. +++ mutter-3.16.3/debian/changelog  2015-07-04 15:18:58.000000000 +1000
  4. @@ -1,3 +1,32 @@
  5. +mutter (3.16.3-1ubuntu1) wily; urgency=low
  6. +
  7. +  * Merge from Debian unstable.  Remaining changes:
  8. +    - Add Replaces for previous libmutter sonames, so that the library
  9. +      upgrades properly.
  10. +
  11. + -- Jackson Doak <noskcaj@ubuntu.com>  Thu, 02 Jul 2015 22:50:30 +0000
  12. +
  13. +mutter (3.16.3-1) unstable; urgency=medium
  14. +
  15. +  * New upstream release.
  16. +  * Refresh patches.
  17. +
  18. + -- Michael Biebl <biebl@debian.org>  Thu, 02 Jul 2015 18:57:22 +0200
  19. +
  20. +mutter (3.16.2-3) unstable; urgency=medium
  21. +
  22. +  * Cherry-pick upstream commit which fixes the issue that window resize
  23. +    handles were not shown.
  24. +  * Drop obsolete Breaks/Replaces from pre-wheezy.
  25. +
  26. + -- Michael Biebl <biebl@debian.org>  Tue, 30 Jun 2015 19:42:14 +0200
  27. +
  28. +mutter (3.16.2-2) unstable; urgency=medium
  29. +
  30. +  * Upload to unstable.
  31. +
  32. + -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 14 Jun 2015 13:44:02 +0200
  33. +
  34.  mutter (3.16.2-1ubuntu1) wily; urgency=medium
  35.  
  36.    * Merge with Debian, Remaining Changes
  37. @@ -22,8 +51,9 @@
  38.  
  39.    [ Emilio Pozuelo Monfort ]
  40.    * New upstream release 3.16.2.
  41. +  * Upload to experimental.
  42.  
  43. - -- Sjoerd Simons <sjoerd@debian.org>  Wed, 06 May 2015 17:25:44 +0200
  44. + -- Emilio Pozuelo Monfort <pochu@debian.org>  Wed, 27 May 2015 19:55:29 +0200
  45.  
  46.  mutter (3.14.4-2) unstable; urgency=medium
  47.  
  48. diff -Nru mutter-3.16.2/debian/control mutter-3.16.3/debian/control
  49. --- mutter-3.16.2/debian/control    2015-06-03 21:30:58.000000000 +1000
  50. +++ mutter-3.16.3/debian/control    2015-07-04 15:19:40.000000000 +1000
  51. @@ -7,7 +7,7 @@
  52.  Priority: optional
  53.  Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
  54.  XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
  55. -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>
  56. +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>
  57.  Build-Depends: cdbs (>= 0.4.90),
  58.                 debhelper (>= 9),
  59.                 gnome-pkg-tools (>= 0.10),
  60. @@ -68,8 +68,6 @@
  61.           zenity
  62.  Provides: x-window-manager
  63.  Recommends: gnome-session | x-session-manager
  64. -Replaces: mutter-common (<< 2.91.91-1)
  65. -Breaks: mutter-common (<< 2.91.91-1)
  66.  Suggests: gnome-control-center (>= 1:3.4.0),
  67.            xdg-user-dirs
  68.  Description: lightweight GTK+ window manager
  69. @@ -126,7 +124,6 @@
  70.  Section: misc
  71.  Architecture: all
  72.  Depends: ${misc:Depends}
  73. -Replaces: mutter (<< 1:2.16.3)
  74.  Description: shared files for the Mutter window manager
  75.   Mutter is a small window manager, using GTK+ and Clutter to do
  76.   everything.
  77. diff -Nru mutter-3.16.2/debian/control.in mutter-3.16.3/debian/control.in
  78. --- mutter-3.16.2/debian/control.in 2015-06-03 21:16:34.000000000 +1000
  79. +++ mutter-3.16.3/debian/control.in 2015-07-03 08:50:28.000000000 +1000
  80. @@ -64,8 +64,6 @@
  81.           zenity
  82.  Provides: x-window-manager
  83.  Recommends: gnome-session | x-session-manager
  84. -Replaces: mutter-common (<< 2.91.91-1)
  85. -Breaks: mutter-common (<< 2.91.91-1)
  86.  Suggests: gnome-control-center (>= 1:3.4.0),
  87.            xdg-user-dirs
  88.  Description: lightweight GTK+ window manager
  89. @@ -122,7 +120,6 @@
  90.  Section: misc
  91.  Architecture: all
  92.  Depends: ${misc:Depends}
  93. -Replaces: mutter (<< 1:2.16.3)
  94.  Description: shared files for the Mutter window manager
  95.   Mutter is a small window manager, using GTK+ and Clutter to do
  96.   everything.
  97. diff -Nru mutter-3.16.2/debian/patches/01_Wcast-align.patch mutter-3.16.3/debian/patches/01_Wcast-align.patch
  98. --- mutter-3.16.2/debian/patches/01_Wcast-align.patch   2015-06-03 21:17:40.000000000 +1000
  99. +++ mutter-3.16.3/debian/patches/01_Wcast-align.patch   2015-07-03 08:50:28.000000000 +1000
  100. @@ -1,8 +1,8 @@
  101. -Index: mutter-3.14.1/configure.ac
  102. +Index: mutter-3.16.3/configure.ac
  103.  ===================================================================
  104. ---- mutter-3.14.1.orig/configure.ac    2014-10-15 23:47:04.942780626 +0200
  105. -+++ mutter-3.14.1/configure.ac 2014-10-15 23:47:04.938780626 +0200
  106. -@@ -362,11 +362,6 @@
  107. +--- mutter-3.16.3.orig/configure.ac    2015-07-02 18:53:12.248070631 +0200
  108. ++++ mutter-3.16.3/configure.ac 2015-07-02 18:53:12.248070631 +0200
  109. +@@ -379,11 +379,6 @@
  110.       esac
  111.  
  112.       case " $CFLAGS " in
  113. diff -Nru mutter-3.16.2/doc/reference/html/annotation-glossary.html mutter-3.16.3/doc/reference/html/annotation-glossary.html
  114. --- mutter-3.16.2/doc/reference/html/annotation-glossary.html   2015-05-14 23:25:00.000000000 +1000
  115. +++ mutter-3.16.3/doc/reference/html/annotation-glossary.html   2015-07-02 22:18:51.000000000 +1000
  116. @@ -7,13 +7,15 @@
  117.  <link rel="home" href="index.html" title="Mutter Reference Manual">
  118.  <link rel="up" href="index.html" title="Mutter Reference Manual">
  119.  <link rel="prev" href="deprecated-api-index.html" title="Index of deprecated API">
  120. -<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
  121. +<meta name="generator" content="GTK-Doc V1.24.1 (XML mode)">
  122.  <link rel="stylesheet" href="style.css" type="text/css">
  123.  </head>
  124.  <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
  125.  <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
  126.  <td width="100%" align="left" class="shortcuts"><span id="nav_glossary"><a class="shortcut" href="#glsA">A</a>
  127.                       <span class="dim">|</span> 
  128. +                  <a class="shortcut" href="#glsC">C</a>
  129. +                     <span class="dim">|</span> 
  130.                    <a class="shortcut" href="#glsE">E</a>
  131.                       <span class="dim">|</span> 
  132.                    <a class="shortcut" href="#glsN">N</a>
  133. @@ -36,6 +38,9 @@
  134.  <dd class="glossdef"><p>NULL is OK, both for passing and for returning.</p></dd>
  135.  <dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt>
  136.  <dd class="glossdef"><p>Parameter points to an array of items.</p></dd>
  137. +<a name="glsC"></a><h3 class="title">C</h3>
  138. +<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt>
  139. +<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
  140.  <a name="glsE"></a><h3 class="title">E</h3>
  141.  <dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
  142.  <dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
  143. @@ -63,7 +68,6 @@
  144.  <dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
  145.  </div>
  146.  <div class="footer">
  147. -<hr>
  148. -          Generated by GTK-Doc V1.21.1</div>
  149. +<hr>Generated by GTK-Doc V1.24.1</div>
  150.  </body>
  151.  </html>
  152. \ No newline at end of file
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement