[Pkg-tcltk-commits] r453 - itcl3.1/trunk/debian

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Thu Jan 17 20:35:30 UTC 2008


Author: sgolovan-guest
Date: 2008-01-17 20:35:29 +0000 (Thu, 17 Jan 2008)
New Revision: 453

Added:
   itcl3.1/trunk/debian/compat
Modified:
   itcl3.1/trunk/debian/changelog
   itcl3.1/trunk/debian/control
   itcl3.1/trunk/debian/iwidgets3.1.files
   itcl3.1/trunk/debian/rules
Log:
[itcl3.1]
  * New maintainer Debian Tcl/Tk Packagers
    <pkg-tcltk-devel at lists.alioth.debian.org>
  * Acknowledged non-maintainer upload by Marc 'HE' Brockschmidt.
  * Swapped calls of dh_strip and dh_fixperms to allow library stripping when
    fakeroot is used (closes: #390379)
  * 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)
  * 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
    /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
  * Changed sections of itcl3.1-doc, itk3.1-doc, iwidgets3.1-doc to doc
  * Bumped standards version to 3.7.3
  * Bumped debhelper compatibility level to 5


Modified: itcl3.1/trunk/debian/changelog
===================================================================
--- itcl3.1/trunk/debian/changelog	2008-01-17 17:21:24 UTC (rev 452)
+++ itcl3.1/trunk/debian/changelog	2008-01-17 20:35:29 UTC (rev 453)
@@ -1,8 +1,32 @@
+itcl3.1 (3.1.0-8) unstable; urgency=low
+
+  * New maintainer Debian Tcl/Tk Packagers
+    <pkg-tcltk-devel at lists.alioth.debian.org>
+  * Acknowledged non-maintainer upload by Marc 'HE' Brockschmidt.
+  * Swapped calls of dh_strip and dh_fixperms to allow library stripping when
+    fakeroot is used (closes: #390379)
+  * 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)
+  * 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
+    /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
+  * Changed sections of itcl3.1-doc, itk3.1-doc, iwidgets3.1-doc to doc
+  * 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
+
 itcl3.1 (3.1.0-7.1) unstable; urgency=low
 
   * Non-maintainer upload
