[Pkg-tcltk-commits] r263 - tk8.4/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2007-10-14 19:50:24 +0000 (Sun, 14 Oct 2007)
New Revision: 263

Modified:
   tk8.4/trunk/debian/changelog
   tk8.4/trunk/debian/control
   tk8.4/trunk/debian/rules
Log:
[tk8.4]
  * Removed conflicts with tcl and providing tcl-dev packages from
    debian/control to prepare binary packages for default tcl and tcl-dev.
  * Added Homepage field to debian/control.


Modified: tk8.4/trunk/debian/changelog
===================================================================
--- tk8.4/trunk/debian/changelog	2007-10-14 19:49:51 UTC (rev 262)
+++ tk8.4/trunk/debian/changelog	2007-10-14 19:50:24 UTC (rev 263)
@@ -5,6 +5,9 @@
   * Moved architecture independent files from /usr/lib/tk8.4 to
     /usr/share/tcltk/tk8.4 breaking backward compatibility.
   * Fixed bug with update-alternatives in prerm script.
+  * Removed conflicts with tcl and providing tcl-dev packages from
+    debian/control to prepare binary packages for default tcl and tcl-dev.
+  * Added Homepage field to debian/control.
 
  -- Sergei Golovan <sgolovan at debian.org>  Sun, 14 Oct 2007 20:32:13 +0400
 

Modified: tk8.4/trunk/debian/control
===================================================================
--- tk8.4/trunk/debian/control	2007-10-14 19:49:51 UTC (rev 262)
+++ tk8.4/trunk/debian/control	2007-10-14 19:50:24 UTC (rev 263)
@@ -5,6 +5,7 @@
 Uploaders: Chris Waters <xtifr at debian.org>, Anselm Lingnau <lingnau at debian.org>, Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.16-2), quilt
 Standards-Version: 3.7.2
+Homepage: http://www.tcl.tk/
 
 Package: tk8.4
 Section: libs
@@ -12,42 +13,34 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: xterm | x-terminal-emulator
-Conflicts: tk, tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5)
+Conflicts: tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5)
 Provides: wish
 Description: Tk toolkit for Tcl and X11, v8.4 - run-time files
  Tk is a cross-platform graphical toolkit which provides the Motif
  look-and-feel and is implemented using the Tcl scripting language.
  This package contains everything you need to run Tk (wish) scripts
  and Tk-enabled apps.
- .
- Homepage: http://www.tcl.tk/
 
 Package: tk8.4-doc
 Section: doc
 Priority: optional
 Architecture: all
 Suggests: tk8.4
-Conflicts: tk, tk-doc
+Conflicts: tk-doc
 Provides: tk-doc
 Description: Tk toolkit for Tcl and X11, v8.4 - manual pages
  Tk is a cross-platform graphical toolkit which provides the Motif
  look-and-feel and is implemented using the Tcl scripting language.
  This package contains the manual pages for the Tk commands.
- .
- Homepage: http://www.tcl.tk/
 
 Package: tk8.4-dev
 Section: devel
 Priority: optional
 Architecture: any
 Depends: x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.16-2), tk8.4 (= ${binary:Version})
-Conflicts: tk
-Provides: tk-dev
 Suggests: tk8.4-doc
 Description: Tk toolkit for Tcl and X11, v8.4 - development files
  Tk is a cross-platform graphical toolkit which provides the Motif
  look-and-feel and is implemented using the Tcl scripting language.
  This package contains the headers and libraries needed to extend
  or embed Tk.
- .
- Homepage: http://www.tcl.tk/

Modified: tk8.4/trunk/debian/rules
===================================================================
--- tk8.4/trunk/debian/rules	2007-10-14 19:49:51 UTC (rev 262)
+++ tk8.4/trunk/debian/rules	2007-10-14 19:50:24 UTC (rev 263)
@@ -68,11 +68,11 @@
 	mkdir -p debian/tmp/usr
 	cd unix && \
 	  GZIP=-9 \
-	  make INSTALL_ROOT=`pwd`/../debian/tmp \
-	       MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
-	       MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 install
+	  $(MAKE) INSTALL_ROOT=`pwd`/../debian/tmp \
+		  MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
+		  MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 install
 # Fix up pkgInstall.tcl
-	cp debian/tmp/usr/lib/tk8.4/* debian/tmp/usr/share/tcltk/tk8.4
+	cp debian/tmp/usr/lib/tk$(v)/* debian/tmp/usr/share/tcltk/tk$(v)
 # Fix up the libraries.
 	cp unix/libtk$(v).a debian/tmp/usr/lib
 	mv debian/tmp/usr/lib/libtk$(v).so debian/tmp/usr/lib/libtk$(v).so.0