r17435 - in /desktop/experimental/totem/debian: changelog patches/60_build_libbaconvideowidget_statically.patch patches/90_automake.patch patches/series

samm-guest at users.alioth.debian.org samm-guest at users.alioth.debian.org
Mon Nov 10 23:50:17 UTC 2008 

Author: samm-guest
Date: Mon Nov 10 23:50:16 2008
New Revision: 17435

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17435
Log:
* New upstream release.
* 60_build_libbaconvideowidget_statically.patch: taken from Ubuntu, from
  <https://launchpad.net/ubuntu/intrepid/+source/totem/2.23.3-0ubuntu1>. Building
  libbaconvideowidget statically means that totem-gstreamer and totem-xine can be
  co-installable.
* 90_automake.patch: generated by running 'automake' after applying
  60_build_libbaconvideowidget_statically.patch.

Added:
    desktop/experimental/totem/debian/patches/60_build_libbaconvideowidget_statically.patch
    desktop/experimental/totem/debian/patches/90_automake.patch
Modified:
    desktop/experimental/totem/debian/changelog
    desktop/experimental/totem/debian/patches/series

Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=17435&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog (original)
+++ desktop/experimental/totem/debian/changelog Mon Nov 10 23:50:16 2008
@@ -1,17 +1,17 @@
 totem (2.24.3-1) experimental; urgency=low
 
-  * New upstream release. Totem now ships a shared library,
-    libbaconvideowidget.so.0, that I don't know how to deal with
-    while keeping totem-gstreamer and totem-xine co-installable. So
-    trying to install both will now cause dpkg to complain that one
-    overwrites the other's files. Hopefully someone can think of a
-    way to deal with this without dropping the ability to have both
-    packages installed at once.
+  * New upstream release.
   * 01_gecko_iceape.patch: disabled, no longer applies, and I'm not sure
     it's necessary any more.
   * 02_flv.patch: refreshed.
   * 30_fix_youtube_plugin.patch: merged upstream.
+  * 60_build_libbaconvideowidget_statically.patch: taken from Ubuntu, from
+    <https://launchpad.net/ubuntu/intrepid/+source/totem/2.23.3-0ubuntu1>. Building
+    libbaconvideowidget statically means that totem-gstreamer and totem-xine can be
+    co-installable.
   * 70_autoconf.patch: disabled, no need for it.
+  * 90_automake.patch: generated by running 'automake' after applying
+    60_build_libbaconvideowidget_statically.patch.
   * Drop GnomeVFS dependency.
   * Reduce GLib dependency to 2.13.
   * Depend on x11proto-core-dev for multimedia keys.

Added: desktop/experimental/totem/debian/patches/60_build_libbaconvideowidget_statically.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/60_build_libbaconvideowidget_statically.patch?rev=17435&op=file
==============================================================================
--- desktop/experimental/totem/debian/patches/60_build_libbaconvideowidget_statically.patch (added)
+++ desktop/experimental/totem/debian/patches/60_build_libbaconvideowidget_statically.patch Mon Nov 10 23:50:16 2008
@@ -1,0 +1,12 @@
+Index: totem-2.23.3/src/backend/Makefile.am
+===================================================================
+--- totem-2.23.3.orig/src/backend/Makefile.am	2008-06-10 16:50:33.000000000 +0200
++++ totem-2.23.3/src/backend/Makefile.am	2008-06-10 16:50:41.000000000 +0200
+@@ -1,6 +1,6 @@
+ noinst_PROGRAMS = bvw-test
+ 
+-lib_LTLIBRARIES = libbaconvideowidget.la
++noinst_LTLIBRARIES = libbaconvideowidget.la
+ 
+ bvw_test_SOURCES = bvw-test.c
+ 

Added: desktop/experimental/totem/debian/patches/90_automake.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/90_automake.patch?rev=17435&op=file
==============================================================================
--- desktop/experimental/totem/debian/patches/90_automake.patch (added)
+++ desktop/experimental/totem/debian/patches/90_automake.patch Mon Nov 10 23:50:16 2008
@@ -1,0 +1,132 @@
+Index: totem-2.24.3/src/backend/Makefile.in
+===================================================================
+--- totem-2.24.3.orig/src/backend/Makefile.in	2008-11-10 23:20:49.000000000 +0000
++++ totem-2.24.3/src/backend/Makefile.in	2008-11-10 23:21:04.000000000 +0000
+@@ -53,15 +53,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+-    *) f=$$p;; \
+-  esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
++LTLIBRARIES = $(noinst_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libbaconvideowidget_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -357,10 +349,9 @@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-lib_LTLIBRARIES = libbaconvideowidget.la
++noinst_LTLIBRARIES = libbaconvideowidget.la
+ bvw_test_SOURCES = bvw-test.c
+ bvw_test_CPPFLAGS = \
+ 	-I$(top_srcdir)/plparse		\
+@@ -447,35 +438,17 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    f=$(am__strip_dir) \
+-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+-	  else :; fi; \
+-	done
+-
+-uninstall-libLTLIBRARIES:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	  p=$(am__strip_dir) \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+-	done
+ 
+-clean-libLTLIBRARIES:
+-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++clean-noinstLTLIBRARIES:
++	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
++	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ 	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libbaconvideowidget.la: $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_DEPENDENCIES) 
+-	$(libbaconvideowidget_la_LINK) -rpath $(libdir) $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_LIBADD) $(LIBS)
++	$(libbaconvideowidget_la_LINK)  $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_LIBADD) $(LIBS)
+ 
+ clean-noinstPROGRAMS:
+ 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+@@ -681,9 +654,6 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)"; do \
+-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+-	done
+ install: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-am
+ install-exec: install-exec-am
+@@ -713,7 +683,7 @@
+ 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ clean: clean-am
+ 
+-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ 	clean-noinstPROGRAMS mostlyclean-am
+ 
+ distclean: distclean-am
+@@ -736,7 +706,7 @@
+ 
+ install-dvi: install-dvi-am
+ 
+-install-exec-am: install-libLTLIBRARIES
++install-exec-am:
+ 
+ install-html: install-html-am
+ 
+@@ -768,23 +738,23 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-libLTLIBRARIES
++uninstall-am:
+ 
+ .MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+-	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \
+-	distclean distclean-compile distclean-generic \
++	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
++	ctags distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+ 	install-data-am install-dvi install-dvi-am install-exec \
+ 	install-exec-am install-html install-html-am install-info \
+-	install-info-am install-libLTLIBRARIES install-man install-pdf \
+-	install-pdf-am install-ps install-ps-am install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
++	install-info-am install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-libLTLIBRARIES
++	tags uninstall uninstall-am
+ 
+ 	$(DISABLE_DEPRECATED)		\
+ 	$(AM_CPPFLAGS)

Modified: desktop/experimental/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/series?rev=17435&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/series (original)
+++ desktop/experimental/totem/debian/patches/series Mon Nov 10 23:50:16 2008
@@ -1,4 +1,5 @@
 #01_gecko_iceape.patch
 02_flv.patch
 20_use_alternatives.patch
-#70_autoconf.patch
+60_build_libbaconvideowidget_statically.patch
+90_automake.patch

More information about the pkg-gnome-commits mailing list