r20367 - in /desktop/unstable/brasero/debian: brasero-common.install brasero.install changelog control control.in libbrasero-media-dev.install libbrasero-media0.install libbrasero-plugins.install rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon Jun 15 22:24:16 UTC 2009


Author: joss
Date: Mon Jun 15 22:24:16 2009
New Revision: 20367

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20367
Log:
* 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.
* Remove inappropriate recommends in the library package.
* Let’s not forget dvd+rw-tools so that we can write DVDs too.
* Rework dependencies accordingly.
* Put the nautilus extension in brasero.
* Conflict against nautilus-cd-burner to avoid having two burning 
  extensions.
* 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.

Added:
    desktop/unstable/brasero/debian/brasero-common.install
    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/libbrasero-media-dev.install
    desktop/unstable/brasero/debian/libbrasero-media0.install
    desktop/unstable/brasero/debian/rules

Added: desktop/unstable/brasero/debian/brasero-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/brasero-common.install?rev=20367&op=file
==============================================================================
--- desktop/unstable/brasero/debian/brasero-common.install (added)
+++ desktop/unstable/brasero/debian/brasero-common.install Mon Jun 15 22:24:16 2009
@@ -1,0 +1,8 @@
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/gnome
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/mime
+debian/tmp/usr/share/brasero
+debian/tmp/usr/share/omf
+debian/tmp/etc/gconf
+

Modified: desktop/unstable/brasero/debian/brasero.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/brasero.install?rev=20367&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/brasero.install (original)
+++ desktop/unstable/brasero/debian/brasero.install Mon Jun 15 22:24:16 2009
@@ -1,12 +1,4 @@
 debian/tmp/usr/bin
 debian/tmp/usr/share/applications