-  * Splitted xlibs-dev build-dep (Closes: #346713)
-  * Splitted itk3.1-dev xlibs-dev dep (Closes: #347155)
+  * Split xlibs-dev build-dep (Closes: #346713)
+  * Split itk3.1-dev xlibs-dev dep (Closes: #347155)
 
  -- Marc 'HE' Brockschmidt <he at debian.org>  Sat, 21 Jan 2006 16:37:13 +0100
 

Added: itcl3.1/trunk/debian/compat
===================================================================
--- itcl3.1/trunk/debian/compat	                        (rev 0)
+++ itcl3.1/trunk/debian/compat	2008-01-17 20:35:29 UTC (rev 453)
@@ -0,0 +1 @@
+5

Modified: itcl3.1/trunk/debian/control
===================================================================
--- itcl3.1/trunk/debian/control	2008-01-17 17:21:24 UTC (rev 452)
+++ itcl3.1/trunk/debian/control	2008-01-17 20:35:29 UTC (rev 453)
@@ -1,18 +1,19 @@
 Source: itcl3.1
 Section: libs
 Priority: optional
-Maintainer: Chris Waters <xtifr at debian.org>
-Build-Depends: debhelper (>= 3.0), libxt-dev, tcl8.3-dev, tk8.3-dev
-Standards-Version: 3.5.7
+Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
+Uploaders: Chris Waters <xtifr at debian.org>, Sergei Golovan <sgolovan at debian.org>
+Build-Depends: debhelper (>= 5.0), libxt-dev, tcl8.3-dev, tk8.3-dev
+Standards-Version: 3.7.3
 
 Package: itcl3.1-doc
-Section: devel
+Section: doc
 Priority: optional
 Architecture: all
 Replaces: itcl3.1-dev
 Conflicts: itcl-dev, itcl-doc
 Provides: itcl-doc
-Description: [incr Tcl] OOP extension for Tcl - manual pages
+Description: [incr Tcl] OOP extension for Tcl 8.3 - manual pages
  [incr Tcl] is an object-oriented extension of the Tcl language.  It
  was created to support more structured programming in Tcl.  
 
@@ -20,10 +21,10 @@
 Section: devel
 Priority: optional
 Architecture: any
-Depends: libc6-dev, tcl8.3-dev, itcl3.1 (= ${Source-Version})
+Depends: libc6-dev, tcl8.3-dev, itcl3.1 (= ${binary:Version})
 Conflicts: itcl-dev
 Suggests: itcl3.1-doc
-Description: [incr Tcl] OOP extension for Tcl - development files
+Description: [incr Tcl] OOP extension for Tcl 8.3 - development files
  [incr Tcl] is an object-oriented extension of the Tcl language.  It
  was created to support more structured programming in Tcl.  
 
@@ -32,51 +33,49 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}
-Provides: itclsh
-Description: [incr Tcl] OOP extension for Tcl - run-time files
+Description: [incr Tcl] OOP extension for Tcl 8.3 - run-time files
  [incr Tcl] is an object-oriented extension of the Tcl language.  It
  was created to support more structured programming in Tcl.
 
 Package: itk3.1-doc
-Section: devel
+Section: doc
 Priority: optional
 Architecture: all
 Replaces: itk3.1-dev
 Conflicts: itk-dev, itk-doc
 Provides: itk-doc
-Description: [incr Tk] OOP extension for Tcl - manual pages
+Description: [incr Tk] OOP extension for Tk 8.3 - manual pages
  [incr Tk] is a set of [incr Tcl] base classes for creating mega-widgets.
- Onc such set of mega-widgets is provided in the [incr Widgets] package.
+ One such set of mega-widgets is provided in the [incr Widgets] package.
 
 Package: itk3.1-dev
 Section: devel
 Priority: optional
 Architecture: any
-Depends: libc6-dev, tcl8.3-dev, itcl3.1-dev, tk8.3-dev, libxt-dev, itk3.1 (= ${Source-Version})
+Depends: libc6-dev, tcl8.3-dev, itcl3.1-dev, tk8.3-dev, libxt-dev, itk3.1 (= ${binary:Version})
 Conflicts: itk-dev, itcl3.0-dev (<< 3.0.1)
 Suggests: itk3.1-doc
-Description: [incr Tk] OOP extension for Tcl - development files
+Description: [incr Tk] OOP extension for Tk 8.3 - development files
  [incr Tk] is a set of [incr Tcl] base classes for creating mega-widgets.
- Onc such set of mega-widgets is provided in the [incr Widgets] package.
+ One such set of mega-widgets is provided in the [incr Widgets] package.
 
 Package: itk3.1
 Section: libs
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, itcl3.1 (= ${Source-Version})
-Provides: itkwish
-Description: [incr Tk] OOP extension for Tcl - run-time files
+Depends: ${shlibs:Depends}, itcl3.1 (= ${binary:Version})
+Description: [incr Tk] OOP extension for Tk 8.3 - run-time files
  [incr Tk] is a set of [incr Tcl] base classes for creating mega-widgets.
- Onc such set of mega-widgets is provided in the [incr Widgets] package.
+ One such set of mega-widgets is provided in the [incr Widgets] package.
 
 Package: iwidgets3.1-doc
-Section: devel
+Section: doc
 Priority: optional
 Architecture: all
 Replaces: iwidgets3.1-dev
 Conflicts: iwidgets-dev, iwidgets-doc, itcl3.0-dev (<< 3.0.1)
 Provides: iwidgets-doc
-Description: [incr Widgets] OOP extension for Tcl - manual pages
+Description: [incr Widgets] OOP extension for Tcl/Tk 8.3 - manual pages
  [incr Widgets] is a set of high-level mega-widgets built using [incr Tk].
  It has more than 50 widget classes, and can be used right out of the box 
  to create various user interface components.
@@ -85,9 +84,9 @@
 Section: libs
 Priority: optional
 Architecture: all
-Depends: itkwish
+Depends: itk3.1
 Conflicts: itcl3.0 (<< 3.0.1)
-Description: [incr Widgets] OOP extension for Tcl - run-time files
+Description: [incr Widgets] OOP extension for Tcl/Tk 8.3 - run-time files
  [incr Widgets] is a set of high-level mega-widgets built using [incr Tk].
  It has more than 50 widget classes, and can be used right out of the box 
  to create various user interface components.

Modified: itcl3.1/trunk/debian/iwidgets3.1.files
===================================================================
--- itcl3.1/trunk/debian/iwidgets3.1.files	2008-01-17 17:21:24 UTC (rev 452)
+++ itcl3.1/trunk/debian/iwidgets3.1.files	2008-01-17 20:35:29 UTC (rev 453)
@@ -1 +1 @@
-usr/lib/iwidgets[0-9]*
+usr/share/tcltk/iwidgets[0-9]*

Modified: itcl3.1/trunk/debian/rules
===================================================================
--- itcl3.1/trunk/debian/rules	2008-01-17 17:21:24 UTC (rev 452)
+++ itcl3.1/trunk/debian/rules	2008-01-17 20:35:29 UTC (rev 453)
@@ -3,9 +3,6 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
 v = 3.1
 vv = 3.1.0
 tcltk = 8.3
@@ -17,9 +14,11 @@
 # Make sure the proper Tcl/Tk is installed.
 	test -d /usr/include/tcl$(tcltk)/tk-private
 
-	sh ./configure --prefix=/usr --includedir=/usr/include/tcl$(tcltk) \
-	  --enable-shared --with-tcl=/usr/lib/tcl$(tcltk) \
-	  --with-tk=/usr/lib/tk$(tcltk)
+	sh ./configure --prefix=/usr \
+		       --enable-shared \
+		       --includedir=/usr/include/tcl$(tcltk) \
+		       --with-tcl=/usr/lib/tcl$(tcltk) \
+		       --with-tk=/usr/lib/tk$(tcltk)
 	$(MAKE) CFLAGS="-g -O2 -D_REENTRANT"
 # Build the static library.
 	cd itcl/unix && \
@@ -38,8 +37,8 @@
 	dh_testroot
 	rm -f build-stamp install-stamp
 
-	-$(MAKE) clean
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean
 
@@ -73,8 +72,10 @@
 # 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
+	cp itcl/generic/itclDecls.h debian/tmp/usr/include/tcl$(tcltk)
 	install -d debian/tmp/usr/include/tcl$(tcltk)/itk-private/generic
 	cp itk/generic/*.h debian/tmp/usr/include/tcl$(tcltk)/itk-private/generic
+	cp itk/generic/itkDecls.h debian/tmp/usr/include/tcl$(tcltk)
 # Fix up the manpages.
 	cd debian/tmp/usr/share/man/man1 && \
 	  mv itclsh.1 itclsh$(v).1 && \
@@ -89,12 +90,22 @@
 	  for f in *.niwidgets ; do \
 	    mv $$f `echo $$f | sed -e 's/\.niwidgets/.3iwidget/'`s ; \
 	  done
+# Move Tcl libraries
+	mkdir -p debian/tmp/usr/share/tcltk/
+	mv debian/tmp/usr/lib/iwidgets$(vv) debian/tmp/usr/share/tcltk/
 
 	dh_movefiles
 
-	chmod 644 debian/iwidgets$(v)/usr/lib/iwidgets$(vv)/demos/demo.html
-	chmod 644 debian/iwidgets$(v)/usr/lib/iwidgets$(vv)/demos/iwidgets.gif
+	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 ; \
+	done
+
 	touch install-stamp
 
 # Build architecture-independent files here.
@@ -103,12 +114,12 @@
 	dh_testroot -i
 	dh_installdocs -i
 	#dh_installexamples -i
-	ln -sf ../../../lib/iwidgets$(vv)/demos \
-	  debian/iwidgets$(v)/usr/share/doc/iwidgets$(v)/examples
 	dh_installchangelogs -pitcl$(v)-doc -pitk$(v)-doc -k CHANGES
 	dh_installchangelogs -piwidgets$(v) -piwidgets$(v)-doc -k iwidgets3.0.0/CHANGES
-	dh_compress -i
+	mv debian/iwidgets$(v)/usr/share/tcltk/iwidgets$(vv)/demos \
+	   debian/iwidgets$(v)-doc/usr/share/doc/iwidgets$(v)-doc/
 	dh_fixperms -i
+	dh_compress -i -Xdemos
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
@@ -128,9 +139,9 @@
 	  ln -sf itcl$(v) debian/$$f/usr/share/doc/$$f ; \
 	done
 	dh_installchangelogs -a -k CHANGES
+	dh_fixperms -a
 	dh_strip -a
 	dh_compress -a
-	dh_fixperms -a
 	dh_makeshlibs -pitcl$(v) -V 'itcl$(v)'
 	dh_makeshlibs -pitk$(v) -V 'itk$(v)'
 	dh_installdeb -a




More information about the Pkg-tcltk-commits mailing list