Changeset 00aa8b77e2e8e6250b48c39b9790f09477926e3e

Show
Ignore:
Timestamp:
21/06/03 18:09:13 (5 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1056211753 +0000
git-parent:

[f964889a9743d82c0a5d9edb41891a62c88b9d03]

git-author:
Sam Hocevar <sam@videolan.org> 1056211753 +0000
Message:
  • debian/rules:
    + Use the -s flag instead of -a so that debhelper properly handles the

i386-only plugin packages.

+ Split the build rule into configure and build.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • debian/changelog

    r618d4d6 r00aa8b7  
    1 vlc (0.5.3-4) unstable; urgency=low 
     1vlc (0.6.0-1) unstable; urgency=low 
    22 
    33  * debian/rules: 
    44    + Replaced $(DEB_BUILD_ARCH) with `dpkg-architecture -qDEB_BUILD_GNU_CPU` 
    55      so that the rules can be called directly. 
     6    + Use the -s flag instead of -a so that debhelper properly handles the 
     7      i386-only plugin packages. 
     8    + Split the build rule into configure and build. 
    69  * debian/control: 
    710    + Removed leading "a"s from package descriptions. 
    811    + Set policy to 3.5.10. 
    912 
    10  -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sat, 7 Jun 2003 17:46:36 +0200 
     13 -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sat, 21 Jun 2003 17:55:07 +0200 
    1114 
    1215vlc (0.5.3-3) unstable; urgency=low 

  • debian/control

    r618d4d6 r00aa8b7  
    22Section: graphics 
    33Priority: optional 
    4 Maintainer: Samuel Hocevar <sam@zoy.org> 
     4Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org> 
    55Build-Depends: debhelper (>=3.0), gettext, fortune-mod, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>=0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev, svgalibg1-dev (>=1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev (>=1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>=1.1.0) 
    66Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev 
    …… 
    4141 it, use the `--intf gnome' flag or run the `gnome-vlc' program. 
    4242 
    43 Package: vlc-gnome 
    44 Section: gnome 
    45 Architecture: any 
    46 Depends: vlc, gnome-vlc 
    47 Description: legacy package that you should remove 
    48  This package is now called gnome-vlc. 
    49  
    5043Package: gvlc 
    5144Architecture: any 
    …… 
    5750 This plugin adds a GTK+ interface to the VLC media player. To activate 
    5851 it, use the `--intf gtk' flag or run the `gvlc' program. 
    59  
    60 Package: vlc-gtk 
    61 Architecture: any 
    62 Depends: vlc, gvlc 
    63 Description: legacy package that you should remove 
    64  This package is now called gvlc. 
    6552 
    6653Package: vlc-plugin-esd 
    …… 
    7461 `esd' audio output plugin from the preferences menu. 
    7562 
    76 Package: vlc-esd 
    77 Architecture: any 
    78 Depends: vlc, vlc-plugin-esd 
    79 Description: legacy package that you should remove 
    80  This package is now called vlc-plugin-esd. 
    81  
    8263Package: vlc-plugin-alsa 
    8364Architecture: any 
    …… 
    8970 the VLC media player. To activate it, use the `--aout alsa' flag or 
    9071 select the `alsa' audio output plugin from the preferences menu. 
    91  
    92 Package: vlc-alsa 
    93 Architecture: any 
    94 Depends: vlc, vlc-plugin-alsa 
    95 Description: legacy package that you should remove 
    96  This package is now called vlc-plugin-alsa. 
    9772 
    9873Package: vlc-plugin-sdl 
    …… 
    10782 from the preferences menu. 
    10883 
    109 Package: vlc-sdl 
    110 Architecture: any 
    111 Depends: vlc, vlc-plugin-sdl 
    112 Description: legacy package that you should remove 
    113  This package is now called vlc-plugin-sdl. 
    114  
    11584Package: vlc-plugin-ggi 
    11685Architecture: any 
    …… 
    12291 the `--vout ggi' flag or select the `ggi' video output plugin from the 
    12392 preferences menu. 
    124  
    125 Package: vlc-ggi 
    126 Architecture: any 
    127 Depends: vlc, vlc-plugin-ggi 
    128 Description: legacy package that you should remove 
    129  This package is now called vlc-plugin-ggi. 
    13093 
    13194Package: vlc-plugin-glide 
    …… 
    139102 plugin from the preferences menu. 
    140103 
    141 Package: vlc-glide 
    142 Architecture: i386 
    143 Depends: vlc, vlc-plugin-glide 
    144 Description: legacy package that you should remove 
    145  This package is now called vlc-plugin-glide. 
    146  
    147104Package: qvlc 
    148105Architecture: any 
    …… 
    154111 This plugin adds a Qt interface to the VLC media player. To activate it, 
    155112 use the `--intf qt' flag or run the `qvlc' program. 
    156  
    157 Package: vlc-qt 
    158 Architecture: any 
    159 Depends: vlc, qvlc 
    160 Description: legacy package that you should remove 
    161  This package is now called qvlc. 
    162113 
    163114Package: vlc-plugin-arts 
    …… 
    210161 activate it, use the `--intf wxwin' flag or run the `wxvlc' program. 
    211162 
     163Package: vlc-alsa 
     164Architecture: any 
     165Depends: vlc, vlc-plugin-alsa 
     166Description: legacy package that you should remove 
     167 This package is now called vlc-plugin-alsa. 
     168 
     169Package: vlc-esd 
     170Architecture: any 
     171Depends: vlc, vlc-plugin-esd 
     172Description: legacy package that you should remove 
     173 This package is now called vlc-plugin-esd. 
     174 
     175Package: vlc-ggi 
     176Architecture: any 
     177Depends: vlc, vlc-plugin-ggi 
     178Description: legacy package that you should remove 
     179 This package is now called vlc-plugin-ggi. 
     180 
     181Package: vlc-glide 
     182Architecture: i386 
     183Depends: vlc, vlc-plugin-glide 
     184Description: legacy package that you should remove 
     185 This package is now called vlc-plugin-glide. 
     186 
     187Package: vlc-gnome 
     188Section: gnome 
     189Architecture: any 
     190Depends: vlc, gnome-vlc 
     191Description: legacy package that you should remove 
     192 This package is now called gnome-vlc. 
     193 
     194Package: vlc-gtk 
     195Architecture: any 
     196Depends: vlc, gvlc 
     197Description: legacy package that you should remove 
     198 This package is now called gvlc. 
     199 
     200Package: vlc-qt 
     201Architecture: any 
     202Depends: vlc, qvlc 
     203Description: legacy package that you should remove 
     204 This package is now called qvlc. 
     205 
     206Package: vlc-sdl 
     207Architecture: any 
     208Depends: vlc, vlc-plugin-sdl 
     209Description: legacy package that you should remove 
     210 This package is now called vlc-plugin-sdl. 
     211 

  • debian/rules

    r618d4d6 r00aa8b7  
    1212# Compilation options 
    1313# 
    14  
    15 ARCH_EXCLUDE = 
    1614 
    1715CONFIG_FLAGS = --enable-release --prefix=/usr 
    …… 
    5553CONFIG_FLAGS += --enable-glide 
    5654CONFIG_FLAGS += --enable-svgalib 
    57 else 
    58 ARCH_EXCLUDE += -Nvlc-plugin-glide -Nvlc-glide 
    59 ARCH_EXCLUDE += -Nvlc-plugin-svgalib 
    6055endif 
    6156 
    …… 
    7267# 
    7368 
    74 build: build-stamp 
    75 build-stamp: 
     69configure: configure-stamp 
     70configure-stamp: 
    7671    dh_testdir 
    7772 
    …… 
    125120        --infodir=$${prefix}/share/info $(CONFIG_FLAGS) 
    126121 
     122    touch configure-stamp 
     123 
     124build: configure-stamp build-stamp 
     125build-stamp: 
     126    dh_testdir 
     127 
    127128    # Build only VLC, with the non-PIC libs 
    128129    $(MAKE) vlc 
    …… 
    162163    dh_testdir 
    163164    dh_testroot 
    164     rm -f build-stamp 
     165    rm -f configure-stamp build-stamp 
    165166 
    166167    # Check that we have an ffmpeg tree in here (can be a symlink) 
    …… 
    351352    dh_installdocs -p vlc 
    352353#   dh_installexamples 
    353     dh_installmenu 
    354     dh_installmime 
     354    dh_installmenu -s 
     355    dh_installmime -s 
    355356    dh_installman doc/vlc.1 -p vlc 
    356357    dh_installman doc/vlc-config.1 -p libvlc0-dev 
    …… 
    358359    cp ChangeLog debian/vlc/usr/share/doc/vlc/changelog 
    359360    cp debian/changelog debian/vlc/usr/share/doc/vlc/changelog.Debian 
    360     dh_link 
    361     dh_strip 
    362     dh_compress 
    363     dh_fixperms 
    364     dh_makeshlibs 
    365     dh_installdeb 
     361    dh_link -s 
     362    dh_strip -s 
     363    dh_compress -s 
     364    dh_fixperms -s 
     365    dh_makeshlibs -s 
     366    dh_installdeb -s 
    366367#   dh_perl 
    367     dh_shlibdeps $(ARCH_EXCLUDE) 
    368     dh_gencontrol $(ARCH_EXCLUDE) 
    369     dh_md5sums $(ARCH_EXCLUDE) 
    370     dh_builddeb $(ARCH_EXCLUDE) 
     368    dh_shlibdeps -s 
     369    dh_gencontrol -s 
     370    dh_md5sums -s 
     371    dh_builddeb -s 
    371372 
    372373binary: binary-indep binary-arch