[Pkg-voip-commits] r1698 - in kiax/trunk/debian: . patches

[Santiago Garcia Mantinan]

Author: manty
Date: 2006-05-06 10:56:42 +0000 (Sat, 06 May 2006)
New Revision: 1698

Modified:
   kiax/trunk/debian/changelog
   kiax/trunk/debian/patches/00list
   kiax/trunk/debian/patches/01_debian-patch.dpatch
   kiax/trunk/debian/rules
Log:
Put icons and i18n files into place and fix patching.


Modified: kiax/trunk/debian/changelog
===================================================================
--- kiax/trunk/debian/changelog	2006-05-06 10:53:30 UTC (rev 1697)
+++ kiax/trunk/debian/changelog	2006-05-06 10:56:42 UTC (rev 1698)
@@ -1,3 +1,11 @@
+kiax (0.8.5-2) UNRELEASED; urgency=low
+
+  * Copy the icons and i18n files into place.
+  * Fix patching.
+  * Add patch for location of icons and i18n files.
+
+ -- Santiago Garcia Mantinan <manty at debian.org>  Sat,  6 May 2006 01:32:17 +0200
+
 kiax (0.8.5-1) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET) New upstream release

Modified: kiax/trunk/debian/patches/00list
===================================================================
--- kiax/trunk/debian/patches/00list	2006-05-06 10:53:30 UTC (rev 1697)
+++ kiax/trunk/debian/patches/00list	2006-05-06 10:56:42 UTC (rev 1698)
@@ -1,2 +1 @@
 01_debian-patch
-01_debian-patch

Modified: kiax/trunk/debian/patches/01_debian-patch.dpatch
===================================================================
--- kiax/trunk/debian/patches/01_debian-patch.dpatch	2006-05-06 10:53:30 UTC (rev 1697)
+++ kiax/trunk/debian/patches/01_debian-patch.dpatch	2006-05-06 10:56:42 UTC (rev 1698)
@@ -51,3 +51,17 @@
  DEFINES = ICONS_PATH=\"/usr/local/share/kiax/icons/\" \
  I18N_DIRECTORY=\"/usr/local/share/kiax/i18n/\"
  TARGET = ../bin/kiax
+diff -urNad kiax-0.8.5~/repath.pl kiax-0.8.5/repath.pl
+--- kiax-0.8.5~/repath.pl	2005-04-08 16:47:06.000000000 +0200
++++ kiax-0.8.5/repath.pl	2006-05-05 23:50:40.000000000 +0200
+@@ -88,8 +88,8 @@
+ 	$proFile =~ s|icons\.path = .*?\n|icons.path = $params{'prefix'}/share/kiax/icons/\n|;
+ 	$proFile =~ s|translations\.path = .*?\n|translations.path = $params{'prefix'}/share/kiax/i18n/\n|;
+ 	$proFile =~ s|binary\.path = .*?\n|binary.path = $params{'prefix'}/bin/\n|;
+-	$proFile =~ s|ICONS_PATH=\\"./icons/\\"|ICONS_PATH=\\"$params{'prefix'}/share/kiax/icons/\\"|;
+-	$proFile =~ s|I18N_DIRECTORY=\\"./i18n/\\"|I18N_DIRECTORY=\\"$params{'prefix'}/share/kiax/i18n/\\"|;
++	$proFile =~ s|ICONS_PATH=\\".*/icons/\\"|ICONS_PATH=\\"$params{'prefix'}/share/kiax/icons/\\"|;
++	$proFile =~ s|I18N_DIRECTORY=\\".*/i18n/\\"|I18N_DIRECTORY=\\"$params{'prefix'}/share/kiax/i18n/\\"|;
+ }
+ 
+ open FH, ">$fnSrcpro" or die "Can't open file $fnSrcpro: $!\n";

Modified: kiax/trunk/debian/rules
===================================================================
--- kiax/trunk/debian/rules	2006-05-06 10:53:30 UTC (rev 1697)
+++ kiax/trunk/debian/rules	2006-05-06 10:56:42 UTC (rev 1698)
@@ -39,7 +39,7 @@
 
 build: build-stamp
 
-build-stamp: configure-stamp 
+build-stamp: configure
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -72,6 +72,9 @@
 	cp bin/kiax      $(CURDIR)/debian/kiax/usr/bin
 	cp debian/kiax.1 $(CURDIR)/debian/kiax/usr/share/man/man1
 	cp CHANGELOG     $(CURDIR)/debian/kiax/usr/share/doc/kiax/changelog
+	mkdir -p         $(CURDIR)/debian/kiax/usr/share/kiax
+	cp -r icons      $(CURDIR)/debian/kiax/usr/share/kiax
+	cp -r i18n       $(CURDIR)/debian/kiax/usr/share/kiax
 
 
 # Build architecture-independent files here.