[Pkg-tcltk-commits] r1466 - in tclex/trunk/debian: . patches source
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Tue Aug 20 12:36:58 UTC 2013
Author: sgolovan
Date: 2013-08-20 12:36:58 +0000 (Tue, 20 Aug 2013)
New Revision: 1466
Added:
tclex/trunk/debian/docs
tclex/trunk/debian/patches/includes.diff
tclex/trunk/debian/source/
tclex/trunk/debian/source/format
Removed:
tclex/trunk/debian/patches/pkgindex.diff
tclex/trunk/debian/postinst
tclex/trunk/debian/prerm
Modified:
tclex/trunk/debian/changelog
tclex/trunk/debian/compat
tclex/trunk/debian/control
tclex/trunk/debian/dirs
tclex/trunk/debian/doc-base
tclex/trunk/debian/patches/series
tclex/trunk/debian/rules
Log:
[tclex]
* Renamed the binary package to tcl-tclex to match the Debian Tcl/Tk policy.
* Ported to Tcl 8.5 and 8.6.
* Switched to 3.0 (quilt) source package format.
* Bumped debhelper compatibility version to 8.
* Bumped standards version to 3.9.4.
* Put examples into the binary package.
Modified: tclex/trunk/debian/changelog
===================================================================
--- tclex/trunk/debian/changelog 2013-08-19 18:38:47 UTC (rev 1465)
+++ tclex/trunk/debian/changelog 2013-08-20 12:36:58 UTC (rev 1466)
@@ -1,8 +1,13 @@
-tclex (1.2a1-16) UNRELEASED; urgency=low
+tclex (1.2a1-16) unstable; urgency=low
- * NOT RELEASED YET
+ * Renamed the binary package to tcl-tclex to match the Debian Tcl/Tk policy.
+ * Ported to Tcl 8.5 and 8.6.
+ * Switched to 3.0 (quilt) source package format.
+ * Bumped debhelper compatibility version to 8.
+ * Bumped standards version to 3.9.4.
+ * Put examples into the binary package.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 18 Jul 2008 00:59:02 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 20 Aug 2013 16:17:59 +0400
tclex (1.2a1-15) unstable; urgency=low
Modified: tclex/trunk/debian/compat
===================================================================
--- tclex/trunk/debian/compat 2013-08-19 18:38:47 UTC (rev 1465)
+++ tclex/trunk/debian/compat 2013-08-20 12:36:58 UTC (rev 1466)
@@ -1 +1 @@
-5
+8
Modified: tclex/trunk/debian/control
===================================================================
--- tclex/trunk/debian/control 2013-08-19 18:38:47 UTC (rev 1465)
+++ tclex/trunk/debian/control 2013-08-20 12:36:58 UTC (rev 1466)
@@ -1,15 +1,18 @@
Source: tclex
Section: interpreters
Priority: extra
-Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
+Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
Uploaders: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: tcl-dev, debhelper (>= 5.0.0), quilt
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 8.0.0), tcl-dev
+Standards-Version: 3.9.4
-Package: tclex
+Package: tcl-tclex
Architecture: any
-Depends: ${shlibs:Depends}, ${tclsh:Depends}
-Description: A lexical analyzer generator for Tcl
+Depends: ${shlibs:Depends}, ${tcl:Depends}
+Conflicts: tclex
+Replaces: tclex
+Provides: tclex
+Description: Lexical analyzer generator for Tcl
tcLex is a lexer (lexical analyzer) generator extension to Tcl. It is
inspired by Unix and GNU lex and flex, which are "tools for
generating programs that perform pattern-matching on text". tcLex is
Modified: tclex/trunk/debian/dirs
===================================================================
--- tclex/trunk/debian/dirs 2013-08-19 18:38:47 UTC (rev 1465)
+++ tclex/trunk/debian/dirs 2013-08-20 12:36:58 UTC (rev 1466)
@@ -1,2 +1,2 @@
usr/lib/tcltk
-usr/share/doc/tclex/html
+usr/share/doc/tcl-tclex/html
Modified: tclex/trunk/debian/doc-base
===================================================================
--- tclex/trunk/debian/doc-base 2013-08-19 18:38:47 UTC (rev 1465)
+++ tclex/trunk/debian/doc-base 2013-08-20 12:36:58 UTC (rev 1466)
@@ -5,5 +5,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/tclex/html/index.html
-Files: /usr/share/doc/tclex/html/*.html
+Index: /usr/share/doc/tcl-tclex/html/index.html
+Files: /usr/share/doc/tcl-tclex/html/*.html
Added: tclex/trunk/debian/docs
===================================================================
--- tclex/trunk/debian/docs (rev 0)
+++ tclex/trunk/debian/docs 2013-08-20 12:36:58 UTC (rev 1466)
@@ -0,0 +1 @@
+examples
Added: tclex/trunk/debian/patches/includes.diff
===================================================================
--- tclex/trunk/debian/patches/includes.diff (rev 0)
+++ tclex/trunk/debian/patches/includes.diff 2013-08-20 12:36:58 UTC (rev 1466)
@@ -0,0 +1,16 @@
+Author: Sergei Golovan
+Description: Patch adds unix subdirectory with internal Tcl headers into
+ the search path to build tcLex with Tcl 8.5 and newer.
+Last-Modified: Tue, 20 Aug 2013 15:33:03 +0400
+
+--- tclex-1.2a1.orig/src/Makefile.in
++++ tclex-1.2a1/src/Makefile.in
+@@ -35,7 +35,7 @@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_SRC_DIR = @TCL_SRC_DIR@
+
+-INCLUDES = -I$(TCL_SRC_DIR)/generic -I$(TCL_PREFIX)/include
++INCLUDES = -I$(TCL_SRC_DIR)/generic -I$(TCL_SRC_DIR)/unix -I$(TCL_PREFIX)/include
+
+ DLL = $(PROJECT)$(SHLIB_SUFFIX)
+ PROJECTDIR = $(TCL_PREFIX)/lib/$(PROJECT)$(PROJECT_VERSION)
Deleted: tclex/trunk/debian/patches/pkgindex.diff
===================================================================
--- tclex/trunk/debian/patches/pkgindex.diff 2013-08-19 18:38:47 UTC (rev 1465)
+++ tclex/trunk/debian/patches/pkgindex.diff 2013-08-20 12:36:58 UTC (rev 1466)
@@ -1,25 +0,0 @@
-
---- tclex-1.2a1.orig/src/Makefile
-+++ tclex-1.2a1/src/Makefile
-@@ -55,7 +55,8 @@
- (if test -f $(PROJECTDIR)/pkgIndex.tcl; \
- then grep -v $(PROJECT_VERSION) $(PROJECTDIR)/pkgIndex.tcl; \
- else true; fi;) | \
-- echo 'package ifneeded $(PROJECT) $(PROJECT_VERSION) [list load [file join $$dir $(DLL).$(PROJECT_VERSION)] $(PROJECT)]' > pkgIndex.tcl
-+ echo 'if {[package vcompare [info tclversion] 8.5] >= 0} return' > pkgIndex.tcl && \
-+ echo 'package ifneeded $(PROJECT) $(PROJECT_VERSION) [list load [file join $$dir $(DLL).$(PROJECT_VERSION)] $(PROJECT)]' >> pkgIndex.tcl
-
- install: all
- if test ! -d $(PROJECTDIR); then mkdir $(PROJECTDIR); fi
---- tclex-1.2a1.orig/src/Makefile.in
-+++ tclex-1.2a1/src/Makefile.in
-@@ -54,7 +54,8 @@
- (if test -f $(PROJECTDIR)/pkgIndex.tcl; \
- then grep -v $(PROJECT_VERSION) $(PROJECTDIR)/pkgIndex.tcl; \
- else true; fi;) | \
-- echo 'package ifneeded $(PROJECT) $(PROJECT_VERSION) [list load [file join $$dir $(DLL).$(PROJECT_VERSION)] $(PROJECT)]' > pkgIndex.tcl
-+ echo 'if {[package vcompare [info tclversion] 8.5] >= 0} return' > pkgIndex.tcl && \
-+ echo 'package ifneeded $(PROJECT) $(PROJECT_VERSION) [list load [file join $$dir $(DLL).$(PROJECT_VERSION)] $(PROJECT)]' >> pkgIndex.tcl
-
- install: all
- if test ! -d $(PROJECTDIR); then mkdir $(PROJECTDIR); fi
Modified: tclex/trunk/debian/patches/series
===================================================================
--- tclex/trunk/debian/patches/series 2013-08-19 18:38:47 UTC (rev 1465)
+++ tclex/trunk/debian/patches/series 2013-08-20 12:36:58 UTC (rev 1466)
@@ -1,3 +1,3 @@
+includes.diff
types.diff
flags.diff
-pkgindex.diff
Deleted: tclex/trunk/debian/postinst
===================================================================
--- tclex/trunk/debian/postinst 2013-08-19 18:38:47 UTC (rev 1465)
+++ tclex/trunk/debian/postinst 2013-08-20 12:36:58 UTC (rev 1466)
@@ -1,12 +0,0 @@
-#!/bin/sh
-if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a -h /usr/doc/tclex -a -d /usr/share/doc/tclex ]; then
- rm -f /usr/doc/tclex
- fi
-
- if command -v install-docs > /dev/null 2>&1; then
- install-docs -i /usr/share/doc-base/tclex-manual
- fi
-fi
-
-#DEBHELPER#
Deleted: tclex/trunk/debian/prerm
===================================================================
--- tclex/trunk/debian/prerm 2013-08-19 18:38:47 UTC (rev 1465)
+++ tclex/trunk/debian/prerm 2013-08-20 12:36:58 UTC (rev 1466)
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/tclex ]; then
- rm -f /usr/doc/tclex
- if command -v install-docs > /dev/null 2>&1; then
- install-docs -r tclex-manual
- fi
-
-fi
-
-#DEBHELPER#
Modified: tclex/trunk/debian/rules
===================================================================
--- tclex/trunk/debian/rules 2013-08-19 18:38:47 UTC (rev 1465)
+++ tclex/trunk/debian/rules 2013-08-20 12:36:58 UTC (rev 1466)
@@ -1,83 +1,36 @@
#!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
-export QUILT_PATCHES := debian/patches
+PACKAGE=tcl-tclex
+DIR=$(shell pwd)/debian/$(PACKAGE)
-package=tclex
+%:
+ dh $@
-unpatch:
- dh_testdir
- quilt pop -a || test $$? = 2
- rm -rf patch-stamp .pc
+override_dh_auto_configure:
+ dh_auto_configure -Dsrc -- --prefix=/usr
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- quilt push -a || test $$? = 2
- touch patch-stamp
-
-build: build-stamp
-build-stamp: patch-stamp
- dh_testdir
- cd src; \
- chmod +x configure; \
- ./configure --prefix=/usr
+override_dh_auto_build:
$(MAKE) -C src
- touch build-stamp
-clean: clean-patched unpatch
- dh_testdir
- dh_testroot
- dh_clean
-
-clean-patched: patch-stamp
- dh_testdir
- dh_testroot
- rm -f build-stamp
+override_dh_auto_clean:
[ ! -f src/Makefile ] || $(MAKE) -C src distclean
- rm -f src/*.so
- rm -f `find . -name "*~"`
- rm -rf debian/tclex debian/files* core debian/substvars
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) -C src install TCL_PREFIX=../debian/tclex/usr
- mv debian/tclex/usr/lib/tcLex* debian/tclex/usr/lib/tcltk/
+override_dh_auto_install:
+ $(MAKE) -C src install TCL_PREFIX=$(DIR)/usr
+ mv $(DIR)/usr/lib/tcLex* $(DIR)/usr/lib/tcltk/
-binary-indep: build install
-# There are no architecture-independent files to be uploaded
-# generated by this package. If there were any they would be
-# made here.
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs changes.txt
- dh_installdocs README.txt
- dh_installexamples
-# be an irritating wise-a** and change .htm in .html where possible
+override_dh_installdocs:
+ dh_installdocs
+ # be an irritating wise-a** and change .htm in .html where possible
for a in `cd doc/en; ls *.htm`; do \
- cat doc/en/$$a | perl -pe 's/("\w+)\.htm\b/\1.html/g' \
- >debian/tclex/usr/share/doc/$(package)/html/$${a}l; \
+ cat doc/en/$$a | perl -pe 's/("\w+)\.htm\b/\1.html/g' \
+ >$(DIR)/usr/share/doc/$(PACKAGE)/html/$${a}l ; \
done
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
+
+override_dh_gencontrol:
tcltk-depends
dh_gencontrol
- dh_md5sums
- dh_builddeb
-# dpkg --build debian/tclex ..
-binary: binary-indep binary-arch
-
-.PHONY: patch unpatch clean-patched binary binary-arch binary-indep clean
+.PHONY: override_dh_auto_configure override_dh_auto_build \
+ override_dh_auto_clean override_dh_auto_install \
+ override_dh_installexamples override_dh_gencontrol
Added: tclex/trunk/debian/source/format
===================================================================
--- tclex/trunk/debian/source/format (rev 0)
+++ tclex/trunk/debian/source/format 2013-08-20 12:36:58 UTC (rev 1466)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-tcltk-commits
mailing list