[Pkg-tcltk-commits] r454 - in itcl3.1/trunk: debian itcl/unix itk/unix

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Fri Jan 18 10:58:29 UTC 2008 

Author: sgolovan-guest
Date: 2008-01-18 10:58:28 +0000 (Fri, 18 Jan 2008)
New Revision: 454

Added:
   itcl3.1/trunk/itcl/unix/pkgIndex.tcl.in
   itcl3.1/trunk/itk/unix/pkgIndex.tcl.in
Modified:
   itcl3.1/trunk/debian/changelog
   itcl3.1/trunk/debian/itcl3.1-dev.files
   itcl3.1/trunk/debian/itcl3.1.files
   itcl3.1/trunk/debian/itk3.1-dev.files
   itcl3.1/trunk/debian/itk3.1.files
   itcl3.1/trunk/debian/rules
   itcl3.1/trunk/itcl/unix/configure
   itcl3.1/trunk/itcl/unix/configure.in
   itcl3.1/trunk/itk/unix/configure
   itcl3.1/trunk/itk/unix/configure.in
Log:
[ttcl3.1]
  * Clarified in package descriptions that these packages are for Tcl/Tk 8.3
    and added extra checks to prevent loading them to newer Tcl/Tk versions
    (closes: #195474)
  * Moved itcl3.1, itk3.1 package files to a subdirectory of
    /usr/share/tcltk directory to meke the package compliant to Debian Tcl/Tk
    policy


Modified: itcl3.1/trunk/debian/changelog
===================================================================
--- itcl3.1/trunk/debian/changelog	2008-01-17 20:35:29 UTC (rev 453)
+++ itcl3.1/trunk/debian/changelog	2008-01-18 10:58:28 UTC (rev 454)
@@ -8,11 +8,11 @@
   * Fixed a typo in itk3.1, itk3.1-dev, itk3.1-doc package descriptions
     (closes: #363980)
   * Clarified in package descriptions that these packages are for Tcl/Tk 8.3
-    and added extra checks (TODO) to prevent loading them to newer Tcl/Tk
-    versions (closes: #195474)
+    and added extra checks to prevent loading them to newer Tcl/Tk versions
+    (closes: #195474)
   * Added itclDecl.h and itkDecl.h as public headers (closes: #200771)
   * Moved iwidgets demos to iwidgets3.1-doc package
-  * Moved iwidgets3.1 (OTHERS TODO) package files to a subdirectory of
+  * Moved itcl3.1, itk3.1, iwidgets3.1 package files to a subdirectory of
     /usr/share/tcltk directory to meke the package compliant to Debian Tcl/Tk
     policy
   * Fixed calls to make clean and make distclean in debian/rules
@@ -20,7 +20,7 @@
   * Bumped standards version to 3.7.3
   * Bumped debhelper compatibility level to 5
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 17 Jan 2008 21:10:16 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 18 Jan 2008 13:22:00 +0300
 
 itcl3.1 (3.1.0-7.1) unstable; urgency=low
 

Modified: itcl3.1/trunk/debian/itcl3.1-dev.files
===================================================================
--- itcl3.1/trunk/debian/itcl3.1-dev.files	2008-01-17 20:35:29 UTC (rev 453)
+++ itcl3.1/trunk/debian/itcl3.1-dev.files	2008-01-18 10:58:28 UTC (rev 454)
@@ -1,4 +1,4 @@
 usr/include/tcl8.3/itcl*
 usr/lib/libitcl*.a
 usr/lib/libitcl*.so
-usr/lib/itcl*/*.sh
+usr/share/tcltk/itcl*/*.sh

Modified: itcl3.1/trunk/debian/itcl3.1.files
===================================================================
--- itcl3.1/trunk/debian/itcl3.1.files	2008-01-17 20:35:29 UTC (rev 453)
+++ itcl3.1/trunk/debian/itcl3.1.files	2008-01-18 10:58:28 UTC (rev 454)
@@ -1,4 +1,4 @@
 usr/bin/itclsh*
-usr/lib/itcl[0-9]*
 usr/lib/libitcl*.so.*
 usr/share/man/man1/itclsh*
+usr/share/tcltk/itcl[0-9]*

Modified: itcl3.1/trunk/debian/itk3.1-dev.files
===================================================================
--- itcl3.1/trunk/debian/itk3.1-dev.files	2008-01-17 20:35:29 UTC (rev 453)
+++ itcl3.1/trunk/debian/itk3.1-dev.files	2008-01-18 10:58:28 UTC (rev 454)
@@ -1,4 +1,4 @@
 usr/include/tcl8.3/itk*
 usr/lib/libitk*.a
 usr/lib/libitk*.so
-usr/lib/itk*/*.sh
+usr/share/tcltk/itk*/*.sh

Modified: itcl3.1/trunk/debian/itk3.1.files
===================================================================
--- itcl3.1/trunk/debian/itk3.1.files	2008-01-17 20:35:29 UTC (rev 453)
+++ itcl3.1/trunk/debian/itk3.1.files	2008-01-18 10:58:28 UTC (rev 454)
@@ -1,4 +1,4 @@
 usr/bin/itkwish*
-usr/lib/itk[0-9]*
 usr/lib/libitk*.so.*
 usr/share/man/man1/itkwish*
+usr/share/tcltk/itk[0-9]*

Modified: itcl3.1/trunk/debian/rules
===================================================================
--- itcl3.1/trunk/debian/rules	2008-01-17 20:35:29 UTC (rev 453)
+++ itcl3.1/trunk/debian/rules	2008-01-18 10:58:28 UTC (rev 454)
@@ -19,7 +19,9 @@
 		       --includedir=/usr/include/tcl$(tcltk) \
 		       --with-tcl=/usr/lib/tcl$(tcltk) \
 		       --with-tk=/usr/lib/tk$(tcltk)
-	$(MAKE) CFLAGS="-g -O2 -D_REENTRANT"
+	$(MAKE) CFLAGS="-g -O2 -D_REENTRANT" \
+		ITCL_LIBRARY=/usr/share/tcltk/itcl$(v) \
+		ITK_LIBRARY=/usr/share/tcltk/itk$(v)
 # Build the static library.
 	cd itcl/unix && \
 	  ar cr libitcl$(v).a *.o && \
@@ -50,7 +52,10 @@
 	dh_installdirs
 
 	mkdir -p debian/tmp
-	$(MAKE) INSTALL_ROOT=`pwd`/debian/tmp install
+	$(MAKE) INSTALL_ROOT=`pwd`/debian/tmp \
+		ITCL_LIBRARY=/usr/share/tcltk/itcl$(v) \
+		ITK_LIBRARY=/usr/share/tcltk/itk$(v) \
+		install
 # Fix up the itcl libraries.
 	cp itcl/unix/libitcl$(v).a debian/tmp/usr/lib
 	ln -sf libitcl$(v).so.1 debian/tmp/usr/lib/libitcl$(v).so
@@ -59,7 +64,7 @@
 	  -e "s|^(ITCL_BUILD_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib -litclstub$(v)'|;" \
 	  -e "s|^(ITCL_SRC_DIR)=.*$$|\1='/usr/include/tcl$(tcltk)/itcl-private'|" \
 	  debian/tmp/usr/lib/itclConfig.sh
-	mv debian/tmp/usr/lib/itcl*.sh debian/tmp/usr/lib/itcl$(v)
+	mv debian/tmp/usr/lib/itcl*.sh debian/tmp/usr/share/tcltk/itcl$(v)
 # Fix up the itk libraries.
 	cp itk/unix/libitk$(v).a debian/tmp/usr/lib
 	ln -sf libitk$(v).so.1 debian/tmp/usr/lib/libitk$(v).so
@@ -68,7 +73,7 @@
 	  -e "s|^(ITK_BUILD_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib -litkstub$(v)'|;" \
 	  -e "s|^(ITK_SRC_DIR)=.*$$|\1='/usr/include/tcl$(tcltk)/itk-private'|" \
 	  debian/tmp/usr/lib/itkConfig.sh
-	mv debian/tmp/usr/lib/itk*.sh debian/tmp/usr/lib/itk$(v)
+	mv debian/tmp/usr/lib/itk*.sh debian/tmp/usr/share/tcltk/itk$(v)
 # Fix up the include files.
 	install -d debian/tmp/usr/include/tcl$(tcltk)/itcl-private/generic
 	cp itcl/generic/*.h debian/tmp/usr/include/tcl$(tcltk)/itcl-private/generic
@@ -82,9 +87,11 @@
 	  mv itkwish.1 itkwish$(v).1
 	cd debian/tmp/usr/share/man/man3 && \
 	  for f in *.nitcl ; do \
+	    sed -i -e's/^\.TH \([^ ]\+\) n /.TH \1 3itcl /' $$f ; \
 	    mv $$f `echo $$f | sed -e 's/\.nitcl/.3itcl/'` ; \
 	  done ; \
 	  for f in *.nitk ; do \
+	    sed -i -e's/^\.TH \([^ ]\+\) n /.TH \1 3itk /' $$f ; \
 	    mv $$f `echo $$f | sed -e 's/\.nitk/.3itk/'` ; \
 	  done ; \
 	  for f in *.niwidgets ; do \
@@ -99,11 +106,9 @@
 	chmod 644 debian/iwidgets$(v)/usr/share/tcltk/iwidgets$(vv)/demos/demo.html
 	chmod 644 debian/iwidgets$(v)/usr/share/tcltk/iwidgets$(vv)/demos/iwidgets.gif
 
-# Fix dirname in demos
-	for f in debian/iwidgets$(v)/usr/share/tcltk/iwidgets$(vv)/demos/* ; do \
-	  sed -i -e's/\$${iwidgets::library}/& .. .. doc iwidgets$(v)-doc/g' \
-	  	 -e's/\$$library/& .. .. doc iwidgets$(v)-doc/g' \
-	    $$f ; \
+	for f in itcl$(v) itk$(v) ; do \
+	  mkdir -p debian/$${f}-doc/usr/share/doc/$${f}-doc/ ; \
+	  mv debian/$$f/usr/share/tcltk/*/*.c debian/$${f}-doc/usr/share/doc/$${f}-doc/ ; \
 	done
 
 	touch install-stamp
@@ -118,6 +123,9 @@
 	dh_installchangelogs -piwidgets$(v) -piwidgets$(v)-doc -k iwidgets3.0.0/CHANGES
 	mv debian/iwidgets$(v)/usr/share/tcltk/iwidgets$(vv)/demos \
 	   debian/iwidgets$(v)-doc/usr/share/doc/iwidgets$(v)-doc/
+	mkdir -p debian/iwidgets$(v)-doc/usr/share/tcltk/iwidgets$(vv)
+	ln -s ../../doc/iwidgets$(v)-doc/demos \
+	   debian/iwidgets$(v)-doc/usr/share/tcltk/iwidgets$(vv)/
 	dh_fixperms -i
 	dh_compress -i -Xdemos
 	dh_installdeb -i

Modified: itcl3.1/trunk/itcl/unix/configure
===================================================================
--- itcl3.1/trunk/itcl/unix/configure	2008-01-17 20:35:29 UTC (rev 453)
+++ itcl3.1/trunk/itcl/unix/configure	2008-01-18 10:58:28 UTC (rev 454)
@@ -1161,7 +1161,7 @@
     SHLIB_CFLAGS="${SHLIB_CFLAGS}"
     TCL_STUB_FLAGS=-DUSE_TCL_STUBS
     eval "ITCL_LIB_FILE=libitcl${VERSION}${SHLIB_SUFFIX}"
-    ITCL_PKG_FILE="[file join [file dirname \$dir] ${ITCL_LIB_FILE}]"
+    ITCL_PKG_FILE="[file join ${exec_prefix} lib ${ITCL_LIB_FILE}]"
     MAKE_LIB="\$(SHLIB_LD) -o ${ITCL_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS} -Wl,-soname,${ITCL_LIB_FILE}"
     RANLIB=":"
 else

Modified: itcl3.1/trunk/itcl/unix/configure.in
===================================================================
--- itcl3.1/trunk/itcl/unix/configure.in	2008-01-17 20:35:29 UTC (rev 453)
+++ itcl3.1/trunk/itcl/unix/configure.in	2008-01-18 10:58:28 UTC (rev 454)
@@ -140,7 +140,7 @@
     SHLIB_CFLAGS="${SHLIB_CFLAGS}"
     TCL_STUB_FLAGS=-DUSE_TCL_STUBS
     eval "ITCL_LIB_FILE=libitcl${VERSION}${SHLIB_SUFFIX}"
-    ITCL_PKG_FILE="[[file join [file dirname \$dir] ${ITCL_LIB_FILE}]]"
+    ITCL_PKG_FILE="[file join ${exec_prefix} lib ${ITCL_LIB_FILE}]"
     MAKE_LIB="\$(SHLIB_LD) -o ${ITCL_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS} -Wl,-soname,${ITCL_LIB_FILE}"
     RANLIB=":"
 else

Added: itcl3.1/trunk/itcl/unix/pkgIndex.tcl.in
===================================================================
--- itcl3.1/trunk/itcl/unix/pkgIndex.tcl.in	                        (rev 0)
+++ itcl3.1/trunk/itcl/unix/pkgIndex.tcl.in	2008-01-18 10:58:28 UTC (rev 454)
@@ -0,0 +1,5 @@
+# Tcl package index file, version 1.0
+
+if {[package vcompare [info tclversion] 8.3] != 0} return
+
+package ifneeded Itcl @ITCL_VERSION@ [list load "@ITCL_PKG_FILE@" Itcl]

Modified: itcl3.1/trunk/itk/unix/configure
===================================================================
--- itcl3.1/trunk/itk/unix/configure	2008-01-17 20:35:29 UTC (rev 453)
+++ itcl3.1/trunk/itk/unix/configure	2008-01-18 10:58:28 UTC (rev 454)
@@ -1214,7 +1214,7 @@
     SHLIB_CFLAGS="${SHLIB_CFLAGS}"
     TCL_STUB_FLAGS=-DUSE_TCL_STUBS
     eval "ITK_LIB_FILE=libitk${VERSION}${SHLIB_SUFFIX}"
-    ITK_PKG_FILE="[file join [file dirname \$dir] ${ITK_LIB_FILE}]"
+    ITK_PKG_FILE="[file join ${exec_prefix} lib ${ITK_LIB_FILE}]"
     MAKE_LIB="\$(SHLIB_LD) -o ${ITK_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS} -Wl,-soname,${ITK_LIB_FILE}"
     RANLIB=":"
 else

Modified: itcl3.1/trunk/itk/unix/configure.in
===================================================================
--- itcl3.1/trunk/itk/unix/configure.in	2008-01-17 20:35:29 UTC (rev 453)
+++ itcl3.1/trunk/itk/unix/configure.in	2008-01-18 10:58:28 UTC (rev 454)
@@ -177,7 +177,7 @@
     SHLIB_CFLAGS="${SHLIB_CFLAGS}"
     TCL_STUB_FLAGS=-DUSE_TCL_STUBS
     eval "ITK_LIB_FILE=libitk${VERSION}${SHLIB_SUFFIX}"
-    ITK_PKG_FILE="[[file join [file dirname \$dir] ${ITK_LIB_FILE}]]"
+    ITK_PKG_FILE="[file join ${exec_prefix} lib ${ITK_LIB_FILE}]"
     MAKE_LIB="\$(SHLIB_LD) -o ${ITK_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS} -Wl,-soname,${ITK_LIB_FILE}"
     RANLIB=":"
 else

Added: itcl3.1/trunk/itk/unix/pkgIndex.tcl.in
===================================================================
--- itcl3.1/trunk/itk/unix/pkgIndex.tcl.in	                        (rev 0)
+++ itcl3.1/trunk/itk/unix/pkgIndex.tcl.in	2008-01-18 10:58:28 UTC (rev 454)
@@ -0,0 +1,5 @@
+# Tcl package index file, version 1.0
+
+if {[package vcompare [info tclversion] 8.3] != 0} return
+
+package ifneeded Itk @ITCL_VERSION@ [list load "@ITK_PKG_FILE@" Itk]

More information about the Pkg-tcltk-commits mailing list