[Pkg-tcltk-commits] r1684 - blt/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2014-11-19 13:43:13 +0000 (Wed, 19 Nov 2014)
New Revision: 1684

Added:
   blt/trunk/debian/tk8.6-blt2.5.dirs
   blt/trunk/debian/tk8.6-blt2.5.install
Removed:
   blt/trunk/debian/tk8.6-blt2.5.dirs
   blt/trunk/debian/tk8.6-blt2.5.install
Log:
[blt]
	* resolve the conflict.


Deleted: blt/trunk/debian/tk8.6-blt2.5.dirs
===================================================================
--- blt/trunk/debian/tk8.6-blt2.5.dirs	2014-11-19 07:37:09 UTC (rev 1683)
+++ blt/trunk/debian/tk8.6-blt2.5.dirs	2014-11-19 13:43:13 UTC (rev 1684)
@@ -1 +0,0 @@
-usr/lib/blt2.5

Copied: blt/trunk/debian/tk8.6-blt2.5.dirs (from rev 1682, blt/trunk/debian/blt.dirs)
===================================================================
--- blt/trunk/debian/tk8.6-blt2.5.dirs	                        (rev 0)
+++ blt/trunk/debian/tk8.6-blt2.5.dirs	2014-11-19 13:43:13 UTC (rev 1684)
@@ -0,0 +1 @@
+usr/lib/blt2.5

Deleted: blt/trunk/debian/tk8.6-blt2.5.install
===================================================================
--- blt/trunk/debian/tk8.6-blt2.5.install	2014-11-19 07:37:09 UTC (rev 1683)
+++ blt/trunk/debian/tk8.6-blt2.5.install	2014-11-19 13:43:13 UTC (rev 1684)
@@ -1,2 +0,0 @@
-usr/lib/*.so.*
-usr/lib/blt2.5

Copied: blt/trunk/debian/tk8.6-blt2.5.install (from rev 1682, blt/trunk/debian/blt.install)
===================================================================
--- blt/trunk/debian/tk8.6-blt2.5.install	                        (rev 0)
+++ blt/trunk/debian/tk8.6-blt2.5.install	2014-11-19 13:43:13 UTC (rev 1684)
@@ -0,0 +1,2 @@
+usr/lib/*.so.*
+usr/lib/blt2.5