Changeset 6785


Ignore:
Timestamp:
07/11/10 18:51:07 (4 years ago)
Author:
alanbach-guest
Message:
  • Sync'd with Debian 2.32.2-1
Location:
pkg/vinnie/main/brasero/trunk/debian
Files:
6 added
7 edited

Legend:

Unmodified
Added
Removed
  • pkg/vinnie/main/brasero/trunk/debian/brasero.install

    r5506 r6785  
    33debian/tmp/usr/share/man 
    44debian/tmp/usr/lib/nautilus/*/*.so 
    5 debian/tmp/usr/lib/brasero/plugins/*.so 
  • pkg/vinnie/main/brasero/trunk/debian/changelog

    r6177 r6785  
    1 brasero (2.28.3-parsix1) unstable; urgency=low 
    2  
    3   * Sync'd with Debian 2.28.3-1 
    4  
    5  -- Alan Baghumian <alan@technotux.org>  Sat, 02 Jan 2010 13:22:46 -0800 
     1brasero (2.30.2-parsix1) unstable; urgency=low 
     2 
     3  * Sync'd with Debian 2.32.2-1 
     4 
     5 -- Alan Baghumian <alan@technotux.org>  Sun, 11 Jul 2010 09:50:14 -0700 
     6 
     7brasero (2.30.2-1) unstable; urgency=low 
     8 
     9  * New upstream release. 
     10    - Fixes incorrectly reported size by passing correct arguments to 
     11      g_signal_emit(). Closes: #568606 
     12    - Fixes tracker search support. Closes: #465238 
     13  * debian/patches/90_relibtoolize.patch 
     14    - Refresh for new upstream release. 
     15  * Switch to source formate 3.0 (quilt) 
     16    - Add debian/source/format. 
     17    - Drop Build-Depends on quilt. 
     18    - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules. 
     19  * Bump-Standards-Version to 3.9.0 
     20    - Use architecture wildcard kfreebsd-any for the libcam-dev Build-Depends. 
     21    - Use Breaks instead of Conflicts as recommended by the new policy. 
     22 
     23 -- Michael Biebl <biebl@debian.org>  Sun, 04 Jul 2010 15:14:24 +0200 
     24 
     25brasero (2.30.1-1) unstable; urgency=low 
     26 
     27  * 31_link_libice.patch: new patch. Explicitly link to libice. 
     28    Closes: #554057. 
     29  * Drop build-dependency on libbeagle since beagle is going to be  
     30    removed. 
     31  * New upstream release. 
     32  * Update build-dependencies. 
     33  * Disable introspection support to avoid blocking the totem  
     34    transition. 
     35  * Bump shlibs to 2.30. 
     36  * 01_pkglibdir.patch, 90_relibtoolize.patch: updated for the new  
     37    version. 
     38 
     39 -- Josselin Mouette <joss@debian.org>  Mon, 03 May 2010 16:02:19 +0200 
     40 
     41brasero (2.28.3-3) unstable; urgency=low 
     42 
     43  * Enable cdrkit again, but in a separate package brasero-cdrkit that  
     44    will not be installed by default. 
     45  * Make it clear which features are brought by this package: mostly  
     46    video DVD creation, CD-Text. 
     47 
     48 -- Josselin Mouette <joss@debian.org>  Tue, 19 Jan 2010 17:44:30 +0100 
     49 
     50brasero (2.28.3-2) unstable; urgency=low 
     51 
     52  * Enable libburnia plugins, adding corresponding build-dependencies. 
     53  * Entirely disable cdrtools *and* cdrkit plugins. This will remove any  
     54    reference to schilyware. 
     55  * Rename 011_* patch to 11_. 
     56  * 01_pkglibdir.patch: use $(pkglibdir) instead of $(libdir)/brasero so  
     57    that it can be overriden. 
     58  * 90_relibtoolize.patch: re-apply the autotools on top of it. 
     59  * Pass pkglibdir= argument to make invocation, with a versioned  
     60    directory. 
     61  * Install the plugins in libbrasero-media0 instead of brasero. 
     62  * Force strict dependency for brasero on libbrasero-media0. 
     63  * Move some dependencies/recommends to libbrasero-media0 as well. 
     64 
     65 -- Josselin Mouette <joss@debian.org>  Wed, 13 Jan 2010 20:51:03 +0100 
    666 
    767brasero (2.28.3-1) unstable; urgency=low 
  • pkg/vinnie/main/brasero/trunk/debian/control

    r6177 r6785  
    1212               cdbs, 
    1313               gnome-pkg-tools (>= 0.7), 
    14                quilt, 
    15                libcam-dev [kfreebsd-i386 kfreebsd-amd64], 
    16                libglib2.0-dev (>= 2.15.6), 
    17                libgtk2.0-dev (>= 2.16.0), 
     14               libcam-dev [kfreebsd-any], 
     15               libglib2.0-dev (>= 2.22.0), 
     16               libgtk2.0-dev (>= 2.19.7), 
    1817               libgconf2-dev, 
    1918               libgstreamer0.10-dev (>= 0.10.15), 
     
    2120               libxml2-dev (>= 2.6.0), 
    2221               libdbus-glib-1-dev (>= 0.7.2), 
    23                gtk-doc-tools (>= 1.9), 
     22               libcanberra-gtk-dev (>= 0.1), 
     23               gtk-doc-tools (>= 1.12), 
    2424               gnome-doc-utils (>= 0.3.2), 
    2525               scrollkeeper, 
     
    2727               libsm-dev, 
    2828               libnautilus-extension-dev (>= 2.22.2), 
    29                libbeagle-dev (>= 0.3.0), 
    30                libtotem-plparser-dev (>= 2.22.0), 
     29               libburn-dev (>= 0.4.0), 
     30               libisofs-dev (>= 0.6.4), 
     31               libtracker-client-0.8-dev (>= 0.8.0), 
     32               libtotem-plparser-dev (>= 2.29.1), 
    3133               libunique-dev (>= 1.0.0), 
     34               libnotify-dev (>= 0.3.0), 
    3235               intltool (>= 0.35.0) 
    33 Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Gustavo Noronha Silva <kov@debian.org>, Josselin Mouette <joss@debian.org> 
    34 Standards-Version: 3.8.3 
     36Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org> 
     37Standards-Version: 3.9.0 
    3538Homepage: http://www.gnome.org/projects/brasero/ 
    3639Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/brasero/ 
     
    4447         gnome-icon-theme, 
    4548         gvfs, 
    46          wodim, 
    47          genisoimage, 
    48          dvd+rw-tools, 
     49         libbrasero-media0 (= ${binary:Version}), 
    4950         brasero-common (>= ${gnome:Version}), 
    5051         brasero-common (<< ${gnome:NextVersion}) 
    51 Recommends: gstreamer0.10-plugins-good, 
    52             gstreamer0.10-plugins-ugly, 
    53             cdrdao 
    54 Suggests: gstreamer0.10-plugins-bad, 
    55           dvdauthor, 
    56           vcdimager, 
     52Suggests: vcdimager, 
    5753          libdvdcss2 
    5854Conflicts: nautilus-cd-burner 
     
    6460  * On-the-fly conversion of music playlists in all formats supported by  
    6561    GStreamer 
    66   * CD-Text writing 
    6762 . 
    6863 This package contains the main binary, the burning plugins and the  
     
    7166 The following packages, if installed, will provide Brasero with added  
    7267 functionality: 
    73   * GStreamer backends to support more audio or video formats 
    74   * dvdauthor to create video DVDs 
     68  * cdrdao to burn combined data/audio CDs and for byte-to-byte copy 
     69  * GStreamer backends to support more audio formats 
    7570  * vcdimager to create VCDs or SVCDs 
    7671  * libdvdcss2 to copy encrypted DVDs 
     
    8075Depends: ${misc:Depends} 
    8176Replaces: brasero (<< 2.26) 
    82 Conflicts: brasero (<< 2.26) 
     77Breaks: brasero (<< 2.26) 
    8378Description: Common files for the Brasero CD burning application and library 
    8479 Brasero is a simple application to burn, copy and erase CD and DVD  
     
    8782 This package contains the common files and translations. 
    8883 
     84Package: brasero-cdrkit 
     85Architecture: any 
     86Depends: ${shlibs:Depends}, 
     87         ${misc:Depends}, 
     88         libbrasero-media0 (= ${binary:Version}), 
     89         genisoimage, 
     90         wodim 
     91Replaces: libbrasero-media0 (<< 2.28.3-3) 
     92Recommends: dvdauthor 
     93Suggests: readom 
     94Description: cdrkit extensions for the Brasero burning application 
     95 Brasero is a simple application to burn, copy and erase CD and DVD 
     96 media. 
     97 . 
     98 This package contains extensions for Brasero, based on the genisoimage,  
     99 wodim, readom and dvdauthor programs. They are only needed for the  
     100 following operations in Brasero: 
     101  * Audio CD burning with CD-Text information 
     102  * Video DVD creation 
     103 
    89104Package: libbrasero-media0 
    90105Architecture: any 
     
    92107Depends: ${shlibs:Depends}, 
    93108         ${misc:Depends}, 
     109         dvd+rw-tools, 
    94110         brasero-common (>= ${gnome:Version}), 
    95111         brasero-common (<< ${gnome:NextVersion}) 
     112Recommends: gnome-icon-theme, 
     113            gstreamer0.10-plugins-good, 
     114            gstreamer0.10-plugins-ugly, 
     115            cdrdao 
     116Suggests: gstreamer0.10-plugins-bad 
    96117Description: CD/DVD burning library for GNOME - runtime 
    97118 Libbrasero is a simple library to burn, copy and erase CD and DVD  
  • pkg/vinnie/main/brasero/trunk/debian/control.in

    r6033 r6785  
    77               cdbs, 
    88               gnome-pkg-tools (>= 0.7), 
    9                quilt, 
    10                libcam-dev [kfreebsd-i386 kfreebsd-amd64], 
    11                libglib2.0-dev (>= 2.15.6), 
    12                libgtk2.0-dev (>= 2.16.0), 
     9               libcam-dev [kfreebsd-any], 
     10               libglib2.0-dev (>= 2.22.0), 
     11               libgtk2.0-dev (>= 2.19.7), 
    1312               libgconf2-dev, 
    1413               libgstreamer0.10-dev (>= 0.10.15), 
     
    1615               libxml2-dev (>= 2.6.0), 
    1716               libdbus-glib-1-dev (>= 0.7.2), 
    18                gtk-doc-tools (>= 1.9), 
     17               libcanberra-gtk-dev (>= 0.1), 
     18               gtk-doc-tools (>= 1.12), 
    1919               gnome-doc-utils (>= 0.3.2), 
    2020               scrollkeeper, 
     
    2222               libsm-dev, 
    2323               libnautilus-extension-dev (>= 2.22.2), 
    24                libbeagle-dev (>= 0.3.0), 
    25                libtotem-plparser-dev (>= 2.22.0), 
     24               libburn-dev (>= 0.4.0), 
     25               libisofs-dev (>= 0.6.4), 
     26               libtracker-client-0.8-dev (>= 0.8.0), 
     27               libtotem-plparser-dev (>= 2.29.1), 
    2628               libunique-dev (>= 1.0.0), 
     29               libnotify-dev (>= 0.3.0), 
    2730               intltool (>= 0.35.0) 
    2831Uploaders: @GNOME_TEAM@ 
    29 Standards-Version: 3.8.3 
     32Standards-Version: 3.9.0 
    3033Homepage: http://www.gnome.org/projects/brasero/ 
    3134Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/brasero/ 
     
    3942         gnome-icon-theme, 
    4043         gvfs, 
    41          wodim, 
    42          genisoimage, 
    43          dvd+rw-tools, 
     44         libbrasero-media0 (= ${binary:Version}), 
    4445         brasero-common (>= ${gnome:Version}), 
    4546         brasero-common (<< ${gnome:NextVersion}) 
    46 Recommends: gstreamer0.10-plugins-good, 
    47             gstreamer0.10-plugins-ugly, 
    48             cdrdao 
    49 Suggests: gstreamer0.10-plugins-bad, 
    50           dvdauthor, 
    51           vcdimager, 
     47Suggests: vcdimager, 
    5248          libdvdcss2 
    5349Conflicts: nautilus-cd-burner 
     
    5955  * On-the-fly conversion of music playlists in all formats supported by  
    6056    GStreamer 
    61   * CD-Text writing 
    6257 . 
    6358 This package contains the main binary, the burning plugins and the  
     
    6661 The following packages, if installed, will provide Brasero with added  
    6762 functionality: 
    68   * GStreamer backends to support more audio or video formats 
    69   * dvdauthor to create video DVDs 
     63  * cdrdao to burn combined data/audio CDs and for byte-to-byte copy 
     64  * GStreamer backends to support more audio formats 
    7065  * vcdimager to create VCDs or SVCDs 
    7166  * libdvdcss2 to copy encrypted DVDs 
     
    7570Depends: ${misc:Depends} 
    7671Replaces: brasero (<< 2.26) 
    77 Conflicts: brasero (<< 2.26) 
     72Breaks: brasero (<< 2.26) 
    7873Description: Common files for the Brasero CD burning application and library 
    7974 Brasero is a simple application to burn, copy and erase CD and DVD  
     
    8277 This package contains the common files and translations. 
    8378 
     79Package: brasero-cdrkit 
     80Architecture: any 
     81Depends: ${shlibs:Depends}, 
     82         ${misc:Depends}, 
     83         libbrasero-media0 (= ${binary:Version}), 
     84         genisoimage, 
     85         wodim 
     86Replaces: libbrasero-media0 (<< 2.28.3-3) 
     87Recommends: dvdauthor 
     88Suggests: readom 
     89Description: cdrkit extensions for the Brasero burning application 
     90 Brasero is a simple application to burn, copy and erase CD and DVD 
     91 media. 
     92 . 
     93 This package contains extensions for Brasero, based on the genisoimage,  
     94 wodim, readom and dvdauthor programs. They are only needed for the  
     95 following operations in Brasero: 
     96  * Audio CD burning with CD-Text information 
     97  * Video DVD creation 
     98 
    8499Package: libbrasero-media0 
    85100Architecture: any 
     
    87102Depends: ${shlibs:Depends}, 
    88103         ${misc:Depends}, 
     104         dvd+rw-tools, 
    89105         brasero-common (>= ${gnome:Version}), 
    90106         brasero-common (<< ${gnome:NextVersion}) 
     107Recommends: gnome-icon-theme, 
     108            gstreamer0.10-plugins-good, 
     109            gstreamer0.10-plugins-ugly, 
     110            cdrdao 
     111Suggests: gstreamer0.10-plugins-bad 
    91112Description: CD/DVD burning library for GNOME - runtime 
    92113 Libbrasero is a simple library to burn, copy and erase CD and DVD  
  • pkg/vinnie/main/brasero/trunk/debian/libbrasero-media0.install

    r5506 r6785  
    11debian/tmp/usr/lib/*.so.* 
     2debian/tmp/usr/lib/brasero-*/plugins/*.so 
  • pkg/vinnie/main/brasero/trunk/debian/patches/series

    r6033 r6785  
    1 011_nautilus_menu_no_display.patch 
     101_pkglibdir.patch 
     211_nautilus_menu_no_display.patch 
     331_link_libice.patch 
     490_relibtoolize.patch 
  • pkg/vinnie/main/brasero/trunk/debian/rules

    r6033 r6785  
    22 
    33include /usr/share/cdbs/1/rules/debhelper.mk 
    4 include /usr/share/cdbs/1/rules/patchsys-quilt.mk 
    54include /usr/share/cdbs/1/rules/utils.mk 
    65include /usr/share/cdbs/1/class/gnome.mk 
     
    1211DEB_DESTDIR := $(CURDIR)/debian/tmp/ 
    1312 
    14 libbrasero-mediaN := $(shell sed -rn 's/^Package:[[:space:]]*(libbrasero-media[0-9]+)[[:space:]]*$$/\1/p' debian/control) 
     13SOVERSION := $(shell sed -rn 's/^Package:[[:space:]]*libbrasero-media([0-9]+)[[:space:]]*$$/\1/p' debian/control) 
     14SHLIBS := 2.30 
    1515 
    16 DEB_DH_MAKESHLIBS_ARGS_$(libbrasero-mediaN) += -V '$(libbrasero-mediaN) (>= 2.27.92)' 
    17 DEB_DH_MAKESHLIBS_ARGS_libbrasero-plugins += --no-act 
     16DEB_DH_MAKESHLIBS_ARGS_libbrasero-media$(SOVERSION) += -V 'libbrasero-media$(SOVERSION) (>= $(SHLIBS))' -Xplugins 
    1817DEB_DH_MAKESHLIBS_ARGS_brasero += --no-act 
     18DEB_DH_MAKESHLIBS_ARGS_brasero-cdrkit += --no-act 
    1919 
    2020DEB_CONFIGURE_EXTRA_FLAGS += \ 
    21         --disable-libburnia \ 
     21        --disable-cdrtools \ 
    2222        --disable-scrollkeeper \ 
    23         --disable-caches 
     23        --disable-caches \ 
     24        --enable-search=tracker \ 
     25        --disable-introspection 
     26 
     27DEB_MAKE_EXTRA_ARGS += pkglibdir=/usr/lib/brasero-$(SOVERSION) 
    2428 
    2529ifneq ($(DEB_BUILD_ARCH_OS), linux) 
     
    2731endif 
    2832 
     33binary-install/brasero-cdrkit:: binary-install/libbrasero-media$(SOVERSION) 
     34        mkdir -p debian/brasero-cdrkit/usr/lib/brasero-$(SOVERSION)/plugins 
     35        for i in dvdauthor vob genisoimage wodim readom; do \ 
     36          mv debian/libbrasero-media$(SOVERSION)/usr/lib/brasero-$(SOVERSION)/plugins/libbrasero-$$i.so \ 
     37             debian/brasero-cdrkit/usr/lib/brasero-$(SOVERSION)/plugins/ ; \ 
     38        done 
Note: See TracChangeset for help on using the changeset viewer.