r1215 - in /videolan/vlc/debian: ./ changelog control libvlc1-dev.install libvlc1.install libvlc2-dev.install libvlc2.install libvlccore0-dev.install libvlccore0.install patches/001_as-needed.diff patches/series rules

xtophe-guest at users.alioth.debian.org xtophe-guest at users.alioth.debian.org
Sat May 31 21:09:50 UTC 2008 

Author: xtophe-guest
Date: Sat May 31 21:09:50 2008
New Revision: 1215

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1215
Log:
Fix packaging for new organisation of libvlc and libvlccore (1st try)

Added:
    videolan/vlc/debian/libvlc2-dev.install
      - copied, changed from r1188, videolan/vlc/debian/libvlc1-dev.install
    videolan/vlc/debian/libvlc2.install
      - copied, changed from r1188, videolan/vlc/debian/libvlc1.install
    videolan/vlc/debian/libvlccore0-dev.install
    videolan/vlc/debian/libvlccore0.install
    videolan/vlc/debian/patches/001_as-needed.diff
Removed:
    videolan/vlc/debian/libvlc1-dev.install
    videolan/vlc/debian/libvlc1.install
Modified:
    videolan/vlc/debian/   (props changed)
    videolan/vlc/debian/changelog
    videolan/vlc/debian/control
    videolan/vlc/debian/patches/series
    videolan/vlc/debian/rules

Propchange: videolan/vlc/debian/
------------------------------------------------------------------------------
    svn-bp:tagsUrl = svn+ssh://svn.debian.org/svn/pkg-multimedia/tags/vlc

Modified: videolan/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/changelog?rev=1215&op=diff
==============================================================================
--- videolan/vlc/debian/changelog (original)
+++ videolan/vlc/debian/changelog Sat May 31 21:09:50 2008
@@ -6,7 +6,7 @@
 
   [Christophe Mutricy]
   * debian/control
-    + SONAME change.
+    + SONAME change(twice)
     + Replaces/Conficts between vlc and vlc-nox. It should help the
       transition between sid and nightlies.
     + Build-depends on libswsale-dev, libshout3-dev, libxpm-dev, zlib1g-dev, liblua5.1-0-dev,
@@ -50,18 +50,15 @@
     + vmem
     + blendbench
     +dynamicoverlay
-  * Install libvlc-control.so in libvlc1
   * vlc-plugin-jack.install
     + Add the jack access module
   * mozilla-plugin-vlc
     + Add the toolbar pictures