-debian/tmp/usr/share/man/man1/
-debian/tmp/etc/gconf
-debian/tmp/usr/share/locale/
-debian/tmp/usr/share/icons/hicolor/
-debian/tmp/usr/share/gnome/help/brasero/
-debian/tmp/usr/share/mime/packages/
-debian/tmp/usr/share/gtk-doc/
-debian/tmp/usr/share/brasero/
-debian/tmp/usr/share/omf/
-
+debian/tmp/usr/share/man
+debian/tmp/usr/lib/nautilus/*/*.so

Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=20367&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog (original)
+++ desktop/unstable/brasero/debian/changelog Mon Jun 15 22:24:16 2009
@@ -1,4 +1,4 @@
-brasero (2.26.1-1) UNRELEASED; urgency=low
+brasero (2.26.2-1) unstable; urgency=low
 
   [ Pedro Fragoso ]
   * Add myself to Maintainer field
@@ -30,7 +30,24 @@
   * debian/patches/006-fix-libdvdcss.patch:
     - Removed as applied upstream.
 
- -- Pedro Fragoso <ember at ubuntu.com>  Sat, 16 May 2009 18:31:50 +0100
+  [ 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.
+  * Remove inappropriate recommends in the library package.
+  * Let’s not forget dvd+rw-tools so that we can write DVDs too.
+  * Rework dependencies accordingly.
+  * Put the nautilus extension in brasero.
+  * Conflict against nautilus-cd-burner to avoid having two burning 
+    extensions.
+  * 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.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 15 Jun 2009 23:40:00 +0200
 
 brasero (0.8.1-1) unstable; urgency=low
 

Modified: desktop/unstable/brasero/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control?rev=20367&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control (original)
+++ desktop/unstable/brasero/debian/control Mon Jun 15 22:24:16 2009
@@ -5,79 +5,121 @@
 Build-Depends: debhelper (>= 5.0.0),
                autotools-dev,
                cdbs,
-               libgnome2-dev (>= 2.10.0),
+               gnome-pkg-tools (>= 0.7),
+               quilt,
+               libcam-dev [kfreebsd-i386 kfreebsd-amd64],
+               libglib2.0-dev (>= 2.15.6),
                libgtk2.0-dev (>= 2.14.0),
-               libgnomeui-dev (>= 2.10.0),
-               gnome-pkg-tools,
-               pkg-config,
-               intltool (>= 0.35.0),
+               libgconf2-dev,
                libgstreamer0.10-dev (>= 0.10.15),
                libgstreamer-plugins-base0.10-dev (>= 0.10.0),
-               libtotem-plparser-dev (>= 2.22.0),
                libxml2-dev (>= 2.6.0),
                libhal-dev (>= 0.5),
                libdbus-glib-1-dev (>= 0.7.2),
-               libxml-parser-perl,
-               libglib2.0-dev (>= 2.15.6),
-               quilt,
+               gtk-doc-tools (>= 1.9),
+               gnome-doc-utils (>= 0.3.2),
+               scrollkeeper,
+               pkg-config,
+               libsm-dev,
+               libnautilus-extension-dev (>= 2.22.2),
                libbeagle-dev (>= 0.3.0),
-               gnome-doc-utils (>= 0.3.2),
-               gtk-doc-tools (>= 1.9),
-               scrollkeeper,
-               libcam-dev [kfreebsd-i386 kfreebsd-amd64],
-               libc0.1-dev (>= 2.5) | libc0.3-dev (>= 2.5) | libc6-dev (>= 2.5) | libc6.1-dev (>= 2.5),
-               libnautilus-extension-dev (>= 2.22.2),
-               libsm-dev
+               libtotem-plparser-dev (>= 2.22.0),
+               intltool (>= 0.35.0)
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
-Standards-Version: 3.8.0
-Homepage:http://www.gnome.org/projects/brasero/
-Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/brasero/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/?op=log
+Standards-Version: 3.8.1
+Homepage: http://www.gnome.org/projects/brasero/
+Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/brasero/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/?op=log
 
 Package: brasero
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libbrasero-media0 (>= ${source:Version}),
+         libbrasero-media0 (= ${binary:Version}),
+         gstreamer0.10-plugins-base (>= 0.10.0),
+         gnome-icon-theme,
+         hal (>= 0.5),
+         gvfs
+Recommends: gstreamer0.10-plugins-good,
+            gstreamer0.10-plugins-ugly,
+            gnome-mount
+Suggests: gstreamer0.10-plugins-bad,
+          dvdauthor,
+          vcdimager,
+          libdvdcss2
+Replaces: bonfire (<= 0.4.4-1)
+Conflicts: bonfire (<= 0.4.4-1),
+           nautilus-cd-burner
+Description: CD/DVD burning application for GNOME
+ Brasero is a simple application to burn, copy and erase CD and DVD 
+ media: audio, video or data. It features among other things:
+  * On-the-fly burning
+  * Multisession support
+  * On-the-fly conversion of music playlists in all formats supported by 
+    GStreamer
+  * CD-Text writing
+ .
+ This package contains the main binary and the nautilus extension.
+ .
+ The following packages, if installed, will provide Brasero with added 
+ functionality:
+  * GStreamer backends to support more audio or video formats
+  * dvdauthor to create video DVDs
+  * vcdimager to create VCDs or SVCDs
+  * libdvdcss2 to copy encrypted DVDs
+
+Package: brasero-common
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: brasero (<< 2.26)
+Conflicts: brasero (<< 2.26)
+Description: Common files for the Brasero CD burning application and library
+ Brasero is a simple application to burn, copy and erase CD and DVD 
+ media.
+ .
+ This package contains the common files and translations.
+
+Package: libbrasero-plugins
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
          wodim,
          genisoimage,
-         gstreamer0.10-plugins-base (>= 0.10.0)
-Recommends: hal (>= 0.5),
-            gstreamer0.10-plugins-good,
-            gnome-mount,
-            gvfs
-Suggests: gnome-icon-theme,
-          gstreamer0.10-fluendo-mp3,
-          gstreamer0.10-plugins-bad
-          dvdauthor,
-          vcdimager
-Replaces: bonfire (<= 0.4.4-1)
-Conflicts: bonfire (<= 0.4.4-1)
-Description: CD/DVD burning application for GNOME
- Easy to use CD/DVD burning application where you can:
-  * Burn, Copy and Erase CD/DVD
-  * On-the-fly burning of CD/DVD
-  * Append data to multisession CD/DVD
-  * Burn Audio CD
-  * CD-Text writing for Audio CD
+         dvd+rw-tools,
+         brasero-common (>= ${gnome:Version}),
+         brasero-common (<< ${gnome:Version})
+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
-Recommends: brasero
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Replaces: brasero (<< 0.9.1-1)
-Description: CD/DVD burning application for GNOME - runtime libraries
- This package contains media-related libraries used by the Brasero
+         ${misc:Depends},
+         libbrasero-plugins (= ${binary:Version})
+Description: CD/DVD burning library for GNOME - runtime
+ Libbrasero is a simple library to burn, copy and erase CD and DVD 
+ media.
+ .
+ This package contains the shared library.
 
 Package: libbrasero-media-dev
 Architecture: any
 Section: libdevel
-Depends: libbrasero-media0,
+Depends: libbrasero-media0 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.15.6),
+         libgtk2.0-dev (>= 2.14.0),
+         libhal-dev (>= 0.5),
          ${misc:Depends},
          ${shlibs:Depends}
-Description: CD/DVD burning application for GNOME - development headers
- This package contains static libraries and development headers for the
- Brasero media libraries.
-
+Description: CD/DVD burning library for GNOME - development
+ Libbrasero is a simple library to burn, copy and erase CD and DVD 
+ media.
+ .
+ This package contains the development headers and API documentation.

Modified: desktop/unstable/brasero/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control.in?rev=20367&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control.in (original)
+++ desktop/unstable/brasero/debian/control.in Mon Jun 15 22:24:16 2009
@@ -5,79 +5,121 @@
 Build-Depends: debhelper (>= 5.0.0),
                autotools-dev,
                cdbs,
-               libgnome2-dev (>= 2.10.0),
+               gnome-pkg-tools (>= 0.7),
+               quilt,
+               libcam-dev [kfreebsd-i386 kfreebsd-amd64],
+               libglib2.0-dev (>= 2.15.6),
                libgtk2.0-dev (>= 2.14.0),
-               libgnomeui-dev (>= 2.10.0),
-               gnome-pkg-tools,
-               pkg-config,
-               intltool (>= 0.35.0),
+               libgconf2-dev,
                libgstreamer0.10-dev (>= 0.10.15),
                libgstreamer-plugins-base0.10-dev (>= 0.10.0),
-               libtotem-plparser-dev (>= 2.22.0),
                libxml2-dev (>= 2.6.0),
                libhal-dev (>= 0.5),
                libdbus-glib-1-dev (>= 0.7.2),
-               libxml-parser-perl,
-               libglib2.0-dev (>= 2.15.6),
-               quilt,
+               gtk-doc-tools (>= 1.9),
+               gnome-doc-utils (>= 0.3.2),
+               scrollkeeper,
+               pkg-config,
+               libsm-dev,
+               libnautilus-extension-dev (>= 2.22.2),
                libbeagle-dev (>= 0.3.0),
-               gnome-doc-utils (>= 0.3.2),
-               gtk-doc-tools (>= 1.9),
-               scrollkeeper,
-               libcam-dev [kfreebsd-i386 kfreebsd-amd64],
-               libc0.1-dev (>= 2.5) | libc0.3-dev (>= 2.5) | libc6-dev (>= 2.5) | libc6.1-dev (>= 2.5),
-               libnautilus-extension-dev (>= 2.22.2),
-               libsm-dev
+               libtotem-plparser-dev (>= 2.22.0),
+               intltool (>= 0.35.0)
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.0
-Homepage:http://www.gnome.org/projects/brasero/
-Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/brasero/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/brasero/?op=log
+Standards-Version: 3.8.1
+Homepage: http://www.gnome.org/projects/brasero/
+Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/brasero/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/?op=log
 
 Package: brasero
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libbrasero-media0 (>= ${source:Version}),
+         libbrasero-media0 (= ${binary:Version}),
+         gstreamer0.10-plugins-base (>= 0.10.0),
+         gnome-icon-theme,
+         hal (>= 0.5),
+         gvfs
+Recommends: gstreamer0.10-plugins-good,
+            gstreamer0.10-plugins-ugly,
+            gnome-mount
+Suggests: gstreamer0.10-plugins-bad,
+          dvdauthor,
+          vcdimager,
+          libdvdcss2
+Replaces: bonfire (<= 0.4.4-1)
+Conflicts: bonfire (<= 0.4.4-1),
+           nautilus-cd-burner
+Description: CD/DVD burning application for GNOME
+ Brasero is a simple application to burn, copy and erase CD and DVD 
+ media: audio, video or data. It features among other things:
+  * On-the-fly burning
+  * Multisession support
+  * On-the-fly conversion of music playlists in all formats supported by 
+    GStreamer
+  * CD-Text writing
+ .
+ This package contains the main binary and the nautilus extension.
+ .
+ The following packages, if installed, will provide Brasero with added 
+ functionality:
+  * GStreamer backends to support more audio or video formats
+  * dvdauthor to create video DVDs
+  * vcdimager to create VCDs or SVCDs
+  * libdvdcss2 to copy encrypted DVDs
+
+Package: brasero-common
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: brasero (<< 2.26)
+Conflicts: brasero (<< 2.26)
+Description: Common files for the Brasero CD burning application and library
+ Brasero is a simple application to burn, copy and erase CD and DVD 
+ media.
+ .
+ This package contains the common files and translations.
+
+Package: libbrasero-plugins
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
          wodim,
          genisoimage,
-         gstreamer0.10-plugins-base (>= 0.10.0)
-Recommends: hal (>= 0.5),
-            gstreamer0.10-plugins-good,
-            gnome-mount,
-            gvfs
-Suggests: gnome-icon-theme,
-          gstreamer0.10-fluendo-mp3,
-          gstreamer0.10-plugins-bad
-          dvdauthor,
-          vcdimager
-Replaces: bonfire (<= 0.4.4-1)
-Conflicts: bonfire (<= 0.4.4-1)
-Description: CD/DVD burning application for GNOME
- Easy to use CD/DVD burning application where you can:
-  * Burn, Copy and Erase CD/DVD
-  * On-the-fly burning of CD/DVD
-  * Append data to multisession CD/DVD
-  * Burn Audio CD
-  * CD-Text writing for Audio CD
+         dvd+rw-tools,
+         brasero-common (>= ${gnome:Version}),
+         brasero-common (<< ${gnome:Version})
+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
-Recommends: brasero
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Replaces: brasero (<< 0.9.1-1)
-Description: CD/DVD burning application for GNOME - runtime libraries
- This package contains media-related libraries used by the Brasero
+         ${misc:Depends},
+         libbrasero-plugins (= ${binary:Version})
+Description: CD/DVD burning library for GNOME - runtime
+ Libbrasero is a simple library to burn, copy and erase CD and DVD 
+ media.
+ .
+ This package contains the shared library.
 
 Package: libbrasero-media-dev
 Architecture: any
 Section: libdevel
-Depends: libbrasero-media0,
+Depends: libbrasero-media0 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.15.6),
+         libgtk2.0-dev (>= 2.14.0),
+         libhal-dev (>= 0.5),
          ${misc:Depends},
          ${shlibs:Depends}
-Description: CD/DVD burning application for GNOME - development headers
- This package contains static libraries and development headers for the
- Brasero media libraries.
-
+Description: CD/DVD burning library for GNOME - development
+ Libbrasero is a simple library to burn, copy and erase CD and DVD 
+ media.
+ .
+ This package contains the development headers and API documentation.

Modified: desktop/unstable/brasero/debian/libbrasero-media-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/libbrasero-media-dev.install?rev=20367&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/libbrasero-media-dev.install (original)
+++ desktop/unstable/brasero/debian/libbrasero-media-dev.install Mon Jun 15 22:24:16 2009
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/lib/*.so
 debian/tmp/usr/include
-
+debian/tmp/usr/share/gtk-doc

Modified: desktop/unstable/brasero/debian/libbrasero-media0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/libbrasero-media0.install?rev=20367&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/libbrasero-media0.install (original)
+++ desktop/unstable/brasero/debian/libbrasero-media0.install Mon Jun 15 22:24:16 2009
@@ -1,3 +1,1 @@
-debian/tmp/usr/lib/brasero/plugins/*.so
 debian/tmp/usr/lib/*.so.*
-debian/tmp/usr/lib/nautilus/extensions-2.0/*.so

Added: desktop/unstable/brasero/debian/libbrasero-plugins.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/libbrasero-plugins.install?rev=20367&op=file
==============================================================================
--- desktop/unstable/brasero/debian/libbrasero-plugins.install (added)
+++ desktop/unstable/brasero/debian/libbrasero-plugins.install Mon Jun 15 22:24:16 2009
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/brasero/plugins/*.so

Modified: desktop/unstable/brasero/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/rules?rev=20367&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/rules (original)
+++ desktop/unstable/brasero/debian/rules Mon Jun 15 22:24:16 2009
@@ -5,6 +5,8 @@
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_DESTDIR := $(CURDIR)/debian/tmp/
@@ -12,10 +14,13 @@
 libbrasero-mediaN := $(shell sed -rn 's/^Package:[[:space:]]*(libbrasero-media[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
 DEB_DH_MAKESHLIBS_ARGS_$(libbrasero-mediaN) += -V '$(libbrasero-mediaN) (>= 0.9.1)'
+DEB_DH_MAKESHLIBS_ARGS_libbrasero-plugins += --no-act
+DEB_DH_MAKESHLIBS_ARGS_brasero += --no-act
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--disable-libburnia \
-	--disable-scrollkeeper 
+	--disable-scrollkeeper \
+	--disable-caches
 
 ifneq ($(DEB_BUILD_ARCH_OS), linux)
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-inotify




More information about the pkg-gnome-commits mailing list