r22881 - in /desktop/unstable/brasero/debian: changelog control control.in rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Jan 27 16:41:40 UTC 2010


Author: joss
Date: Wed Jan 27 16:41:38 2010
New Revision: 22881

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22881
Log:
* Enable cdrkit again, but in a separate package brasero-cdrkit that 
  will not be installed by default.
* Make it clear which features are brought by this package: mostly 
  video DVD creation, CD-Text.

Modified:
    desktop/unstable/brasero/debian/changelog
    desktop/unstable/brasero/debian/control
    desktop/unstable/brasero/debian/control.in
    desktop/unstable/brasero/debian/rules

Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=22881&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog [utf-8] (original)
+++ desktop/unstable/brasero/debian/changelog [utf-8] Wed Jan 27 16:41:38 2010
@@ -1,3 +1,12 @@
+brasero (2.28.3-3) unstable; urgency=low
+
+  * Enable cdrkit again, but in a separate package brasero-cdrkit that 
+    will not be installed by default.
+  * Make it clear which features are brought by this package: mostly 
+    video DVD creation, CD-Text.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 19 Jan 2010 17:44:30 +0100
+
 brasero (2.28.3-2) unstable; urgency=low
 
   * Enable libburnia plugins, adding corresponding build-dependencies.

Modified: desktop/unstable/brasero/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control?rev=22881&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control [utf-8] (original)
+++ desktop/unstable/brasero/debian/control [utf-8] Wed Jan 27 16:41:38 2010
@@ -33,7 +33,7 @@
                libunique-dev (>= 1.0.0),
                libnotify-dev (>= 0.3.0),
                intltool (>= 0.35.0)
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>
 Standards-Version: 3.8.3
 Homepage: http://www.gnome.org/projects/brasero/
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/brasero/
@@ -49,6 +49,8 @@
          libbrasero-media0 (= ${binary:Version}),
          brasero-common (>= ${gnome:Version}),
          brasero-common (<< ${gnome:NextVersion})
+Suggests: vcdimager,
+          libdvdcss2
 Conflicts: nautilus-cd-burner
 Description: CD/DVD burning application for GNOME
  Brasero is a simple application to burn, copy and erase CD and DVD 
@@ -57,15 +59,14 @@
   * Multisession support
   * On-the-fly conversion of music playlists in all formats supported by 
     GStreamer
-  * CD-Text writing
  .
  This package contains the main binary, the burning plugins 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
+  * cdrdao to burn combined data/audio CDs and for byte-to-byte copy
+  * GStreamer backends to support more audio formats
   * vcdimager to create VCDs or SVCDs
   * libdvdcss2 to copy encrypted DVDs
 
@@ -80,6 +81,26 @@
  .
  This package contains the common files and translations.
 
+Package: brasero-cdrkit
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libbrasero-media0 (= ${binary:Version}),
+         genisoimage,
+         wodim
+Replaces: libbrasero-media0 (<< 2.28.3-3)
+Recommends: dvdauthor
+Suggests: readom
+Description: cdrkit extensions for the Brasero burning application
+ Brasero is a simple application to burn, copy and erase CD and DVD
+ media.
+ .
+ This package contains extensions for Brasero, based on the genisoimage, 
+ wodim, readom and dvdauthor programs. They are only needed for the 
+ following operations in Brasero:
+  * Audio CD burning with CD-Text information
+  * Video DVD creation
+
 Package: libbrasero-media0
 Architecture: any
 Section: libs
@@ -92,10 +113,7 @@
             gstreamer0.10-plugins-good,
             gstreamer0.10-plugins-ugly,
             cdrdao
-Suggests: gstreamer0.10-plugins-bad,
-          dvdauthor,
-          vcdimager,
-          libdvdcss2
+Suggests: gstreamer0.10-plugins-bad
 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=22881&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control.in [utf-8] (original)
+++ desktop/unstable/brasero/debian/control.in [utf-8] Wed Jan 27 16:41:38 2010
@@ -44,6 +44,8 @@
          libbrasero-media0 (= ${binary:Version}),
          brasero-common (>= ${gnome:Version}),
          brasero-common (<< ${gnome:NextVersion})
