r20370 - in /desktop/unstable/brasero/debian: brasero.install changelog control control.in copyright libbrasero-plugins.install patches/011_nautilus_menu_move.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Jun 15 23:13:09 UTC 2009
Author: joss
Date: Mon Jun 15 23:13:08 2009
New Revision: 20370
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20370
Log:
* 011_nautilus_menu_move.patch: add NoDisplay=true, this icon is
duplicating existing functionality (brasero icon in sound&video
menu, and nautilus autorun).
* Update list of copyright holders.
* Brown paper bag reversion of the libbrasero-plugins introduction;
plugins are for brasero, not for the library!
Removed:
desktop/unstable/brasero/debian/libbrasero-plugins.install
Modified:
desktop/unstable/brasero/debian/brasero.install
desktop/unstable/brasero/debian/changelog
desktop/unstable/brasero/debian/control
desktop/unstable/brasero/debian/control.in
desktop/unstable/brasero/debian/copyright
desktop/unstable/brasero/debian/patches/011_nautilus_menu_move.patch
Modified: desktop/unstable/brasero/debian/brasero.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/brasero.install?rev=20370&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/brasero.install (original)
+++ desktop/unstable/brasero/debian/brasero.install Mon Jun 15 23:13:08 2009
@@ -2,3 +2,4 @@
debian/tmp/usr/share/applications
debian/tmp/usr/share/man
debian/tmp/usr/lib/nautilus/*/*.so
+debian/tmp/usr/lib/brasero/plugins/*.so
Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=20370&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog (original)
+++ desktop/unstable/brasero/debian/changelog Mon Jun 15 23:13:08 2009
@@ -33,7 +33,6 @@
[ Josselin Mouette ]
* New upstream release.
* Update build-dependencies.
- * Move the backends to a new libbrasero-plugins package.
* Move the translations and data to a new brasero-common package.
* Rewrite the descriptions.
* Add -dev depends to the development package.
@@ -46,6 +45,10 @@
* Include clean-la.mk and gnome-version.mk; build-depend on
gnome-pkg-tools 0.7.
* Don’t run dh_makeshlibs on brasero and libbrasero-plugins.
+ * 011_nautilus_menu_move.patch: add NoDisplay=true, this icon is
+ duplicating existing functionality (brasero icon in sound&video
+ menu, and nautilus autorun).
+ * Update list of copyright holders.
-- Josselin Mouette <joss at debian.org> Mon, 15 Jun 2009 23:40:00 +0200
Modified: desktop/unstable/brasero/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control?rev=20370&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control (original)
+++ desktop/unstable/brasero/debian/control Mon Jun 15 23:13:08 2009
@@ -35,11 +35,15 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libbrasero-media0 (= ${binary:Version}),
gstreamer0.10-plugins-base (>= 0.10.0),
gnome-icon-theme,
hal (>= 0.5),
- gvfs
+ gvfs,
+ wodim,
+ genisoimage,
+ dvd+rw-tools,
+ brasero-common (>= ${gnome:Version}),
+ brasero-common (<< ${gnome:NextVersion})
Recommends: gstreamer0.10-plugins-good,
gstreamer0.10-plugins-ugly,
gnome-mount
@@ -59,7 +63,8 @@
GStreamer
* CD-Text writing
.
- This package contains the main binary and the nautilus extension.
+ This package contains the main binary, the burning plugins and the
+ nautilus extension.
.
The following packages, if installed, will provide Brasero with added
functionality:
@@ -79,30 +84,13 @@
.
This package contains the common files and translations.
-Package: libbrasero-plugins
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- wodim,
- genisoimage,
- dvd+rw-tools,
- brasero-common (>= ${gnome:Version}),
- brasero-common (<< ${gnome:NextVersion})
-Replaces: brasero (<< 2.26)
-Conflicts: brasero (<< 2.26)
-Description: Backends for the Brasero CD burning library
- Libbrasero is a simple library to burn, copy and erase CD and DVD
- media.
- .
- This package contains the backends that do the actual disc writing.
-
Package: libbrasero-media0
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},
- libbrasero-plugins (= ${binary:Version})
+ brasero-common (>= ${gnome:Version}),
+ brasero-common (<< ${gnome:NextVersion})
Description: CD/DVD burning library for GNOME - runtime
Libbrasero is a simple library to burn, copy and erase CD and DVD
media.
Modified: desktop/unstable/brasero/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control.in?rev=20370&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control.in (original)
+++ desktop/unstable/brasero/debian/control.in Mon Jun 15 23:13:08 2009
@@ -35,11 +35,15 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libbrasero-media0 (= ${binary:Version}),
gstreamer0.10-plugins-base (>= 0.10.0),
gnome-icon-theme,
hal (>= 0.5),
- gvfs
+ gvfs,
+ wodim,
+ genisoimage,
+ dvd+rw-tools,
+ brasero-common (>= ${gnome:Version}),
+ brasero-common (<< ${gnome:NextVersion})
Recommends: gstreamer0.10-plugins-good,
gstreamer0.10-plugins-ugly,
gnome-mount
@@ -59,7 +63,8 @@
GStreamer
* CD-Text writing
.
- This package contains the main binary and the nautilus extension.
+ This package contains the main binary, the burning plugins and the
+ nautilus extension.
.
The following packages, if installed, will provide Brasero with added
functionality:
@@ -79,30 +84,13 @@
.
This package contains the common files and translations.
-Package: libbrasero-plugins
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- wodim,
- genisoimage,
- dvd+rw-tools,
- brasero-common (>= ${gnome:Version}),
- brasero-common (<< ${gnome:NextVersion})
-Replaces: brasero (<< 2.26)
-Conflicts: brasero (<< 2.26)
-Description: Backends for the Brasero CD burning library
- Libbrasero is a simple library to burn, copy and erase CD and DVD
- media.
- .
- This package contains the backends that do the actual disc writing.
-
Package: libbrasero-media0
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},
- libbrasero-plugins (= ${binary:Version})
+ brasero-common (>= ${gnome:Version}),
+ brasero-common (<< ${gnome:NextVersion})
Description: CD/DVD burning library for GNOME - runtime
Libbrasero is a simple library to burn, copy and erase CD and DVD
media.
Modified: desktop/unstable/brasero/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/copyright?rev=20370&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/copyright (original)
+++ desktop/unstable/brasero/debian/copyright Mon Jun 15 23:13:08 2009
@@ -4,24 +4,25 @@
It was downloaded from:
http://ftp.gnome.org/pub/GNOME/sources/brasero/
+Upstream Author:
+ Philippe Rouquier <bonfire-app at wanadoo.fr>
+
Copyright:
- Copyright (C) 2005-2007 Philippe Rouquier
- Copyright (C) 2006 Ilkka Tuohela
- Copyright (C) 2001-2004 Red Hat, Inc.
- Copyright (C) 2005 John McCutchan
+ Copyright © 2005-2009 Philippe Rouquier
+ Copyright © 2008 Lin Ma
+ Copyright © 2008 Joe Marcus Clarke
+ Copyright © 2009 Joan Duran
+ Copyright © 2005 William Jon McCann
+ Copyright © 2003, 2007 Novell, Inc.
+ Copyright © 1999-2004 Red Hat, Inc.
+ Copyright 2008 Luis Medinas
+ Copyright (C) 2006 Paolo Borelli
+ Copyright (C) 2001 George Lebl
- When not otherwise specified, files are under the GNU General Public License
- version 2 or any later version.
-
- The following files are under the GNU Library General Public License version 2
- or any later version:
- src/eggtreemultidnd.h
- src/eggtreemultidnd.c
-
-
-GNU General Public License:
+License for Brasero itself, the plugins and for some parts of the
+library:
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -40,7 +41,8 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
-GNU Library General Public License:
+
+License for most parts of the library:
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -58,4 +60,3 @@
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL'.
-
Modified: desktop/unstable/brasero/debian/patches/011_nautilus_menu_move.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/011_nautilus_menu_move.patch?rev=20370&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/patches/011_nautilus_menu_move.patch (original)
+++ desktop/unstable/brasero/debian/patches/011_nautilus_menu_move.patch Mon Jun 15 23:13:08 2009
@@ -1,6 +1,7 @@
-diff -r 88f31cfc4490 nautilus/brasero-nautilus.desktop.in.in
---- a/nautilus/brasero-nautilus.desktop.in.in Thu Mar 26 10:13:22 2009 -0400
-+++ b/nautilus/brasero-nautilus.desktop.in.in Thu Mar 26 10:16:15 2009 -0400
+Index: brasero-2.26.2/nautilus/brasero-nautilus.desktop.in.in
+===================================================================
+--- brasero-2.26.2.orig/nautilus/brasero-nautilus.desktop.in.in 2009-05-18 17:06:15.000000000 +0200
++++ brasero-2.26.2/nautilus/brasero-nautilus.desktop.in.in 2009-06-16 00:52:14.459041223 +0200
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=CD/DVD Creator
@@ -10,3 +11,11 @@
TryExec=nautilus
Exec=nautilus --no-default-window --no-desktop burn:///
Icon=brasero
+@@ -10,6 +10,7 @@ StartupNotify=true
+ Terminal=false
+ Type=Application
+ OnlyShowIn=GNOME;
++NoDisplay=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=brasero
+ X-GNOME-Bugzilla-Component=general
More information about the pkg-gnome-commits
mailing list