[Pkg-zsh-commits] [SCM] Debian zsh package branch, abe/no-beta, updated. debian/5.0.2-2-42-g4df2090
Axel Beckert
abe at deuxchevaux.org
Sun May 5 15:19:21 UTC 2013
The following commit has been merged in the abe/no-beta branch:
commit 60073562b5d8150cb320b726bb5385e40f34a4e1
Merge: d87b0050a30d2e7c646a10dd9f06a065415d35fb b16380fa3c230f7d223344f45ce201cf5070a0e7
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sun May 5 16:17:38 2013 +0200
Merge branch 'abe/no-beta' into debian
Conflicts:
debian/rules
diff --combined debian/control
index f614197,f484b1e..2ef98f4
--- a/debian/control
+++ b/debian/control
@@@ -2,7 -2,7 +2,7 @@@ Source: zs
Section: shells
Priority: optional
Build-Depends: bsdmainutils,
- debhelper (>= 7~),
+ debhelper (>= 9~),
dh-autoreconf,
dpkg-dev (>= 1.16.1~),
ghostscript,
@@@ -112,7 -112,7 +112,7 @@@ Package: zsh-db
Architecture: any
Section: debug
Priority: extra
-Depends: zsh (= ${binary:Version}), zsh-common (= ${source:Version}), ${misc:Depends}
+Depends: zsh (= ${binary:Version}), ${misc:Depends}
Pre-Depends: dpkg (>= 1.15.6~)
Description: shell with lots of features (debugging symbols)
Zsh is a UNIX command interpreter (shell) usable as an
@@@ -125,3 -125,24 +125,24 @@@
.
This package contains gdb debugging symbols for the 'zsh'
package.
+
+ Package: zsh-beta
+ Architecture: all
+ Section: oldlibs
+ Priority: extra
+ Depends: ${misc:Depends}, zsh
+ Suggests: zsh-beta-doc
+ Description: transitional package to zsh
+ The purpose of this package is solely the transition from the zsh-beta
+ package to the zsh package. It can be safely removed if no more user
+ has zsh-beta as login shell.
+
+ Package: zsh-beta-doc
+ Architecture: all
+ Section: oldlibs
+ Priority: extra
+ Depends: ${misc:Depends}, zsh-doc
+ Description: transitional package to zsh-doc
+ The purpose of this package is solely the transition from the
+ zsh-beta-doc package to the zsh-doc package. It can be safely
+ removed.
diff --combined debian/rules
index 79eaeae,1154ac5..b99da28
--- a/debian/rules
+++ b/debian/rules
@@@ -2,36 -2,24 +2,24 @@@
INSTALL = install
INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
- package=zsh
- ifeq (zsh-beta,$(package))
- snapshot_date := $(shell dpkg-parsechangelog | sed -n '/^Version: [0-9.][0-9.]*.*+20[0-9][0-9]\([0-9][0-9][0-9][0-9]\)-[0-9][0-9]*$$/ {s//\1/;p}')
- endif
-
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
H_LDFLAGS = $(LDFLAGS)
CFLAGS += -Wall -g
- ifeq (zsh-beta,$(package))
- CFLAGS += -W
- endif
CONFIGFLAGS = --prefix=/usr
CONFIGFLAGS += --mandir=/usr/share/man
CONFIGFLAGS += --bindir=/bin
CONFIGFLAGS += LDFLAGS="-Wl,--as-needed -g $(H_LDFLAGS)"
CONFIGFLAGS += --infodir=/usr/share/info
CONFIGFLAGS += --enable-maildir-support
CONFIGFLAGS += --enable-max-jobtable-size=256
- CONFIGFLAGS += --enable-etcdir=/etc/$(package)
+ CONFIGFLAGS += --enable-etcdir=/etc/zsh
CONFIGFLAGS += --enable-function-subdirs
- CONFIGFLAGS += --enable-site-fndir=/usr/local/share/$(package)/site-functions
- CONFIGFLAGS += --enable-fndir=/usr/share/$(package)/functions
+ CONFIGFLAGS += --enable-site-fndir=/usr/local/share/zsh/site-functions
+ CONFIGFLAGS += --enable-fndir=/usr/share/zsh/functions
CONFIGFLAGS += --with-tcsetpgrp
CONFIGFLAGS += --with-term-lib="ncursesw tinfo"
CONFIGFLAGS += --enable-cap --enable-pcre
@@@ -41,9 -29,7 +29,7 @@@ CONFIGFLAGS += --enable-additional-fpat
STATICFLAGS = --disable-dynamic
STATICFLAGS += --enable-ldflags=-static
- ifneq (zsh-beta,$(package))
STATICFLAGS += --disable-dynamic-nss
- endif
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CONFIGFLAGS += --enable-zsh-debug
@@@ -54,21 -40,14 +40,14 @@@ CONFIGFLAGS += --enable-zsh-hash-debu
endif
build: build-arch build-indep
- build-stamp: configure-stamp
- dh_testdir
- ifeq (zsh-beta,$(package))
- touch stamp-h.in
- endif
- build-arch: build-stamp
+ build-arch: configure-stamp
dh_auto_build -B obj --parallel
HOME="$(CURDIR)/obj/testhome" dh_auto_test -B obj --parallel
touch $@
- build-indep: build-stamp
- ifeq (zsh,$(package))
+ build-indep: configure-stamp
dh_auto_build -B obj --parallel -- pdf
- endif
touch $@
build-static: configure-static-stamp
@@@ -87,10 -66,6 +66,6 @@@ configure-stamp: configur
dh_testdir
chmod 755 configure
mkdir -p obj/testhome
- ifeq (zsh-beta,$(package))
- test -f Config/version.mk.orig || cp Config/version.mk Config/version.mk.orig
- sed -i -e 's/^VERSION=\([^+]*\)$$/VERSION=\1-cvs$(snapshot_date)/' Config/version.mk
- endif
dh_auto_configure -B obj -- $(CONFIGFLAGS)
touch $@
@@@ -99,167 -74,151 +74,152 @@@ configure-static-stamp: configur
mkdir obj-static
dh_auto_configure -B obj-static -- $(CONFIGFLAGS) $(STATICFLAGS)
# cp debian/static.conf obj-static/Src/mymods.conf
- sed -i -e 's/files.mdd link=no/files.mdd link=static/;s/stat.mdd link=no/stat.mdd link=static/' obj-static/config.modules
+ sed -i -e 's/files.mdd link=no/files.mdd link=static/;s/stat.mdd link=no/stat.mdd link=static/' \
+ obj-static/config.modules
touch $@
clean:
dh_testdir
dh_autoreconf_clean
rm -f build build-static
dh_auto_clean -B obj --parallel
dh_auto_clean -B obj-static --parallel
- ifneq (zsh-beta,$(package))
dh_auto_clean --parallel
- endif
dh_clean
rm -rf config.cache obj obj-static autom4te.cache
binary-indep: build-indep
dh_testdir
dh_testroot
- dh_installdocs -p$(package)-doc --link-doc=zsh-common
- dh_installdirs -p$(package)-doc
++ dh_installdocs -pzsh-doc --link-doc=zsh-common
+ dh_installdirs -pzsh-doc
cd obj && $(MAKE) install.info DESTDIR=$(CURDIR)/debian/zsh-doc
rm -f debian/zsh-doc/usr/share/info/dir*
- cd obj && $(MAKE) install.html DESTDIR=$(CURDIR)/debian/zsh-doc htmldir=/usr/share/doc/$(package)-doc/html
+ cd obj && $(MAKE) install.html DESTDIR=$(CURDIR)/debian/zsh-doc htmldir=/usr/share/doc/zsh-doc/html
# Work around texi2html unfriendliness
- sed -i -e 's/<BODY.*>/<BODY LANG="EN">/' debian/zsh-doc/usr/share/doc/$(package)-doc/html/*.html
-
- dh_installchangelogs -p$(package)-doc
- dh_compress -p$(package)-doc -Xpdf
- dh_fixperms -p$(package)-doc
- dh_installdeb -p$(package)-doc
- dh_md5sums -p$(package)-doc
- dh_gencontrol -p$(package)-doc
- dh_builddeb -p$(package)-doc -- -Zxz
+ sed -i -e 's/<BODY.*>/<BODY LANG="EN">/' debian/zsh-doc/usr/share/doc/zsh-doc/html/*.html
+
- dh_installdocs -pzsh-doc
+ dh_installchangelogs -pzsh-doc
+ dh_link -pzsh-beta -pzsh-beta-doc
+ dh_compress -pzsh-doc -pzsh-beta -pzsh-beta-doc -Xpdf
+ dh_fixperms -pzsh-doc -pzsh-beta -pzsh-beta-doc
+ dh_installdeb -pzsh-doc -pzsh-beta -pzsh-beta-doc
+ dh_md5sums -pzsh-doc -pzsh-beta -pzsh-beta-doc
+ dh_gencontrol -pzsh-doc -pzsh-beta -pzsh-beta-doc
+ dh_builddeb -pzsh-beta -pzsh-beta-doc
+ dh_builddeb -pzsh-doc -- -Zxz
- ifneq (zsh-beta,$(package))
binary-arch: binary-arch-dynamic binary-arch-static binary-arch-dev
- else
- binary-arch: binary-arch-dynamic
- endif
binary-arch-dynamic: build-arch
dh_testdir
dh_testroot
- dh_installdirs -p$(package) -p$(package)-common -p$(package)-dbg
+ dh_installdirs -pzsh -pzsh-common -pzsh-dbg
- cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/$(package)-common
+ cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/zsh-common
nroff -mandoc -Tascii Doc/zshbuiltins.1 | colcrt - | \
- sed -e 's/±/{+|-}/' | ( cd debian/$(package)-common/usr/share/$(package)/help && \
+ sed -e 's/±/{+|-}/' | ( cd debian/zsh-common/usr/share/zsh/help && \
perl $(CURDIR)/Util/helpfiles )
- ifeq (zsh-beta,$(package))
- sed -r -i -e \
- 's/zsh(all|builtins|compctl|compsys|compwid|contrib|expn|misc|modules|options|param|roadmap|tcpsys|zftpsys|zle|calsys)/$(package)\1/g' \
- debian/$(package)-common/usr/share/man/man1/*.1
- endif
-
# functions
- dh_installexamples -p$(package)-common -X.distfiles
- cd debian/$(package)-common/usr/share/doc/$(package)-common/examples/; mv Example Functions
- sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/$(package):;s#/usr/local/bin#/usr/bin#' \
- debian/$(package)-common/usr/share/doc/$(package)-common/examples/Misc/*
+ dh_installexamples -pzsh-common -X.distfiles
+ cd debian/zsh-common/usr/share/doc/zsh-common/examples/; mv Example Functions
+ sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/zsh:;s#/usr/local/bin#/usr/bin#' \
+ debian/zsh-common/usr/share/doc/zsh-common/examples/Misc/*
- cd obj && $(MAKE) install.bin DESTDIR=$(CURDIR)/debian/$(package) INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
- cd obj && $(MAKE) install.modules DESTDIR=$(CURDIR)/debian/$(package) INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
- cd obj && $(MAKE) install.fns DESTDIR=$(CURDIR)/debian/$(package)-common
+ cd obj && $(MAKE) install.bin DESTDIR=$(CURDIR)/debian/zsh INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
+ cd obj && $(MAKE) install.modules DESTDIR=$(CURDIR)/debian/zsh INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
+ cd obj && $(MAKE) install.fns DESTDIR=$(CURDIR)/debian/zsh-common
- rm -r debian/$(package)-common/usr/local
+ rm -r debian/zsh-common/usr/local
# move this to a non-root section; also drop it for cross-compiles
- awk '/^#define FPATH_DIR/ { head=$$3; gsub(/"/,"",head); }; /^#define FPATH_SUBDIRS/ { $$1=""; $$2=""; gsub(/[" ]/,""); tail=$$0; } END { printf "%s/%s\n", head, tail; };' obj/Src/zshpaths.h >obj/Src/zshpaths.temp
- debian/zsh/bin/$(package) -fc 'setopt extendedglob; for i in debian/$(package)-common/'`cat obj/Src/zshpaths.temp`'; do zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; chmod 644 $$i.zwc ; done'
+ awk '/^#define FPATH_DIR/ { head=$$3; gsub(/"/,"",head); }; \
+ /^#define FPATH_SUBDIRS/ { $$1=""; $$2=""; gsub(/[" ]/,""); tail=$$0; } \
+ END { printf "%s/%s\n", head, tail; };' \
+ obj/Src/zshpaths.h >obj/Src/zshpaths.temp
+ debian/zsh/bin/zsh -fc \
+ 'setopt extendedglob; \
+ for i in debian/zsh-common/'`cat obj/Src/zshpaths.temp`'; do \
+ zcompile -U -M $$i.zwc $$i/*~*.zwc(^/); \
+ chmod 644 $$i.zwc; \
+ done'
mv debian/zsh/bin/zsh debian/zsh/bin/zsh5
rm debian/zsh/bin/zsh-5.[0-9]*
- dh_strip -p$(package) --dbg-package=$(package)-dbg
- endif
-
- dh_link -p$(package) -p$(package)-common -p$(package)-dbg
- dh_install -p$(package) -p$(package)-common -p$(package)-dbg
-
- sed -i -e 's,^local HELPDIR=.*,local HELPDIR=$${HELPDIR:-/usr/share/$(package)/help},;s,:-more,:-/usr/bin/pager,;' debian/$(package)-common/usr/share/$(package)/functions/Misc/run-help
- sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/$(package):;s#/usr/local/bin#/usr/bin#;' `find debian/$(package)-common/usr/share/$(package)/functions -type f`
- chmod 755 debian/$(package)-common/usr/share/$(package)/functions/Misc/checkmail \
- debian/$(package)-common/usr/share/$(package)/functions/Misc/harden \
- debian/$(package)-common/usr/share/$(package)/functions/Misc/run-help \
- debian/$(package)-common/usr/share/$(package)/functions/Misc/zkbd \
- debian/$(package)-common/usr/share/$(package)/functions/Misc/zcalc
-
- dh_shlibdeps -p$(package) -p$(package)-dbg -- \
- -dDepends debian/zsh/bin/* \
- -dRecommends debian/zsh/usr/lib/$(package)/*/zsh/*.so
- dh_installmenu -p$(package)-common
- dh_installdocs -p$(package) -p$(package)-common -p$(package)-dbg --link-doc=zsh-common
- dh_installchangelogs -p$(package)-common ChangeLog
- dh_lintian -p$(package) -p$(package)-common -p$(package)-dbg
- dh_compress -p$(package) -p$(package)-common -p$(package)-dbg
- dh_fixperms -p$(package) -p$(package)-common -p$(package)-dbg
- dh_installdeb -p$(package) -p$(package)-common -p$(package)-dbg
- dh_md5sums -p$(package) -p$(package)-common -p$(package)-dbg
- dh_gencontrol -p$(package) -p$(package)-common -p$(package)-dbg
- dh_builddeb -p$(package) -p$(package)-common -- -Zxz
- dh_builddeb -p$(package)-dbg
+ dh_strip -pzsh --dbg-package=zsh-dbg
+ dh_link -pzsh -pzsh-common -pzsh-dbg
+ dh_install -pzsh -pzsh-common -pzsh-dbg
+
+ sed -i -e 's,^local HELPDIR=.*,local HELPDIR=$${HELPDIR:-/usr/share/zsh/help},; s,:-more,:-/usr/bin/pager,;' \
+ debian/zsh-common/usr/share/zsh/functions/Misc/run-help
+ sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/zsh:;s#/usr/local/bin#/usr/bin#;' \
+ `find debian/zsh-common/usr/share/zsh/functions -type f`
+ chmod 755 debian/zsh-common/usr/share/zsh/functions/Misc/checkmail \
+ debian/zsh-common/usr/share/zsh/functions/Misc/harden \
+ debian/zsh-common/usr/share/zsh/functions/Misc/run-help \
+ debian/zsh-common/usr/share/zsh/functions/Misc/zkbd \
+ debian/zsh-common/usr/share/zsh/functions/Misc/zcalc
+
+ dh_shlibdeps -pzsh -pzsh-dbg -- \
+ -dDepends debian/zsh/bin/* \
+ -dRecommends debian/zsh/usr/lib/zsh/*/zsh/*.so
++
+ dh_installmenu -pzsh-common
- dh_installdocs -pzsh-common -pzsh-dbg
++ dh_installdocs -pzsh -pzsh-common -pzsh-dbg --link-doc=zsh-common
+ dh_installchangelogs -pzsh-common -pzsh-dbg ChangeLog
+ dh_lintian -pzsh -pzsh-common -pzsh-dbg
+ dh_compress -pzsh -pzsh-common -pzsh-dbg
+ dh_fixperms -pzsh -pzsh-common -pzsh-dbg
+ dh_installdeb -pzsh -pzsh-common -pzsh-dbg
+ dh_md5sums -pzsh -pzsh-common -pzsh-dbg
+ dh_gencontrol -pzsh -pzsh-common -pzsh-dbg
- dh_builddeb -pzsh -pzsh-common -pzsh-dbg -- -Zxz
++ dh_builddeb -pzsh -pzsh-common -- -Zxz
++ dh_builddeb -pzsh-dbg
binary-arch-static: build-static
dh_testdir
dh_testroot
- dh_installdirs -p$(package)-static
- dh_lintian -p$(package)-static
+ dh_installdirs -pzsh-static
+ dh_lintian -pzsh-static
+ # Do not symlink /usr/share/doc/zsh-static to
+ # /usr/share/doc/zsh-common because zsh-static has a uniqe,
+ # generated README.Debian
- dh_installdocs -p$(package)-static
- awk 'BEGIN { print "The following modules are statically-compiled into the static $(package) binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/zsh-static/usr/share/doc/$(package)-static/README.Debian
-
- dh_install -p$(package)-static
- mv debian/$(package)-static/bin/zsh debian/$(package)-static/bin/zsh5-static
++ dh_installdocs -pzsh-static
+ awk 'BEGIN { print "The following modules are statically-compiled into the static zsh binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/zsh-static/usr/share/doc/zsh-static/README.Debian
- ifneq (zsh-beta,$(package))
- dh_shlibdeps -p$(package)-static
- endif
-
- dh_strip -p$(package)-static
- dh_link -p$(package)-static
- dh_installchangelogs -p$(package)-static
- dh_compress -p$(package)-static
- dh_fixperms -p$(package)-static
- dh_installdeb -p$(package)-static
- dh_md5sums -p$(package)-static
- dh_gencontrol -p$(package)-static
- dh_builddeb -p$(package)-static -- -Zxz
+ dh_install -pzsh-static
+ mv debian/zsh-static/bin/zsh debian/zsh-static/bin/zsh5-static
- dh_shlibdeps -pzsh-static
- dh_strip -pzsh-static
- dh_link -pzsh-static
- dh_installdocs -pzsh-static
+ dh_installchangelogs -pzsh-static
+ dh_compress -pzsh-static
+ dh_fixperms -pzsh-static
+ dh_installdeb -pzsh-static
+ dh_md5sums -pzsh-static
+ dh_gencontrol -pzsh-static
- dh_builddeb -pzsh-static
-
++ dh_builddeb -pzsh-static -- -Zxz
binary-arch-dev: build-arch
dh_testdir
dh_testroot
- dh_installdirs -p$(package)-dev
- dh_install -p$(package)-dev
- cd debian/$(package)-dev/usr/share/aclocal; mv aczshoot.m4 zshoot.m4
- dh_installdocs -p$(package)-dev --link-doc=zsh-common
- dh_installchangelogs -p$(package)-dev
- dh_compress -p$(package)-dev
- dh_fixperms -p$(package)-dev
- dh_installdeb -p$(package)-dev
- dh_md5sums -p$(package)-dev
- dh_gencontrol -p$(package)-dev
- dh_builddeb -p$(package)-dev
-
- ifneq (zsh-beta,$(package))
- binary: binary-indep binary-arch binary-arch-static binary-arch-dev
- else
- binary: binary-indep binary-arch
- endif
+ dh_installdirs -pzsh-dev
+ dh_install -pzsh-dev
+ cd debian/zsh-dev/usr/share/aclocal; mv aczshoot.m4 zshoot.m4
- dh_installdocs -pzsh-dev
++ dh_installdocs -pzsh-dev --link-doc=zsh-common
+ dh_installchangelogs -pzsh-dev
+ dh_compress -pzsh-dev
+ dh_fixperms -pzsh-dev
+ dh_installdeb -pzsh-dev
+ dh_md5sums -pzsh-dev
+ dh_gencontrol -pzsh-dev
+ dh_builddeb -pzsh-dev
+
-binary: binary-indep binary-arch
++binary: binary-indep binary-arch binary-arch-static binary-arch-dev
prebuild:
Util/preconfig
--
Debian zsh package
More information about the Pkg-zsh-commits
mailing list