Merge lp:~gilir/gnome-mplayer/gnome-mplayer into lp:~norsetto/gnome-mplayer/gnome-mplayer

[Julien Lavergne]

Update for gnome-mplayer 1.0.0

[lp:~gilir/gnome-mplayer/gnome-mplayer]

68. By Julien Lavergne on 2011-04-05

New upstream release.

69. By Julien Lavergne on 2011-04-05

Add description about the new release and bug fixed.

70. By Julien Lavergne on 2011-04-05

* debian/patches/90_fallback_xscrnsaversuspend.patch:
 - Merged upstream.

71. By Julien Lavergne on 2011-04-10

releasing version 1.0.2-0ubuntu1

72. By Julien Lavergne on 2011-06-22

* debian/patches:
 - Remove empty directory.

Unmerged revisions

72. By Julien Lavergne on 2011-06-22

* debian/patches:
 - Remove empty directory.

71. By Julien Lavergne on 2011-04-10

releasing version 1.0.2-0ubuntu1

70. By Julien Lavergne on 2011-04-05

* debian/patches/90_fallback_xscrnsaversuspend.patch:
 - Merged upstream.

69. By Julien Lavergne on 2011-04-05

Add description about the new release and bug fixed.

68. By Julien Lavergne on 2011-04-05

New upstream release.

67. By Julien Lavergne on 2011-02-14

releasing version 1.0.0-0ubuntu1

66. By Julien Lavergne on 2011-02-14

* debian/patches/90_fallback_xscrnsaversuspend.patch:
 - From upstream, fallback to using XScrnSaverSuspend if the call to
   GnomeSessionManager/ScreenSaver fails.

65. By Julien Lavergne on 2011-02-14

* debian/source/format
 - Convert to 3.0 format

64. By Julien Lavergne on 2011-02-14

Fix embedded fonts (LP: #655469)

63. By Julien Lavergne on 2011-02-14

New upstream release (LP: #709543)

=== added directory 'debian'
=== renamed file 'NEWS' => 'debian/NEWS'
=== renamed file 'README.source' => 'debian/README.source'
=== renamed file 'changelog' => 'debian/changelog'
--- changelog	2010-05-17 13:06:41 +0000
+++ debian/changelog	2011-06-22 17:29:11 +0000
@@ -1,9 +1,36 @@
-gnome-mplayer (0.9.9.2-2) UNRELEASED; urgency=low
-
+gnome-mplayer (1.0.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches:
+   - Remove empty directory. 
+
+ -- Julien Lavergne <[e-mail]>  Wed, 22 Jun 2011 19:26:10 +0200
+
+gnome-mplayer (1.0.2-0ubuntu1) natty; urgency=low
+
+  * New upstream release (LP: #750832)
+   - Doesn't display an error message about VDPAU backend (LP: #712348).
+   - Rework of the Volume control (LP: #695354, #599758)
+  * debian/patches/90_fallback_xscrnsaversuspend.patch:
+   - Merged upstream.
+
+ -- Julien Lavergne <[e-mail]>  Sun, 10 Apr 2011 23:30:39 +0200
+
+gnome-mplayer (1.0.0-0ubuntu1) natty; urgency=low
+
+  [ Cesare Tirabassi ]
   * Updated watch file in line with new google code standard
     (thanks D. Leidert).
 
- -- Cesare Tirabassi <[e-mail]>  Mon, 17 May 2010 15:03:31 +0200
+  [ Julien Lavergne ]
+  * New upstream release (LP: #709543)
+   - Fix embedded fonts (LP: #655469)
+  * debian/source/format
+   - Convert to 3.0 format
+  * debian/patches/90_fallback_xscrnsaversuspend.patch:
+   - From upstream, fallback to using XScrnSaverSuspend if the call to
+     GnomeSessionManager/ScreenSaver fails.
+
+ -- Julien Lavergne <[e-mail]>  Mon, 14 Feb 2011 22:18:10 +0100
 
 gnome-mplayer (0.9.9.2-1) unstable; urgency=low
 

=== renamed file 'compat' => 'debian/compat'
=== renamed file 'control' => 'debian/control'
=== renamed file 'copyright' => 'debian/copyright'
=== renamed file 'docs' => 'debian/docs'
=== renamed file 'gnome-mplayer.manpages' => 'debian/gnome-mplayer.manpages'
=== renamed file 'gnome-mplayer.mime' => 'debian/gnome-mplayer.mime'
=== renamed file 'gnome-mplayer.xpm' => 'debian/gnome-mplayer.xpm'
=== renamed file 'install' => 'debian/install'
=== renamed file 'menu' => 'debian/menu'
=== renamed file 'rules' => 'debian/rules'
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2011-06-22 17:29:11 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== renamed file 'watch' => 'debian/watch'