r1438 - in /experimental/vlc/debian: ./ patches/

xtophe-guest at users.alioth.debian.org xtophe-guest at users.alioth.debian.org
Tue Sep 2 00:08:50 UTC 2008 

Author: xtophe-guest
Date: Tue Sep  2 00:08:49 2008
New Revision: 1438

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1438
Log:
Some progress

Only one lintian warning left (and an error for which we need an override)

Added:
    experimental/vlc/debian/libvlc-dev.install   (props changed)
      - copied unchanged from r1436, experimental/vlc/debian/libvlc2-dev.install
    experimental/vlc/debian/libvlc-dev.links   (contents, props changed)
      - copied, changed from r1436, experimental/vlc/debian/libvlc2-dev.links
    experimental/vlc/debian/libvlccore-dev.install   (props changed)
      - copied unchanged from r1436, experimental/vlc/debian/libvlccore0-dev.install
    experimental/vlc/debian/libvlccore-dev.links   (contents, props changed)
      - copied, changed from r1436, experimental/vlc/debian/libvlccore0-dev.links
    experimental/vlc/debian/patches/052_as-needed.diff
Removed:
    experimental/vlc/debian/libvlc2-dev.install
    experimental/vlc/debian/libvlc2-dev.links
    experimental/vlc/debian/libvlccore0-dev.install
    experimental/vlc/debian/libvlccore0-dev.links
Modified:
    experimental/vlc/debian/changelog
    experimental/vlc/debian/control
    experimental/vlc/debian/patches/series
    experimental/vlc/debian/rules

Modified: experimental/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/changelog?rev=1438&op=diff
==============================================================================
--- experimental/vlc/debian/changelog (original)
+++ experimental/vlc/debian/changelog Tue Sep  2 00:08:49 2008
@@ -19,6 +19,8 @@
     + New patches:
     	- 050_iceape: taken upstream, build against iceape
         - 051_install_scripts: taken upstream, install with correct permissions
