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

[Mark Purcell]

Author: msp
Date: 2006-05-06 15:03:49 +0000 (Sat, 06 May 2006)
New Revision: 1700

Modified:
   kiax/trunk/debian/changelog
   kiax/trunk/debian/patches/01_debian-patch.dpatch
Log:
* Copy the icons and i18n files into place.
* Fix patching.
* Add patch for location of icons and i18n files.

Modified: kiax/trunk/debian/changelog
===================================================================
--- kiax/trunk/debian/changelog	2006-05-06 10:57:47 UTC (rev 1699)
+++ kiax/trunk/debian/changelog	2006-05-06 15:03:49 UTC (rev 1700)
@@ -1,20 +1,18 @@
-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
 
+  [ Mark Purcell ]
   * (NOT RELEASED YET) New upstream release
   * Update Debian/watch & get-orig-source targets
   * Copyright audit to debian/copyright
   * Build without /lib, Build-Depend on libiaxclient-dev
 
- -- Mark Purcell <msp at debian.org>  Wed, 29 Mar 2006 21:33:15 +0100
+  [ Santiago Garcia Mantinan ]
+  * 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 15:51:22 +0100
+
 kiax (0.8.5-pre-1) UNRELEASED; urgency=low
 
   * New upstream release.

Modified: kiax/trunk/debian/patches/01_debian-patch.dpatch
===================================================================
--- kiax/trunk/debian/patches/01_debian-patch.dpatch	2006-05-06 10:57:47 UTC (rev 1699)
+++ kiax/trunk/debian/patches/01_debian-patch.dpatch	2006-05-06 15:03:49 UTC (rev 1700)
@@ -14,6 +14,8 @@
  all:
  	echo 'none'
  install:
+<<<<<<< .mine
+=======
 diff -urNad kiax-0.8.5~/qkiax.pro kiax-0.8.5/qkiax.pro
 --- kiax-0.8.5~/qkiax.pro	2005-04-08 15:29:52.000000000 +0100
 +++ kiax-0.8.5/qkiax.pro	2006-03-29 21:23:45.000000000 +0100
@@ -65,3 +67,4 @@
  }
  
  open FH, ">$fnSrcpro" or die "Can't open file $fnSrcpro: $!\n";
+>>>>>>> .r1699