diff -u xotcl-1.6.3/debian/changelog xotcl-1.6.3/debian/changelog --- xotcl-1.6.3/debian/changelog +++ xotcl-1.6.3/debian/changelog @@ -1,3 +1,31 @@ +xotcl (1.6.3-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Replace aolserver4 dependency with aolserver4-daemon. + + -- Bhavani Shankar Tue, 14 Jul 2009 12:00:09 +0530 + +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 + * Added details to the aolserver4-xotcl extended description + * Added details to the xotcl-dev extended description + * Checked lintian sanity (lintian v2.2.12) + * Changed section field in aolserver4-xotcl to "httpd" + * aolserver4-xotcl: Adding API/ABI coupling to aolserver4-core + through substvar injection from aolserver4-dev (starting with + 4.5.1-5) + + [ Francesco Paolo Lovergine ] + * Debhelper compatibility level pushed to 7. + * Home page field moved to main section. + * Substvar concat moved just before dh_gencontrol. + + -- Stefan Sobernig Tue, 23 Jun 2009 16:40:22 +0200 + xotcl (1.6.3-1ubuntu1) karmic; urgency=low * Replace aolserver4 dependency with aolserver4-daemon. @@ -40,0 +69 @@ + diff -u xotcl-1.6.3/debian/rules xotcl-1.6.3/debian/rules --- xotcl-1.6.3/debian/rules +++ xotcl-1.6.3/debian/rules @@ -56,7 +56,12 @@ # alternative in future releases: # --with-gdbm=/usr/include,/usr/lib +# +# link to AOLServer and ABI version changes +# + config.status: configure + dh_testdir ./configure --prefix=/usr \ --exec-prefix=/usr \ @@ -74,7 +79,7 @@ --build=$(DEB_BUILD_GNU_TYPE) build: build-stamp -build-stamp: config.status +build-stamp: config.status dh_testdir $(MAKE) @@ -88,10 +93,10 @@ [ ! -f Makefile ] || $(MAKE) distclean dh_clean config.log config.status config.cache config.guess -install: build +install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) DESTDIR=$(TARGET) XOTCLSH=xotclsh install @@ -109,7 +114,7 @@ (cd $(EXTENSION)/usr/lib; \ ln -sf ./tcltk/xotcl$(VERSION)/libxotcl$(VERSION).so;) @rm -f $(ARCH_DEPENDENT)/libxotcl$(VERSION).so - + # remove misplaced/ inappropriate files rm -f $(ARCH_DEPENDENT)/xotcl$(VERSION)/COPYRIGHT @@ -156,9 +161,9 @@ for f in $(CURDIR)/doc/*.pdf $(CURDIR)/doc/*.html $(CURDIR)/doc/*.css $(CURDIR)/doc/*.gif ; do \ cp $$f $(DOCDIR)/readings/; \ done - + mv $(ARCH_DEPENDENT)/xotcl$(VERSION)/apps $(DOCDIR)/examples - + # remove misplaced/inappropriate files rm -f $(DOCDIR)/examples/COPYRIGHT @@ -190,7 +195,6 @@ $(DOCDIR)/examples/$$f; \ done - # aolserver4-xotcl 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 @@ -226,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 diff -u xotcl-1.6.3/debian/copyright xotcl-1.6.3/debian/copyright --- xotcl-1.6.3/debian/copyright +++ xotcl-1.6.3/debian/copyright @@ -49,5 +49,5 @@ see `/usr/share/common-licenses/BSD'. -The Debian packaging is (C) 2008-2009, Stefan Sobernig +The Debian packaging is (C) Copyright 2008-2009, Stefan Sobernig and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff -u xotcl-1.6.3/debian/compat xotcl-1.6.3/debian/compat --- xotcl-1.6.3/debian/compat +++ xotcl-1.6.3/debian/compat @@ -1 +1 @@ -5 +7 reverted: --- xotcl-1.6.3/debian/source.lintian-overrides +++ xotcl-1.6.3.orig/debian/source.lintian-overrides @@ -1,3 +0,0 @@ -# Lintian reports xotclsh/xowish as "unusual" -# interpreters, otherwise ... -xotcl source: unusual-interpreter diff -u xotcl-1.6.3/debian/control xotcl-1.6.3/debian/control --- xotcl-1.6.3/debian/control +++ xotcl-1.6.3/debian/control @@ -1,19 +1,18 @@ Source: xotcl Section: libs Priority: optional -Maintainer: Ubuntu MOTU Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Tcl/Tk Debian Packagers Uploaders: Stefan Sobernig -Build-Depends: debhelper (>= 5), autotools-dev, tcl-dev (>= 8.4), tk-dev (>= 8.4) -Standards-Version: 3.8.1 +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 -Section: libs 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 @@ -27,8 +26,6 @@ Section: utils Architecture: any Depends: xotcl (= ${binary:Version}), ${shlibs:Depends} -Priority: optional -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 @@ -36,9 +33,7 @@ Package: xotcl-doc Section: doc -Priority: optional 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 @@ -50,16 +45,16 @@ -Priority: optional 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. + Header files and static libraries for libxotcl. You will need this + package in place if you plan to develop using the XOTcl C interface + and/or if you want to create custom builts of XOTcl C extensions. Package: aolserver4-xotcl -Section: web -Priority: optional +Section: httpd Architecture: all Depends: xotcl (>= ${binary:Version}), aolserver4-daemon (>= 4.5.1) -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. + webserver. This module provides and initialises the XOTcl language + extension in the various AOLSERVER runtime environments (e.g., the + embedded Tcl interpreters in AOLSERVER's worker threads). only in patch2: unchanged: --- xotcl-1.6.3.orig/debian/watch +++ xotcl-1.6.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://media.wu-wien.ac.at/download/xotcl-(1\.\d\.\d+).tar.gz \ No newline at end of file