r14325 - in /desktop/unstable/totem/debian: changelog rules totem-flavor.postinst.in totem-gstreamer.postinst totem-xine.postinst

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Jan 24 16:21:51 2008
New Revision: 14325

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14325
Log:
* Merge below changes by Steve Langasek; thanks!
* Auto-generate totem-{xine,gstreamer}.postinst from new
  debian/totem-flavor.postinst.in in the install target
* Substitute the pkg-config variable into the generated postinst also,
  so that the update-alternatives slave for the nautilus extension is
  kept in sync with the ABI.

Added:
    desktop/unstable/totem/debian/totem-flavor.postinst.in
Removed:
    desktop/unstable/totem/debian/totem-gstreamer.postinst
    desktop/unstable/totem/debian/totem-xine.postinst
Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/rules

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=14325&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog (original)
+++ desktop/unstable/totem/debian/changelog Thu Jan 24 16:21:51 2008
@@ -1,6 +1,17 @@
 totem (2.20.3-2) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Fix capitalization of GNOME and GStreamer.
+
+  [ Loic Minier ]
+  * Merge below changes by Steve Langasek; thanks!
+
+  [ Steve Langasek ]
+  * Auto-generate totem-{xine,gstreamer}.postinst from new
+    debian/totem-flavor.postinst.in in the install target
+  * Substitute the pkg-config variable into the generated postinst also,
+    so that the update-alternatives slave for the nautilus extension is
+    kept in sync with the ABI.
 
  -- Josselin Mouette <joss at debian.org>  Wed,  9 Jan 2008 10:50:05 +0100
 

Modified: desktop/unstable/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/rules?rev=14325&op=diff
==============================================================================
--- desktop/unstable/totem/debian/rules (original)
+++ desktop/unstable/totem/debian/rules Thu Jan 24 16:21:51 2008
@@ -21,6 +21,9 @@
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 FLAVORS := xine gstreamer
+PRIORITY_xine := 35
+PRIORITY_gstreamer := 40
+export PRIORITY_xine PRIORITY_gstreamer
 
 CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
@@ -121,7 +124,12 @@
 			| grep -v ^MimeType ; \
 			echo NoDisplay=true ) \
 		> debian/totem-$$f/usr/share/applications/totem-$$f.desktop ; \
-		done
+		sed -e"s/@FLAVOUR@/$$f/" \
+		    -e"s/@PRIORITY@/$$(eval echo \$$PRIORITY_$$f)/" \
+		    -e"s, at NAUTILUS_EXTDIR@,$$(pkg-config libnautilus-extension --variable=extensiondir)," \
+		< debian/totem-flavor.postinst.in \
+		> debian/totem-$${f}.postinst ; \
+	done
 	printf "\nTryExec=/usr/bin/totem" >> debian/$(COMPKG)/usr/share/applications/totem.desktop
 	dh_install
 
@@ -129,6 +137,7 @@
 	dh_testdir
 	dh_testroot
 	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+	rm -f $(foreach f,$(FLAVORS),debian/totem-$(f).postinst)
 	rm -rf .pc
 	rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR)
 	-test -r /usr/share/misc/config.sub && test -r config.sub && \

Added: desktop/unstable/totem/debian/totem-flavor.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/totem-flavor.postinst.in?rev=14325&op=file
==============================================================================
--- desktop/unstable/totem/debian/totem-flavor.postinst.in (added)
+++ desktop/unstable/totem/debian/totem-flavor.postinst.in Thu Jan 24 16:21:51 2008
@@ -1,0 +1,24 @@
+#! /bin/sh
+set -e
+
+FLAVOUR=@FLAVOUR@
+PRIORITY=@PRIORITY@
+NAUTILUS_EXTDIR=@NAUTILUS_EXTDIR@
+
+if [ "$1" = configure ]; then
+	update-alternatives --quiet --install \
+		/usr/bin/gnome-video-thumbnailer gnome-video-thumbnailer \
+		/usr/bin/totem-${FLAVOUR}-video-thumbnailer ${PRIORITY}
+	update-alternatives --quiet --install \
+		/usr/bin/totem totem /usr/bin/totem-${FLAVOUR} ${PRIORITY} \
+		--slave /usr/bin/totem-video-indexer totem-video-indexer \
+			/usr/bin/totem-${FLAVOUR}-video-indexer \
+		--slave ${NAUTILUS_EXTDIR}/libtotem-properties-page.so \
+			libtotem-properties-page.so \
+			${NAUTILUS_EXTDIR}/libtotem-properties-page.so.${FLAVOUR} \
+		--slave /usr/lib/totem/default totem-default.dir /usr/lib/totem/${FLAVOUR}
+fi
+
+#DEBHELPER#
+
+exit 0