[Pkg-zsh-commits] [SCM] Debian zsh package branch, abe/debhelper, updated. debian/5.0.2-1-10-gc2511a1
Axel Beckert
abe at deuxchevaux.org
Fri Dec 28 02:50:05 UTC 2012
The following commit has been merged in the abe/debhelper branch:
commit be35418de37bc7e11721e66286e1194070e05133
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Fri Dec 28 02:38:52 2012 +0100
Split off arch-independent files into zsh-common
diff --git a/debian/control b/debian/control
index 1697e9a..25004ff 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/zsh.git
Package: zsh
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, zsh-common
Recommends: ${shlibs:Recommends}
Suggests: zsh-doc
Description: shell with lots of features
@@ -38,6 +38,23 @@ Description: shell with lots of features
shell functions (with autoloading), a history mechanism, and a
host of other features.
+Package: zsh-common
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: zsh
+Suggests: zsh-doc
+Description: architecture independent files for Zsh
+ Zsh is a UNIX command interpreter (shell) usable as an
+ interactive login shell and as a shell script command
+ processor. Of the standard shells, zsh most closely resembles
+ ksh but includes many enhancements. Zsh has command-line editing,
+ built-in spelling correction, programmable command completion,
+ shell functions (with autoloading), a history mechanism, and a
+ host of other features.
+ .
+ This package contains the common zsh files shared by all
+ architectures.
+
Package: zsh-doc
Architecture: all
Section: doc
@@ -88,7 +105,7 @@ Package: zsh-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: zsh (= ${binary:Version}), ${misc:Depends}
+Depends: zsh (= ${binary:Version}), zsh-common (= ${source:Version}), ${misc:Depends}
Description: shell with lots of features (debugging symbols)
Zsh is a UNIX command interpreter (shell) usable as an
interactive login shell and as a shell script command
diff --git a/debian/rules b/debian/rules
index 826af0f..4a26e27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,65 +135,65 @@ endif
binary-arch-dynamic: checkroot build
dh_testdir
- dh_installdirs -p$(package) -p$(package)-dbg
+ dh_installdirs -p$(package) -p$(package)-common -p$(package)-dbg
- cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/zsh
+ cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/zsh-common
nroff -mandoc -Tascii Doc/zshbuiltins.1 | colcrt - | \
- sed -e 's/±/{+|-}/' | ( cd debian/zsh/usr/share/$(package)/help && \
+ sed -e 's/±/{+|-}/' | ( cd debian/zsh-common/usr/share/$(package)/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/zsh/usr/share/man/man1/*.1
+ debian/zsh-common/usr/share/man/man1/*.1
endif
# functions
- dh_installexamples -p$(package) -X.distfiles
- cd debian/zsh/usr/share/doc/$(package)/examples/; mv Example Functions
+ dh_installexamples -p$(package)-common -X.distfiles
+ cd debian/zsh-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/zsh/usr/share/doc/$(package)/examples/Misc/*
+ debian/zsh-common/usr/share/doc/$(package)-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/zsh
+ cd obj && $(MAKE) install.fns DESTDIR=$(CURDIR)/debian/zsh-common
- rm -r debian/zsh/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/zsh/'`cat obj/Src/zshpaths.temp`'; do zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; chmod 644 $$i.zwc ; done'
+ debian/zsh/bin/$(package) -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'
ifneq (zsh-beta,$(package))
mv debian/zsh/bin/zsh debian/zsh/bin/zsh5
rm debian/zsh/bin/zsh-5.[0-9]*
- dh_link -p$(package)
dh_strip -p$(package) --dbg-package=$(package)-dbg
endif
- dh_link -p$(package)-dbg
- dh_install -p$(package) -p$(package)-dbg
+ 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/zsh/usr/share/$(package)/functions/Misc/run-help
- sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/$(package):;s#/usr/local/bin#/usr/bin#;' `find debian/zsh/usr/share/$(package)/functions -type f`
- chmod 755 debian/zsh/usr/share/$(package)/functions/Misc/checkmail \
- debian/zsh/usr/share/$(package)/functions/Misc/harden \
- debian/zsh/usr/share/$(package)/functions/Misc/run-help \
- debian/zsh/usr/share/$(package)/functions/Misc/zkbd \
- debian/zsh/usr/share/$(package)/functions/Misc/zcalc \
+ sed -i -e 's,^local HELPDIR=.*,local HELPDIR=$${HELPDIR:-/usr/share/$(package)/help},;s,:-more,:-/usr/bin/pager,;' debian/zsh-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/zsh-common/usr/share/$(package)/functions -type f`
+ chmod 755 debian/zsh-common/usr/share/$(package)/functions/Misc/checkmail \
+ debian/zsh-common/usr/share/$(package)/functions/Misc/harden \
+ debian/zsh-common/usr/share/$(package)/functions/Misc/run-help \
+ debian/zsh-common/usr/share/$(package)/functions/Misc/zkbd \
+ debian/zsh-common/usr/share/$(package)/functions/Misc/zcalc \
- dh_installmenu -p$(package)
+ dh_installmenu -p$(package)-common
dh_shlibdeps -p$(package) -p$(package)-dbg -- -dDepends debian/zsh/bin/* -dRecommends debian/zsh/usr/lib/$(package)/*/zsh/*.so
- dh_installdocs -p$(package) -p$(package)-dbg
- dh_installchangelogs -p$(package) -p$(package)-dbg ChangeLog
- dh_compress -p$(package) -p$(package)-dbg
- dh_fixperms -p$(package) -p$(package)-dbg
- dh_installdeb -p$(package) -p$(package)-dbg
- dh_md5sums -p$(package) -p$(package)-dbg
- dh_gencontrol -p$(package) -p$(package)-dbg
- dh_builddeb -p$(package) -p$(package)-dbg
+ dh_installdocs -p$(package)-common -p$(package)-dbg
+ dh_installchangelogs -p$(package)-common -p$(package)-dbg 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 -p$(package)-dbg
binary-arch-static: checkroot build-static
dh_testdir
diff --git a/debian/zsh.dirs b/debian/zsh-common.dirs
similarity index 77%
copy from debian/zsh.dirs
copy to debian/zsh-common.dirs
index 24be485..d37728b 100644
--- a/debian/zsh.dirs
+++ b/debian/zsh-common.dirs
@@ -1,6 +1,4 @@
etc/zsh
-bin
-usr/lib/zsh
usr/share/menu
usr/share/man
usr/share/zsh/help
diff --git a/debian/zsh.docs b/debian/zsh-common.docs
similarity index 100%
rename from debian/zsh.docs
rename to debian/zsh-common.docs
diff --git a/debian/zsh.examples b/debian/zsh-common.examples
similarity index 100%
rename from debian/zsh.examples
rename to debian/zsh-common.examples
diff --git a/debian/zsh.install b/debian/zsh-common.install
similarity index 100%
rename from debian/zsh.install
rename to debian/zsh-common.install
diff --git a/debian/zsh.links b/debian/zsh-common.links
similarity index 100%
copy from debian/zsh.links
copy to debian/zsh-common.links
diff --git a/debian/zsh-common.lintian-overrides b/debian/zsh-common.lintian-overrides
new file mode 100644
index 0000000..4175bf0
--- /dev/null
+++ b/debian/zsh-common.lintian-overrides
@@ -0,0 +1,2 @@
+zsh-common: menu-command-not-in-package usr/share/menu/zsh-common:1 bin/zsh5
+zsh-common: pkg-not-in-package-test zsh usr/share/menu/zsh-common
diff --git a/debian/menu b/debian/zsh-common.menu
similarity index 100%
rename from debian/menu
rename to debian/zsh-common.menu
diff --git a/debian/zsh-common.postinst b/debian/zsh-common.postinst
new file mode 100644
index 0000000..2845407
--- /dev/null
+++ b/debian/zsh-common.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if test -x /usr/bin/update-menus ; then update-menus ; fi
+
+mkdir -m2775 -p /usr/local/share/zsh/site-functions && chown root:staff \
+ /usr/local/share/zsh/site-functions || true
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/zsh-common.postrm b/debian/zsh-common.postrm
new file mode 100644
index 0000000..ff0f98c
--- /dev/null
+++ b/debian/zsh-common.postrm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+if test -x /usr/bin/update-menus ; then update-menus ; fi
+
+#DEBHELPER#
diff --git a/debian/zsh-dbg.links b/debian/zsh-dbg.links
index 35fe079..9900cfa 100644
--- a/debian/zsh-dbg.links
+++ b/debian/zsh-dbg.links
@@ -1 +1 @@
-/usr/share/doc/zsh /usr/share/doc/zsh-dbg
\ No newline at end of file
+/usr/share/doc/zsh-common /usr/share/doc/zsh-dbg
diff --git a/debian/zsh-static.lintian-overrides b/debian/zsh-static.lintian-overrides
index 482cad4..21a0ecb 100644
--- a/debian/zsh-static.lintian-overrides
+++ b/debian/zsh-static.lintian-overrides
@@ -1,2 +1,3 @@
zsh-static: embedded-library bin/zsh5-static: libm
zsh-static: embedded-library bin/zsh5-static: ncurses
+zsh-static: package-contains-broken-symlink usr/share/man/man1/zsh5-static.1.gz zsh.1.gz
diff --git a/debian/zsh.dirs b/debian/zsh.dirs
index 24be485..05607ec 100644
--- a/debian/zsh.dirs
+++ b/debian/zsh.dirs
@@ -1,6 +1,2 @@
-etc/zsh
bin
usr/lib/zsh
-usr/share/menu
-usr/share/man
-usr/share/zsh/help
diff --git a/debian/zsh.links b/debian/zsh.links
index b695f6f..850eba7 100644
--- a/debian/zsh.links
+++ b/debian/zsh.links
@@ -1 +1 @@
-/usr/share/man/man1/zsh.1.gz /usr/share/man/man1/zsh5.1.gz
+/usr/share/doc/zsh-common /usr/share/doc/zsh
\ No newline at end of file
diff --git a/debian/zsh.postinst b/debian/zsh.postinst
index b639d9f..c9be2eb 100644
--- a/debian/zsh.postinst
+++ b/debian/zsh.postinst
@@ -18,8 +18,6 @@ case "$1" in
;;
esac
-if test -x /usr/bin/update-menus ; then update-menus ; fi
-
update-alternatives --remove zsh /usr/bin/zsh
update-alternatives --remove ksh /usr/bin/zsh
update-alternatives --remove ksh /bin/zsh4
@@ -28,9 +26,6 @@ update-alternatives --install /bin/zsh zsh /bin/zsh5 50 \
update-alternatives --install /bin/rzsh rzsh /bin/zsh5 50 \
--slave /usr/share/man/man1/rzsh.1.gz rzsh.1.gz /usr/share/man/man1/zsh.1.gz
-mkdir -m2775 -p /usr/local/share/zsh/site-functions && chown root:staff \
- /usr/local/share/zsh/site-functions || true
-
#DEBHELPER#
exit 0
diff --git a/debian/zsh.postrm b/debian/zsh.postrm
index 2660ddb..a8921f6 100644
--- a/debian/zsh.postrm
+++ b/debian/zsh.postrm
@@ -2,8 +2,6 @@
set -e
-if test -x /usr/bin/update-menus ; then update-menus ; fi
-
case "$1" in
(remove)
remove-shell /bin/zsh
--
Debian zsh package
More information about the Pkg-zsh-commits
mailing list