Commit 1f4f2234 authored by Sam Hocevar's avatar Sam Hocevar

* debian/changelog:

    + Updated to the latest Debian unstable upload.
  * debian/rules:
    + Moved the skins interface into the wxvlc package.
    + Cosmetic fixes.
  * debian/control:
    + Updated the description of the wxvlc package.
  * bootstrap:
    + Put subdirectories of modules/ in SUBDIRS, not DIST_SUBDIRS.
  * Makefile.am:
    + Put modules in SUBDIRS, not DIST_SUBDIRS.
  * .cvsignore:
    + Ignore vlc-config.in.
parent e2ea67fb
......@@ -25,6 +25,7 @@ aclocal.m4
vlc-debug.*
vlc-log.*
vlc-config
vlc-config.in
vlc
VLC.app
vlc.exe
......@@ -7,8 +7,8 @@ NULL =
# SUBDIRS stores the directories where a "make" is required when building
# something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information.
SUBDIRS = intl . share po m4
DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools
SUBDIRS = intl modules . share po m4
DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
EXTRA_DIST = \
HACKING \
......
#! /bin/sh
## bootstrap file for the VLC media player
## $Id: bootstrap,v 1.52 2003/06/27 13:50:07 sam Exp $
## $Id: bootstrap,v 1.53 2003/06/27 23:31:24 sam Exp $
##
## Authors: Sam Hocevar <sam@zoy.org>
......@@ -68,8 +68,8 @@ count=0
rm -f modules/Makefile.am && cat > modules/Makefile.am << EOF
# Autogenerated by bootstrap - DO NOT EDIT
EXTRA_DIST = LIST
SUBDIRS = .
DIST_SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`
SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`
#DIST_SUBDIRS = \$(SUBDIRS)
EOF
for dir in `sed -ne 's,\(modules/.*\)/Makefile,\1,p' configure.ac`
......@@ -91,8 +91,8 @@ noinst_LIBRARIES =
noinst_HEADERS =
EXTRA_DIST = Modules.am
BUILT_SOURCES =
SUBDIRS = .
DIST_SUBDIRS = ${subdirs}
SUBDIRS = ${subdirs}
#DIST_SUBDIRS = \$(SUBDIRS)
libvlcdir = \$(libdir)/vlc/${basedir}
include Modules.am
EOF
......
vlc (0.6.0-1) unstable; urgency=low
vlc (0.6.0+cvs-20030627-1) unstable; urgency=low
* New upstream release.
* debian/rules:
+ Replaced $(DEB_BUILD_ARCH) with `dpkg-architecture -qDEB_BUILD_GNU_CPU`
so that the rules can be called directly.
......
......@@ -156,9 +156,11 @@ Package: wxvlc
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Provides: vlc-gui
Description: wxWindows frontend for VLC
This plugin adds a wxWindow interface to the VLC media player. To
activate it, use the `--intf wxwin' flag or run the `wxvlc' program.
Description: wxWindows and skins frontends for VLC
This plugin adds a wxWindow interface and a skinnable interface to the
VLC media player. To activate the wxWindow GUI, use the `--intf wxwin'
flag or run the `wxvlc' program. To activate the skinnable GUI, use the
`--intf skins' flag.
Package: vlc-alsa
Architecture: any
......
......@@ -336,6 +336,10 @@ endif
ln -s vlc debian/wxvlc/usr/share/doc/wxvlc
mv debian/vlc/usr/lib/vlc/gui/libwxwindows_plugin.so \
debian/wxvlc/usr/lib/vlc/gui/
mv debian/vlc/usr/lib/vlc/gui/libskins_plugin.so \
debian/wxvlc/usr/lib/vlc/gui/
mv debian/vlc/usr/share/vlc/skins \
debian/wxvlc/usr/share/vlc/
ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/wxvlc.1.gz
# Clean up
......
......@@ -13,6 +13,12 @@ optim="@optim@"
plugins="@PLUGINS@"
builtins="@BUILTINS@"
cppflags="${cppflags} -DDEBUG"
cflags="${cflags} -g"
cxxflags="${cxxflags} -g"
objcflags="${objcflags} -g"
ldflags="${objcflags} -g"
cflags_tuning="@CFLAGS_TUNING@"
cflags_optim="@CFLAGS_OPTIM@"
cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment