[Pkg-tcltk-commits] r892 - xotcl/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-06-23 14:41:08 +0000 (Tue, 23 Jun 2009)
New Revision: 892

Modified:
   xotcl/trunk/debian/changelog
   xotcl/trunk/debian/compat
   xotcl/trunk/debian/control
   xotcl/trunk/debian/rules
Log:
Some minor changes.


Modified: xotcl/trunk/debian/changelog
===================================================================
--- xotcl/trunk/debian/changelog	2009-06-22 17:08:20 UTC (rev 891)
+++ xotcl/trunk/debian/changelog	2009-06-23 14:41:08 UTC (rev 892)
@@ -1,5 +1,6 @@
 xotcl (1.6.3-2) unstable; urgency=low
 
+  [ Stefan Sobernig ]
   * Adding debian/watch file
   * Making use of inheriting fields from xotcl source in debian/control
   * Removed overrides turned obsolete in xotcl source
@@ -11,8 +12,13 @@
     through substvar injection from aolserver4-dev (starting with
     4.5.1-5)
 
- -- Stefan Sobernig <stefan.sobernig at wu-wien.ac.at>  Fri, 19 Jun 2009 00:27:21 +0200
+  [ Francesco Paolo Lovergine ]
+  * Debhelper compatibility level pushed to 7.
+  * Home page field moved to main section.
+  * Substvar concat moved just before dh_gencontrol. 
 
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 23 Jun 2009 16:40:22 +0200
+
 xotcl (1.6.3-1) unstable; urgency=low
 
   * New upstream release: 1.6.3 (see http://www.xotcl.org/)

Modified: xotcl/trunk/debian/compat
===================================================================
--- xotcl/trunk/debian/compat	2009-06-22 17:08:20 UTC (rev 891)
+++ xotcl/trunk/debian/compat	2009-06-23 14:41:08 UTC (rev 892)
@@ -1 +1 @@
-5
+7

Modified: xotcl/trunk/debian/control
===================================================================
--- xotcl/trunk/debian/control	2009-06-22 17:08:20 UTC (rev 891)
+++ xotcl/trunk/debian/control	2009-06-23 14:41:08 UTC (rev 892)
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Stefan Sobernig <stefan.sobernig at wu-wien.ac.at>
-Build-Depends: debhelper (>= 5), autotools-dev, tcl-dev (>= 8.4), tk-dev (>= 8.4), aolserver4-dev (>= 4.5.1-5)
+Build-Depends: debhelper (>= 7), autotools-dev, tcl-dev (>= 8.4), tk-dev (>= 8.4), aolserver4-dev (>= 4.5.1-5)
 Standards-Version: 3.8.2
+Homepage: http://www.xotcl.org/
 Vcs-Svn: svn://svn.debian.org/viewsvn/pkg-tcltk/xotcl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-tcltk/xotcl/
 
 Package: xotcl
 Architecture: any
 Depends: ${tclsh:Depends}, ${shlibs:Depends}
-Homepage: http://www.xotcl.org/
 Description: Extended Object Tcl (XOTcl): Object orientation for Tcl - shared library
  Extended Object Tcl (for short: XOTcl, pronounced exotickle) is an
  object-oriented scripting language based on Tcl. It was originally
@@ -25,7 +25,6 @@
 Section: utils
 Architecture: any
 Depends: xotcl (= ${binary:Version}), ${shlibs:Depends}
-Homepage: http://www.xotcl.org/
 Description: Extended Object Tcl (XOTcl): Object orientation for Tcl - shells
  This package provides you with two Tcl/Tk shell wrappers, xotclsh and
  xowish. These shells offer ready-made environments for
@@ -34,7 +33,6 @@
 Package: xotcl-doc
 Section: doc
 Architecture: all
-Homepage: http://www.xotcl.org/
 Description: Extended Object Tcl (XOTcl): Object orientation for Tcl - manual
  This package brings the official XOTcl language reference and a
  comprehensive tutorial to you. They are registered with the doc-base
@@ -45,7 +43,6 @@
 Section: libdevel
 Architecture: any
 Depends: xotcl (= ${binary:Version})
-Homepage: http://www.xotcl.org/
 Description: Extended Object Tcl (XOTcl): Object orientation for Tcl - development files
  Header files and static libraries for libxotcl. You will need this
  package in place if you plan to develop using the XOTcl C interface
@@ -55,7 +52,6 @@
 Section: httpd
 Architecture: all
 Depends: xotcl (>= ${binary:Version}), ${aolserver:Depends}
-Homepage: http://www.xotcl.org/
 Description: Extended Object Tcl (XOTcl): Object orientation for AOLServer - module
  This package provides the XOTcl module for the AOLSERVER 4.0.10/4.5
  webserver. This module provides and initialises the XOTcl language

Modified: xotcl/trunk/debian/rules
===================================================================
--- xotcl/trunk/debian/rules	2009-06-22 17:08:20 UTC (rev 891)
+++ xotcl/trunk/debian/rules	2009-06-23 14:41:08 UTC (rev 892)
@@ -93,10 +93,10 @@
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean config.log config.status config.cache config.guess
 
-install: /usr/share/aolserver4/debian.substvars build 
+install: build 
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 
 	$(MAKE) DESTDIR=$(TARGET) XOTCLSH=xotclsh install
@@ -195,12 +195,6 @@
 		$(DOCDIR)/examples/$$f; \
 	done
 
-	# aolserver4-xotcl
-
-	# inject AOLServer version and ABI changes through substvars
-	# fragment provided by aolserver4-dev
-	cp /usr/share/aolserver4/debian.substvars $(DEB)/aolserver4-xotcl.substvars 
-
 	install -D -m 755 -o root -g root generic/aol-xotcl.tcl $(TARGET)/usr/lib/aolserver4/modules/tcl/xotcl.tcl
 	# `- repackage
 	install -D -m 755 -o root -g root $(TARGET)/usr/lib/aolserver4/modules/tcl/xotcl.tcl $(AOL)/usr/lib/aolserver4/modules/tcl/xotcl.tcl
@@ -236,6 +230,9 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
+	# inject AOLServer version and ABI changes through substvars
+	# fragment provided by aolserver4-dev
+	cat /usr/share/aolserver4/debian.substvars >>$(DEB)/aolserver4-xotcl.substvars 
 	tcltk-depends
 	dh_gencontrol -a
 	dh_md5sums -a