r27172 - in /desktop/experimental/brasero/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Mar 29 10:55:02 UTC 2011
Author: joss
Date: Tue Mar 29 10:54:54 2011
New Revision: 27172
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27172
Log:
* New upstream pre-release.
* Update build-dependencies, package names, and paths.
* Require totem-plparser 2.32 since its soname changed.
* Do not include GIR package for now, since the versioning is broken
(see Bugzilla #646069).
* 01_pkglibdir.patch: dropped, upstream now has a variable we can use
for that effect.
* 11_nautilus_menu_no_display.patch, 31_link_libice.patch,
50_checksum.patch: dropped, merged upstream.
* 90_relibtoolize.patch: dropped, unnecessary.
Added:
desktop/experimental/brasero/debian/libbrasero-media3-1.install
- copied, changed from r27170, desktop/experimental/brasero/debian/libbrasero-media0.install
desktop/experimental/brasero/debian/libbrasero-media3-dev.install
- copied unchanged from r27170, desktop/experimental/brasero/debian/libbrasero-media-dev.install
Removed:
desktop/experimental/brasero/debian/libbrasero-media-dev.install
desktop/experimental/brasero/debian/libbrasero-media0.install
desktop/experimental/brasero/debian/patches/01_pkglibdir.patch
desktop/experimental/brasero/debian/patches/11_nautilus_menu_no_display.patch
desktop/experimental/brasero/debian/patches/31_link_libice.patch
desktop/experimental/brasero/debian/patches/50_checksum.patch
desktop/experimental/brasero/debian/patches/90_relibtoolize.patch
Modified:
desktop/experimental/brasero/debian/brasero-common.install
desktop/experimental/brasero/debian/changelog
desktop/experimental/brasero/debian/control
desktop/experimental/brasero/debian/control.in
desktop/experimental/brasero/debian/patches/series
desktop/experimental/brasero/debian/rules
Modified: desktop/experimental/brasero/debian/brasero-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/brasero-common.install?rev=27172&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/brasero-common.install [utf-8] (original)
+++ desktop/experimental/brasero/debian/brasero-common.install [utf-8] Tue Mar 29 10:54:54 2011
@@ -5,4 +5,3 @@
debian/tmp/usr/share/brasero
debian/tmp/usr/share/omf
debian/tmp/etc/gconf
-
Modified: desktop/experimental/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/changelog?rev=27172&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/changelog [utf-8] (original)
+++ desktop/experimental/brasero/debian/changelog [utf-8] Tue Mar 29 10:54:54 2011
@@ -1,6 +1,16 @@
-brasero (2.30.3-3) UNRELEASED; urgency=low
+brasero (2.91.93-1) UNRELEASED; urgency=low
* Only depend on growisofs instead of dvd+rw-tools.
+ * New upstream pre-release.
+ * Update build-dependencies, package names, and paths.
+ * Require totem-plparser 2.32 since its soname changed.
+ * Do not include GIR package for now, since the versioning is broken
+ (see Bugzilla #646069).
+ * 01_pkglibdir.patch: dropped, upstream now has a variable we can use
+ for that effect.
+ * 11_nautilus_menu_no_display.patch, 31_link_libice.patch,
+ 50_checksum.patch: dropped, merged upstream.
+ * 90_relibtoolize.patch: dropped, unnecessary.
-- Josselin Mouette <joss at debian.org> Mon, 08 Nov 2010 16:33:44 +0100
Modified: desktop/experimental/brasero/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/control?rev=27172&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/control [utf-8] (original)
+++ desktop/experimental/brasero/debian/control [utf-8] Tue Mar 29 10:54:54 2011
@@ -11,29 +11,29 @@
autotools-dev,
cdbs,
gnome-pkg-tools (>= 0.7),
+ gnome-doc-utils,
+ gtk-doc-tools (>= 1.12),
+ pkg-config,
libcam-dev [kfreebsd-any],
- libglib2.0-dev (>= 2.22.0),
- libgtk2.0-dev (>= 2.19.7),
- libgconf2-dev,
+ libglib2.0-dev (>= 2.28.0),
+ libgconf2-dev (>= 2.32.0),
libgstreamer0.10-dev (>= 0.10.15),
libgstreamer-plugins-base0.10-dev (>= 0.10.0),
libxml2-dev (>= 2.6.0),
- libdbus-glib-1-dev (>= 0.7.2),
- libcanberra-gtk-dev (>= 0.1),
- gtk-doc-tools (>= 1.12),
- gnome-doc-utils (>= 0.3.2),
- scrollkeeper,
- pkg-config,
libsm-dev,
- libnautilus-extension-dev (>= 2.22.2),
+ libice-dev,
+ libgtk-3-dev (>= 3.0.0),
+ libnotify-dev (>= 0.6.1),
+ libcanberra-dev (>= 0.1),
+ libcanberra-gtk3-dev (>= 0.1),
+ libnautilus-extension-dev (>= 2.91.90),
libburn-dev (>= 0.4.0),
libisofs-dev (>= 0.6.4),
libtracker-client-0.8-dev (>= 0.8.0),
- libtotem-plparser-dev (>= 2.29.1),
+ libtotem-plparser-dev (>= 2.32),
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>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
Standards-Version: 3.9.0
Homepage: http://www.gnome.org/projects/brasero/
Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/brasero/
@@ -46,7 +46,7 @@
gstreamer0.10-plugins-base (>= 0.10.0),
gnome-icon-theme,
gvfs,
- libbrasero-media0 (= ${binary:Version}),
+ libbrasero-media3-1 (= ${binary:Version}),
brasero-common (>= ${gnome:Version}),
brasero-common (<< ${gnome:NextVersion})
Suggests: vcdimager,
@@ -85,10 +85,9 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libbrasero-media0 (= ${binary:Version}),
+ libbrasero-media3-1 (= ${binary:Version}),
genisoimage,
wodim
-Replaces: libbrasero-media0 (<< 2.28.3-3)
Recommends: dvdauthor
Suggests: readom
Description: cdrkit extensions for the Brasero burning application
@@ -101,7 +100,7 @@
* Audio CD burning with CD-Text information
* Video DVD creation
-Package: libbrasero-media0
+Package: libbrasero-media3-1
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -120,13 +119,12 @@
.
This package contains the shared library.
-Package: libbrasero-media-dev
+Package: libbrasero-media3-dev
Architecture: any
Section: libdevel
-Depends: libbrasero-media0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.15.6),
- libgtk2.0-dev (>= 2.16.0),
- libdbus-glib-1-dev (>= 0.7.2),
+Depends: libbrasero-media3-1 (= ${binary:Version}),
+ libglib2.0-dev,
+ libgtk-3-dev,
${misc:Depends},
${shlibs:Depends}
Description: CD/DVD burning library for GNOME - development
Modified: desktop/experimental/brasero/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/control.in?rev=27172&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/control.in [utf-8] (original)
+++ desktop/experimental/brasero/debian/control.in [utf-8] Tue Mar 29 10:54:54 2011
@@ -6,27 +6,27 @@
autotools-dev,
cdbs,
gnome-pkg-tools (>= 0.7),
+ gnome-doc-utils,
+ gtk-doc-tools (>= 1.12),
+ pkg-config,
libcam-dev [kfreebsd-any],
- libglib2.0-dev (>= 2.22.0),
- libgtk2.0-dev (>= 2.19.7),
- libgconf2-dev,
+ libglib2.0-dev (>= 2.28.0),
+ libgconf2-dev (>= 2.32.0),
libgstreamer0.10-dev (>= 0.10.15),
libgstreamer-plugins-base0.10-dev (>= 0.10.0),
libxml2-dev (>= 2.6.0),
- libdbus-glib-1-dev (>= 0.7.2),
- libcanberra-gtk-dev (>= 0.1),
- gtk-doc-tools (>= 1.12),
- gnome-doc-utils (>= 0.3.2),
- scrollkeeper,
- pkg-config,
libsm-dev,
- libnautilus-extension-dev (>= 2.22.2),
+ libice-dev,
+ libgtk-3-dev (>= 3.0.0),
+ libnotify-dev (>= 0.6.1),
+ libcanberra-dev (>= 0.1),
+ libcanberra-gtk3-dev (>= 0.1),
+ libnautilus-extension-dev (>= 2.91.90),
libburn-dev (>= 0.4.0),
libisofs-dev (>= 0.6.4),
libtracker-client-0.8-dev (>= 0.8.0),
- libtotem-plparser-dev (>= 2.29.1),
+ libtotem-plparser-dev (>= 2.32),
libunique-dev (>= 1.0.0),
- libnotify-dev (>= 0.3.0),
intltool (>= 0.35.0)
Uploaders: @GNOME_TEAM@
Standards-Version: 3.9.0
@@ -41,9 +41,8 @@
gstreamer0.10-plugins-base (>= 0.10.0),
gnome-icon-theme,
gvfs,
- libbrasero-media0 (= ${binary:Version}),
- brasero-common (>= ${gnome:Version}),
- brasero-common (<< ${gnome:NextVersion})
+ libbrasero-media3-1 (= ${binary:Version}),
+ brasero-common (= ${source:Version})
Suggests: vcdimager,
libdvdcss2
Conflicts: nautilus-cd-burner
@@ -80,10 +79,9 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libbrasero-media0 (= ${binary:Version}),
+ libbrasero-media3-1 (= ${binary:Version}),
genisoimage,
wodim
-Replaces: libbrasero-media0 (<< 2.28.3-3)
Recommends: dvdauthor
Suggests: readom
Description: cdrkit extensions for the Brasero burning application
@@ -96,14 +94,13 @@
* Audio CD burning with CD-Text information
* Video DVD creation
-Package: libbrasero-media0
+Package: libbrasero-media3-1
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},
growisofs,
- brasero-common (>= ${gnome:Version}),
- brasero-common (<< ${gnome:NextVersion})
+ brasero-common (= ${source:Version})
Recommends: gnome-icon-theme,
gstreamer0.10-plugins-good,
gstreamer0.10-plugins-ugly,
@@ -115,15 +112,15 @@
.
This package contains the shared library.
-Package: libbrasero-media-dev
+Package: libbrasero-media3-dev
Architecture: any
Section: libdevel
-Depends: libbrasero-media0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.15.6),
- libgtk2.0-dev (>= 2.16.0),
- libdbus-glib-1-dev (>= 0.7.2),
+Depends: libbrasero-media3-1 (= ${binary:Version}),
+ libglib2.0-dev,
+ libgtk-3-dev,
${misc:Depends},
${shlibs:Depends}
+Replaces: libbrasero-media-dev
Description: CD/DVD burning library for GNOME - development
Libbrasero is a simple library to burn, copy and erase CD and DVD
media.
Copied: desktop/experimental/brasero/debian/libbrasero-media3-1.install (from r27170, desktop/experimental/brasero/debian/libbrasero-media0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/libbrasero-media3-1.install?rev=27172&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/libbrasero-media0.install [utf-8] (original)
+++ desktop/experimental/brasero/debian/libbrasero-media3-1.install [utf-8] Tue Mar 29 10:54:54 2011
@@ -1,2 +1,2 @@
debian/tmp/usr/lib/*.so.*
-debian/tmp/usr/lib/brasero-*/plugins/*.so
+debian/tmp/usr/lib/brasero*/plugins/*.so
Modified: desktop/experimental/brasero/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/patches/series?rev=27172&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/patches/series [utf-8] (original)
+++ desktop/experimental/brasero/debian/patches/series [utf-8] Tue Mar 29 10:54:54 2011
@@ -1,5 +1,0 @@
-01_pkglibdir.patch
-11_nautilus_menu_no_display.patch
-31_link_libice.patch
-50_checksum.patch
-90_relibtoolize.patch
Modified: desktop/experimental/brasero/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/brasero/debian/rules?rev=27172&op=diff
==============================================================================
--- desktop/experimental/brasero/debian/rules [utf-8] (original)
+++ desktop/experimental/brasero/debian/rules [utf-8] Tue Mar 29 10:54:54 2011
@@ -10,8 +10,8 @@
DEB_DESTDIR := $(CURDIR)/debian/tmp/
-SOVERSION := $(shell sed -rn 's/^Package:[[:space:]]*libbrasero-media([0-9]+)[[:space:]]*$$/\1/p' debian/control)
-SHLIBS := 2.30
+SOVERSION := $(shell sed -rn 's/^Package:[[:space:]]*libbrasero-media([0-9-]+)[[:space:]]*$$/\1/p' debian/control)
+SHLIBS := 2.91.91
DEB_DH_MAKESHLIBS_ARGS_libbrasero-media$(SOVERSION) += -V 'libbrasero-media$(SOVERSION) (>= $(SHLIBS))' -Xplugins
DEB_DH_MAKESHLIBS_ARGS_brasero += --no-act
@@ -24,15 +24,15 @@
--enable-search=tracker \
--disable-introspection
-DEB_MAKE_EXTRA_ARGS += pkglibdir=/usr/lib/brasero-$(SOVERSION)
+DEB_MAKE_EXTRA_ARGS += BRASERO_PLUGIN_DIRECTORY=/usr/lib/brasero$(SOVERSION)/plugins
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
+ 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/ ; \
+ 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