+        - 052_as-needed taken from bug #....... to teach libtool about 
+          -Wl,--as-needed
   * Improve watch file
   * Add a vlc-data package for /usr/share  (13 MB)
   * Add a vlc-dbg package (Closes: #§§§§§)

Modified: experimental/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/control?rev=1438&op=diff
==============================================================================
--- experimental/vlc/debian/control (original)
+++ experimental/vlc/debian/control Tue Sep  2 00:08:49 2008
@@ -83,8 +83,8 @@
                zlib1g-dev
 Standards-Version: 3.8.0
 Homepage: http://www.videolan.org/vlc
-Vcs-Svn: svn://svn.debian.org/svn/pkg-multimedia/videolan/vlc/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-multimedia/experimental/vlc/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/
 
 Package: vlc
 Section: graphics
@@ -190,7 +190,7 @@
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
  streams from various network sources.
 
-Package: libvlccore0-dev
+Package: libvlccore-dev
 Section: libdevel
 Architecture: any
 Depends: libvlccore0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -202,10 +202,10 @@
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
  streams from various network sources.
 
-Package: libvlc2-dev
+Package: libvlc-dev
 Section: libdevel
 Architecture: any
-Depends: libvlc2 (= ${binary:Version}), libvlccore0-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libvlc2 (= ${binary:Version}), libvlccore-dev, ${shlibs:Depends}, ${misc:Depends}
 Replaces: libvlc0-dev, libvlc1-dev
 Conflicts: libvlc0-dev, libvlc1-dev
 Description: development files for VLC

Propchange: experimental/vlc/debian/libvlc-dev.install
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: experimental/vlc/debian/libvlc-dev.links (from r1436, experimental/vlc/debian/libvlc2-dev.links)
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlc-dev.links?rev=1438&op=diff
==============================================================================
--- experimental/vlc/debian/libvlc2-dev.links (original)
+++ experimental/vlc/debian/libvlc-dev.links Tue Sep  2 00:08:49 2008
@@ -1,2 +1,2 @@
-/usr/share/doc/libvlc2 /usr/share/doc/libvlc2-dev
-/usr/share/bug/libvlc2 /usr/share/bug/libvlc2-dev
+/usr/share/doc/libvlc2 /usr/share/doc/libvlc-dev
+/usr/share/bug/libvlc2 /usr/share/bug/libvlc-dev

Propchange: experimental/vlc/debian/libvlc-dev.links
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: experimental/vlc/debian/libvlccore-dev.install
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: experimental/vlc/debian/libvlccore-dev.links (from r1436, experimental/vlc/debian/libvlccore0-dev.links)
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/libvlccore-dev.links?rev=1438&op=diff
==============================================================================
--- experimental/vlc/debian/libvlccore0-dev.links (original)
+++ experimental/vlc/debian/libvlccore-dev.links Tue Sep  2 00:08:49 2008
@@ -1,2 +1,2 @@
-/usr/share/doc/libvlccore0 /usr/share/doc/libvlccore0-dev
-/usr/share/bug/libvlccore0 /usr/share/bug/libvlccore0-dev
+/usr/share/doc/libvlccore0 /usr/share/doc/libvlccore-dev
+/usr/share/bug/libvlccore0 /usr/share/bug/libvlccore-dev

Propchange: experimental/vlc/debian/libvlccore-dev.links
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: experimental/vlc/debian/patches/052_as-needed.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/052_as-needed.diff?rev=1438&op=file
==============================================================================
--- experimental/vlc/debian/patches/052_as-needed.diff (added)
+++ experimental/vlc/debian/patches/052_as-needed.diff Tue Sep  2 00:08:49 2008
@@ -1,0 +1,30 @@
+--- a/autotools/ltmain.sh.orig	2006-03-29 15:45:36.000000000 +0200
++++ b/autotools/ltmain.sh	2006-03-29 16:39:30.000000000 +0200
+@@ -1754,6 +1754,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=
+@@ -2094,6 +2099,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: experimental/vlc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/series?rev=1438&op=diff
==============================================================================
--- experimental/vlc/debian/patches/series (original)
+++ experimental/vlc/debian/patches/series Tue Sep  2 00:08:49 2008
@@ -1,5 +1,6 @@
 050_iceape.diff
 051_install_scripts.diff
+052_as-needed.diff
 101_certificates_paths.diff
 102_dejavu_font.diff
 104_notify.diff

Modified: experimental/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/rules?rev=1438&op=diff
==============================================================================
--- experimental/vlc/debian/rules (original)
+++ experimental/vlc/debian/rules Tue Sep  2 00:08:49 2008
@@ -14,6 +14,7 @@
 
 include /usr/share/quilt/quilt.make
 
+LDFLAGS = -Wl,--as-needed
 
 # configure flags
 confflags += --enable-maintaner-mode --enable-release --prefix=/usr
@@ -106,6 +107,11 @@
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
+	#Grrr. even if upstream uses AM_MAINTANER_MODE, timestamps are messed
+	touch aclocal.m4 && \
+	touch configure && \
+	touch config.h.in && \
+	find . -name Makefile.in -exec touch '{}' ';'
 	./configure --enable-static --mandir=$${prefix}/share/man $(confflags)
 	$(MAKE) -C src libvlccore.la libvlc.la
 	mkdir -p tmp
@@ -187,6 +193,8 @@
 	dh_testdir
 	dh_testroot
 	dh_link -i
+	dh_installdocs -p vlc-data 
+	dh_installchangelogs ChangeLog -p vlc-data
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -200,13 +208,11 @@
 	dh_testroot
 	dh_link -s
 	dh_installdocs -p vlc-nox
-	dh_installdocs -p vlc-data 
 	dh_buildinfo -p vlc-nox
 	dh_installmenu -s
 	dh_installmime -s
 	dh_installman doc/vlc.1 -p vlc-nox
 	dh_installchangelogs ChangeLog -p vlc-nox
-	dh_installchangelogs ChangeLog -p vlc-data
 	dh_desktop
 	dh_strip -s --dbg-package=vlc-dbg
 	dh_compress -s

More information about the pkg-multimedia-commits mailing list