[Pkg-cli-apps-commits] r4267 - in /packages/gnome-subtitles/trunk/debian: control patches/ patches/00list patches/01_fix_sublib_linking.dpatch rules

[zadig-guest at users.alioth.debian.org]

Author: zadig-guest
Date: Tue Dec  9 22:44:23 2008
New Revision: 4267

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4267
Log:
Removing MONO_PATH hack and copying sublib.dll to the app dir.

Added:
    packages/gnome-subtitles/trunk/debian/patches/
    packages/gnome-subtitles/trunk/debian/patches/00list
    packages/gnome-subtitles/trunk/debian/patches/01_fix_sublib_linking.dpatch   (with props)
Modified:
    packages/gnome-subtitles/trunk/debian/control
    packages/gnome-subtitles/trunk/debian/rules

Modified: packages/gnome-subtitles/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-subtitles/trunk/debian/control?rev=4267&op=diff
==============================================================================
--- packages/gnome-subtitles/trunk/debian/control (original)
+++ packages/gnome-subtitles/trunk/debian/control Tue Dec  9 22:44:23 2008
@@ -5,6 +5,7 @@
 Uploaders: Tiago Bortoletto Vaz <tiago at debian-ba.org>, Mirco Bauer <meebey at debian.org>
 Build-Depends: cli-common-dev (>= 0.5.7),
  debhelper (>= 7),
+ dpatch,
  autotools-dev,
  mono-2.0-devel,
  libmono-dev,
@@ -24,8 +25,8 @@
 Package: gnome-subtitles
 Architecture: any
 Depends: ${cli:Depends}, ${misc:Depends}, ${shlibs:Depends}, libmono-i18n2.0-cil
-Description: Subtitles editor for the GNOME Desktop environment
- Gnome Subtitles is a subtitle editor for the GNOME Desktop environment.
+Description: Subtitles editor for the Gnome Desktop environment
+ Gnome Subtitles is a subtitle editor for the Gnome Desktop environment.
  .
  It supports the most common subtitle formats and allows for subtitle editing,
  conversion, and synchronization by using a friendly user interface.

Added: packages/gnome-subtitles/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-subtitles/trunk/debian/patches/00list?rev=4267&op=file
==============================================================================
--- packages/gnome-subtitles/trunk/debian/patches/00list (added)
+++ packages/gnome-subtitles/trunk/debian/patches/00list Tue Dec  9 22:44:23 2008
@@ -1,0 +1,1 @@
+01_fix_sublib_linking.dpatch

Added: packages/gnome-subtitles/trunk/debian/patches/01_fix_sublib_linking.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-subtitles/trunk/debian/patches/01_fix_sublib_linking.dpatch?rev=4267&op=file
==============================================================================
--- packages/gnome-subtitles/trunk/debian/patches/01_fix_sublib_linking.dpatch (added)
+++ packages/gnome-subtitles/trunk/debian/patches/01_fix_sublib_linking.dpatch Tue Dec  9 22:44:23 2008
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_sublib_linking.dpatch by Tiago Bortoletto Vaz <tiago at debian-ba.org>
+##
+## DP: Removing MONO_PATH hacking once we are copying the sublib into the
+##     application directory.
+
+ at DPATCH@
+diff -urNad trunk~/src/GnomeSubtitles/Execution/gnome-subtitles.in trunk/src/GnomeSubtitles/Execution/gnome-subtitles.in
+--- trunk~/src/GnomeSubtitles/Execution/gnome-subtitles.in	2008-05-11 13:14:09.000000000 -0300
++++ trunk/src/GnomeSubtitles/Execution/gnome-subtitles.in	2008-12-09 19:37:58.517468737 -0300
+@@ -4,9 +4,6 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ 
+-sublibdir=@SUBLIB_DLL_DIR@
+-
+ export LD_LIBRARY_PATH="$libdir/gnome-subtitles:$LD_LIBRARY_PATH"
+-export MONO_PATH=$sublibdir:$MONO_PATH
+ exec -a gnome-subtitles @MONO@ $libdir/gnome-subtitles/gnome-subtitles.exe "$@"
+ 

Propchange: packages/gnome-subtitles/trunk/debian/patches/01_fix_sublib_linking.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/gnome-subtitles/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-subtitles/trunk/debian/rules?rev=4267&op=diff
==============================================================================
--- packages/gnome-subtitles/trunk/debian/rules (original)
+++ packages/gnome-subtitles/trunk/debian/rules Tue Dec  9 22:44:23 2008
@@ -2,6 +2,9 @@
 #export DH_VERBOSE=1
 
 include /usr/share/cli-common/cli.make
+include /usr/share/dpatch/dpatch.make
+
+VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
 
 build: build-stamp
 build-stamp:
@@ -13,6 +16,7 @@
 
 install: build
 	dh $@
+	cp -av `pkg-config --variable=libdir sublib`/sublib/*.dll $(CURDIR)/debian/gnome-subtitles/usr/lib/gnome-subtitles/
 
 binary: binary-arch
 binary-arch: install