-  * libvlc1-dev.install
-    + add the pkg-config file and remove vlc-config
-    + add the plugins headers
   * bug/*  + relevant symlinks
     + Add reportbug magic to avoid bug being reported to Debian's BTS
   * patches/100_no_wx_updates.diff: no longer needed as upstream provides a
     configure switch
+  * Reorganise lib, headers and .pc files between libvlc2 and libvlccore0
 
   [Mohammed Adnène Trojette]
   * Add a vlc-dbg package with debugging symbols for vlc.
@@ -71,8 +68,7 @@
          * call dh_strip with --dbg-package=vlc-dbg
          * add --enable-debug flag
 
-
- -- Christophe Mutricy <xtophe at videolan.org>  Fri, 29 Feb 2008 23:39:05 +0000
+ -- Christophe Mutricy <xtophe at videolan.org>  Sat, 31 May 2008 22:04:15 +0100
 
 vlc (0.8.6.c-5) unstable; urgency=low
 

Modified: videolan/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/control?rev=1215&op=diff
==============================================================================
--- videolan/vlc/debian/control (original)
+++ videolan/vlc/debian/control Sat May 31 21:09:50 2008
@@ -211,13 +211,25 @@
  This package contains a version of VLC that does not require X and that is
  thus suitable for headless servers.
 
-Package: libvlc1
+Package: libvlccore0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Replaces: vlc (<< 0.8.6.c-6), libvlc0
-Conflicts: vlc (<< 0.8.6.c-6), libvlc0
+Description: multimedia player and streamer library
+ This package contains the shared library required by VLC modules and libvlc.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
+Package: libvlc2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Replaces: vlc (<< 0.8.6.c-6), libvlc0, libvlc1
+Conflicts: vlc (<< 0.8.6.c-6), libvlc0, libvlc1
 Description: multimedia player and streamer library
  This package contains the shared library required by applications using VLC
  features.
@@ -226,15 +238,27 @@
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
  streams from various network sources.
 
-Package: libvlc1-dev
+Package: libvlccore0-dev
 Section: libdevel
 Architecture: any
-Depends: libvlc1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: libvlc0-dev
-Conflicts: libvlc0-dev
+Depends: libvlccore0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: development files for VLC
  This package contains headers and a static library required to build plugins
- for VLC, or standalone applications that use VLC features.
+ for VLC.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
+Package: libvlc2-dev
+Section: libdevel
+Architecture: any
+Depends: libvlc2 (= ${binary:Version}), libvlccore0-dev, ${shlibs:Depends}, ${misc:Depends}
+Replaces: libvlc0-dev, libvlc1-dev
+Conflicts: libvlc0-dev, libvlc1-dev
+Description: development files for VLC
+ This package contains headers and a static library required to build 
+ standalone applications that use VLC features.
  .
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia

Copied: videolan/vlc/debian/libvlc2-dev.install (from r1188, videolan/vlc/debian/libvlc1-dev.install)
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/libvlc2-dev.install?rev=1215&op=diff
==============================================================================
--- videolan/vlc/debian/libvlc1-dev.install (original)
+++ videolan/vlc/debian/libvlc2-dev.install Sat May 31 21:09:50 2008
@@ -1,5 +1,13 @@
-usr/lib/*.so
-usr/lib/*.a
-usr/lib/pkgconfig/*.pc
+usr/lib/libvlc.so
+usr/lib/libvlc.a
+usr/lib/pkgconfig/vlc-control.pc
 usr/include/vlc/*.h
-usr/include/vlc/plugins/*.h
+#usr/include/vlc/common.h
+#usr/include/vlc/deprecated.h
+#usr/include/vlc/libvlc_events.h
+#usr/include/vlc/libvlc.h
+#usr/include/vlc/libvlc_media_list.h
+#usr/include/vlc/libvlc_structures.h
+#usr/include/vlc/libvlc_vlm.h
+#usr/include/vlc/mediacontrol.h
+#usr/include/vlc/mediacontrol_structures.h

Copied: videolan/vlc/debian/libvlc2.install (from r1188, videolan/vlc/debian/libvlc1.install)
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/libvlc2.install?rev=1215&op=diff
==============================================================================
--- videolan/vlc/debian/libvlc1.install (original)
+++ videolan/vlc/debian/libvlc2.install Sat May 31 21:09:50 2008
@@ -1,2 +1,1 @@
 usr/lib/libvlc.so.*
-usr/lib/libvlc-control.so.*

Added: videolan/vlc/debian/libvlccore0-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/libvlccore0-dev.install?rev=1215&op=file
==============================================================================
--- videolan/vlc/debian/libvlccore0-dev.install (added)
+++ videolan/vlc/debian/libvlccore0-dev.install Sat May 31 21:09:50 2008
@@ -1,0 +1,5 @@
+usr/lib/libvlccore.so
+usr/lib/libvlccore.a
+usr/lib/pkgconfig/vlc-plugin.pc
+usr/include/vlc/vlc.h
+usr/include/vlc/plugins/*.h

Added: videolan/vlc/debian/libvlccore0.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/libvlccore0.install?rev=1215&op=file
==============================================================================
--- videolan/vlc/debian/libvlccore0.install (added)
+++ videolan/vlc/debian/libvlccore0.install Sat May 31 21:09:50 2008
@@ -1,0 +1,1 @@
+usr/lib/libvlccore.so.*

Added: videolan/vlc/debian/patches/001_as-needed.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/patches/001_as-needed.diff?rev=1215&op=file
==============================================================================
--- videolan/vlc/debian/patches/001_as-needed.diff (added)
+++ videolan/vlc/debian/patches/001_as-needed.diff Sat May 31 21:09:50 2008
@@ -1,0 +1,32 @@
+Index: vlc/autotools/ltmain.sh
+===================================================================
+--- vlc.orig/autotools/ltmain.sh	2006-07-13 09:12:13.000000000 +0200
++++ vlc/autotools/ltmain.sh	2007-06-06 23:36:38.899175453 +0200
+@@ -1794,6 +1794,11 @@
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;      
++
+       -Wl,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ 	arg=
+@@ -2134,6 +2139,15 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-Wl,--as-needed)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	  fi
++	  continue
++	  ;;
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"

Modified: videolan/vlc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/patches/series?rev=1215&op=diff
==============================================================================
--- videolan/vlc/debian/patches/series (original)
+++ videolan/vlc/debian/patches/series Sat May 31 21:09:50 2008
@@ -2,3 +2,4 @@
 102_dejavu_font.diff
 104_notify.diff
 200_osdmenu_paths.diff
+300_manpage_syntax.diff

Modified: videolan/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/rules?rev=1215&op=diff
==============================================================================
--- videolan/vlc/debian/rules (original)
+++ videolan/vlc/debian/rules Sat May 31 21:09:50 2008
@@ -113,8 +113,9 @@
 	dh_testdir
 	$(QUILT) push -a || test $$? = 2
 	./configure --enable-static --mandir=$${prefix}/share/man $(confflags)
-	$(MAKE) libvlc
+	$(MAKE) -C src libvlccore.la libvlc.la
 	mkdir -p tmp
+	cp src/.libs/libvlccore.a tmp/libvlccore.a
 	cp src/.libs/libvlc.a tmp/libvlc.a
 	./configure --mandir=$${prefix}/share/man $(confflags)
 	$(MAKE)
@@ -155,6 +156,7 @@
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
 	cp tmp/libvlc.a debian/tmp/usr/lib
+	cp tmp/libvlccore.a debian/tmp/usr/lib
 	# Clean up libtool crap
 	find debian/tmp -name '*.la' -exec rm '{}' ';'
 	# Remove useless stuff
@@ -204,21 +206,22 @@
 	dh_testroot
 	dh_link -s
 	dh_installdocs -p vlc-nox
-	dh_installdocs -p libvlc1
+	dh_installdocs -p libvlc2
 	dh_buildinfo -p vlc-nox
 	dh_installmenu -s
 	dh_installmime -s
 	dh_installman doc/vlc.1 -p vlc-nox
-	dh_installman doc/vlc-config.1 -p libvlc1-dev
+	dh_installman doc/vlc-config.1 -p libvlc2-dev
 	dh_installchangelogs ChangeLog -p vlc-nox
-	dh_installchangelogs ChangeLog -p libvlc1
+	dh_installchangelogs ChangeLog -p libvlc2
 	dh_desktop
 	dh_strip -s --dbg-package=vlc-dbg
 	dh_compress -s
 	dh_fixperms -s
-	dh_makeshlibs -plibvlc1 -V # -V is nasty, but I mean it
+	dh_makeshlibs -plibvlc2 -V # -V is nasty, but I mean it
+	dh_makeshlibs -plibvlccore0 -V # -V is nasty, but I mean it
 	dh_installdeb -s
-	dh_shlibdeps -s -ldebian/libvlc1/usr/lib 
+	dh_shlibdeps -s -ldebian/libvlc2/usr/lib:debian/libvlccore0/usr/lib 
 	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s

More information about the pkg-multimedia-commits mailing list