Changeset 1f4f2234474ef96706c1b2495c1301f1984596de

Timestamp:

06/28/03 01:31:24 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1056756684 +0000

git-parent:

[e2ea67fb37ada6b361c271f73570adef9edc0b84]

git-author:

Sam Hocevar <sam@videolan.org> 1056756684 +0000

Message:

• 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.
  

Files:

• .cvsignore (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• bootstrap (modified) (3 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/rules (modified) (16 diffs)
• vlc-config.in.in (modified) (1 diff)

.cvsignore

@@ -26 +26 @@
-vlc-log.*
-vlc-config
+vlc-config.in
-vlc
-VLC.app

Makefile.am

@@ -8 +8 @@
-# something. DIST_SUBDIRS stores the directories where nothing is built but
-# which have makefiles with distribution information.
-
-modules 
+modules 
+
-
-EXTRA_DIST = \

bootstrap

@@ -2 +2 @@
-
-##  bootstrap file for the VLC media player
-2 2003/06/27 13:50:07
+3 2003/06/27 23:31:24
-##
-##  Authors: Sam Hocevar <sam@zoy.org>
@@ -69 +69 @@
-# Autogenerated by bootstrap - DO NOT EDIT
-EXTRA_DIST = LIST
-.
-
+`sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`
+
-EOF
-
@@ -92 +92 @@
-EXTRA_DIST = Modules.am
-BUILT_SOURCES =
-.
-
+${subdirs}
+
-libvlcdir = \$(libdir)/vlc/${basedir}
-include Modules.am

debian/changelog

@@ -1 @@
-
-
+
+
+
-  * debian/rules:
-    + Replaced $(DEB_BUILD_ARCH) with `dpkg-architecture -qDEB_BUILD_GNU_CPU`

debian/control

@@ -157 +157 @@
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Provides: vlc-gui
-
-
-
+
+
+
+
+
-
-Package: vlc-alsa

debian/rules

@@ -85 +85 @@
-    test -d extras/ffmpeg
-    if test ! -d CVS; then \
-   
-   
-   
-   
+  
+  
+  
+  
-    fi
-
@@ -94 +94 @@
-    test -d extras/faad
-    if test ! -d CVS; then \
-   
-   
-   
-   
-   
-   
-   
-   
-   
+  
+  
+  
+  
+  
+  
+  
+  
+  
-    fi
-
@@ -108 +108 @@
-    test -d extras/mpeg2dec
-    if test ! -d CVS; then \
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
-    fi
-
-    # Configure VLC
-    ./configure --mandir=$${prefix}/share/man \
-   
+  
-
-    touch configure-stamp
@@ -136 +136 @@
-    # Hackety hackety hack
-    if test ! -d CVS; then \
-   
-   
-   
-   
-   
-   
+  
+  
+  
+  
+  
+  
-    fi
-
-    # HACKETY HACKETY HACK
-    if test ! -d CVS; then \
-   
-   
-   
+  
+  
+  
-    fi
-
-    # HACK ME PLENTY MORE!!!
-    if test ! -d CVS; then \
-   
-   
-   
+  
+  
+  
-    fi
-endif
@@ -215 +215 @@
-    ln -s vlc debian/gnome-vlc/usr/share/doc/gnome-vlc
-    mv debian/vlc/usr/lib/vlc/misc/libgnome_main_plugin.so \
-   
+  
-    mv debian/vlc/usr/lib/vlc/gui/libgnome_plugin.so \
-   
+  
-    ln -s vlc.1.gz debian/gnome-vlc/usr/share/man/man1/gnome-vlc.1.gz
-    mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm
@@ -230 +230 @@
-    ln -s vlc debian/gvlc/usr/share/doc/gvlc
-    mv debian/vlc/usr/lib/vlc/misc/libgtk_main_plugin.so \
-   
+  
-    mv debian/vlc/usr/lib/vlc/gui/libgtk_plugin.so \
-   
+  
-    mv debian/vlc/usr/lib/vlc/gui/libfamiliar_plugin.so \
-   
+  
-    ln -s vlc.1.gz debian/gvlc/usr/share/man/man1/gvlc.1.gz
-    mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
@@ -246 +246 @@
-    ln -s vlc debian/vlc-plugin-esd/usr/share/doc/vlc-plugin-esd
-    mv debian/vlc/usr/lib/vlc/audio_output/libesd_plugin.so \
-   
+  
-
-    # Package: vlc-esd
@@ -255 +255 @@
-    ln -s vlc debian/vlc-plugin-alsa/usr/share/doc/vlc-plugin-alsa
-    mv debian/vlc/usr/lib/vlc/audio_output/libalsa_plugin.so \
-   
+  
-
-    # Package: vlc-alsa
@@ -264 +264 @@
-    ln -s vlc debian/vlc-plugin-sdl/usr/share/doc/vlc-plugin-sdl
-    mv debian/vlc/usr/lib/vlc/audio_output/libaout_sdl_plugin.so \
-   
+  
-    mv debian/vlc/usr/lib/vlc/video_output/libvout_sdl_plugin.so \
-   
+  
-
-    # Package: vlc-sdl
@@ -275 +275 @@
-    ln -s vlc debian/vlc-plugin-ggi/usr/share/doc/vlc-plugin-ggi
-    mv debian/vlc/usr/lib/vlc/video_output/libggi_plugin.so \
-   
+  
-
-    # Package: vlc-ggi
@@ -285 +285 @@
-    ln -s vlc debian/vlc-plugin-glide/usr/share/doc/vlc-plugin-glide
-    mv debian/vlc/usr/lib/vlc/video_output/libglide_plugin.so \
-   
+  
-
-    # Package: vlc-glide
@@ -296 +296 @@
-    ln -s vlc debian/qvlc/usr/share/doc/qvlc
-    mv debian/vlc/usr/lib/vlc/gui/libqt_plugin.so \
-   
+  
-    ln -s vlc.1.gz debian/qvlc/usr/share/man/man1/qvlc.1.gz
-    mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
@@ -308 +308 @@
-    ln -s vlc debian/vlc-plugin-arts/usr/share/doc/vlc-plugin-arts
-    mv debian/vlc/usr/lib/vlc/audio_output/libarts_plugin.so \
-   
+  
-
-    # Package: mozilla-plugin-vlc
@@ -318 +318 @@
-    ln -s vlc debian/kvlc/usr/share/doc/kvlc
-    mv debian/vlc/usr/lib/vlc/gui/libkde_plugin.so \
-   
+  
-    mv debian/vlc/usr/share/vlc/ui.rc \
-   
+  
-    ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz
-    mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm
@@ -329 +329 @@
-    ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
-    mv debian/vlc/usr/lib/vlc/video_output/libsvgalib_plugin.so \
-   
+  
-endif
-
@@ -336 +336 @@
-    ln -s vlc debian/wxvlc/usr/share/doc/wxvlc
-    mv debian/vlc/usr/lib/vlc/gui/libwxwindows_plugin.so \
-
+
+
+
+
+
-    ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/wxvlc.1.gz
-

vlc-config.in.in

@@ -13 +13 @@
-plugins="@PLUGINS@"
-builtins="@BUILTINS@"
+
+cppflags="${cppflags} -DDEBUG"
+cflags="${cflags} -g"
+cxxflags="${cxxflags} -g"
+objcflags="${objcflags} -g"
+ldflags="${objcflags} -g"
-
-cflags_tuning="@CFLAGS_TUNING@"