+Suggests: vcdimager,
+          libdvdcss2
 Conflicts: nautilus-cd-burner
 Description: CD/DVD burning application for GNOME
  Brasero is a simple application to burn, copy and erase CD and DVD 
@@ -52,15 +54,14 @@
   * Multisession support
   * On-the-fly conversion of music playlists in all formats supported by 
     GStreamer
-  * CD-Text writing
  .
  This package contains the main binary, the burning plugins 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
+  * cdrdao to burn combined data/audio CDs and for byte-to-byte copy
+  * GStreamer backends to support more audio formats
   * vcdimager to create VCDs or SVCDs
   * libdvdcss2 to copy encrypted DVDs
 
@@ -75,6 +76,26 @@
  .
  This package contains the common files and translations.
 
+Package: brasero-cdrkit
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libbrasero-media0 (= ${binary:Version}),
+         genisoimage,
+         wodim
+Replaces: libbrasero-media0 (<< 2.28.3-3)
+Recommends: dvdauthor
+Suggests: readom
+Description: cdrkit extensions for the Brasero burning application
+ Brasero is a simple application to burn, copy and erase CD and DVD
+ media.
+ .
+ This package contains extensions for Brasero, based on the genisoimage, 
+ wodim, readom and dvdauthor programs. They are only needed for the 
+ following operations in Brasero:
+  * Audio CD burning with CD-Text information
+  * Video DVD creation
+
 Package: libbrasero-media0
 Architecture: any
 Section: libs
@@ -87,10 +108,7 @@
             gstreamer0.10-plugins-good,
             gstreamer0.10-plugins-ugly,
             cdrdao
-Suggests: gstreamer0.10-plugins-bad,
-          dvdauthor,
-          vcdimager,
-          libdvdcss2
+Suggests: gstreamer0.10-plugins-bad
 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/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/rules?rev=22881&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/rules [utf-8] (original)
+++ desktop/unstable/brasero/debian/rules [utf-8] Wed Jan 27 16:41:38 2010
@@ -11,20 +11,27 @@
 
 DEB_DESTDIR := $(CURDIR)/debian/tmp/
 
-libbrasero-mediaN := $(shell sed -rn 's/^Package:[[:space:]]*(libbrasero-media[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+SOVERSION := $(shell sed -rn 's/^Package:[[:space:]]*libbrasero-media([0-9]+)[[:space:]]*$$/\1/p' debian/control)
+SHLIBS := 2.27.92
 
-DEB_DH_MAKESHLIBS_ARGS_$(libbrasero-mediaN) += -V '$(libbrasero-mediaN) (>= 2.27.92)' -Xplugins
+DEB_DH_MAKESHLIBS_ARGS_libbrasero-media$(SOVERSION) += -V 'libbrasero-media$(SOVERSION) (>= $(SHLIBS))' -Xplugins
 DEB_DH_MAKESHLIBS_ARGS_brasero += --no-act
+DEB_DH_MAKESHLIBS_ARGS_brasero-cdrkit += --no-act
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--disable-cdrtools \
-	--disable-cdrkit \
 	--disable-scrollkeeper \
 	--disable-caches
 
-DEB_MAKE_EXTRA_ARGS += pkglibdir=/usr/lib/brasero-0
+DEB_MAKE_EXTRA_ARGS += pkglibdir=/usr/lib/brasero-$(SOVERSION)
 
 ifneq ($(DEB_BUILD_ARCH_OS), linux)
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-inotify
 endif
 
+binary-install/brasero-cdrkit:: binary-install/libbrasero-media$(SOVERSION)
+	mkdir -p debian/brasero-cdrkit/usr/lib/brasero-$(SOVERSION)/plugins
+	for i in dvdauthor vob genisoimage wodim readom; do \
+	  mv debian/libbrasero-media$(SOVERSION)/usr/lib/brasero-$(SOVERSION)/plugins/libbrasero-$$i.so \
+	     debian/brasero-cdrkit/usr/lib/brasero-$(SOVERSION)/plugins/ ; \
+	done




More information about the pkg-gnome-commits mailing list