r15370 - 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: Mon Mar 24 11:59:16 2008
New Revision: 15370

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15370
Log:
* Merge below changes by Steve Langasek again; these were not applied to the
  experimental branch; doh!  From r14325.
* 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
      - copied unchanged from r14325, 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=15370&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog (original)
+++ desktop/unstable/totem/debian/changelog Mon Mar 24 11:59:16 2008
@@ -1,7 +1,19 @@
-totem (2.22.0-2) UNRELEASED; urgency=low
-
+totem (2.22.0-2) unstable; urgency=high
+
+  [ Emilio Pozuelo Monfort ]
   * debian/control:
     - Remove duplicated libepc-ui-dev build dependency.
+
+  [ Loic Minier ]
+  * Merge below changes by Steve Langasek again; these were not applied to the
+    experimental branch; doh!
+
+  [ 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.
 
  -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sun, 23 Mar 2008 20:20:36 +0100
 

Modified: desktop/unstable/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/rules?rev=15370&op=diff
==============================================================================
--- desktop/unstable/totem/debian/rules (original)
+++ desktop/unstable/totem/debian/rules Mon Mar 24 11:59:16 2008
@@ -19,6 +19,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)
 
@@ -113,7 +116,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
 
@@ -121,6 +129,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 && \