[Pkg-zsh-commits] [zsh] 01/01: Apply wrap-and-sort -a

Axel Beckert abe at deuxchevaux.org
Fri Sep 19 12:18:33 UTC 2014


This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit 21e823822bcde9f2de8ba9755e2e3bf04dfc6239
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Fri Sep 19 14:18:23 2014 +0200

    Apply wrap-and-sort -a
---
 debian/control            | 27 +++++++++++++++++++--------
 debian/zsh-common.install |  2 +-
 debian/zsh-dev.install    | 10 +++++-----
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index fba1b97..018674e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Build-Depends: autotools-dev,
                libpcre3-dev,
                texinfo (>= 5~),
                texlive-fonts-recommended,
-               texlive-latex-recommended,
                texlive-latex-base,
+               texlive-latex-recommended,
                yodl
 Maintainer: Debian Zsh Maintainers <pkg-zsh-devel at lists.alioth.debian.org>
 Uploaders: Michael Prokop <mika at debian.org>,
@@ -31,7 +31,9 @@ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/zsh.git
 
 Package: zsh
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, zsh-common (= ${source:Version})
+Depends: zsh-common (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Suggests: zsh-doc
 Description: shell with lots of features
@@ -64,7 +66,8 @@ Description: architecture independent files for Zsh
 Package: zsh-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, zsh-common (= ${source:Version})
+Depends: zsh-common (= ${source:Version}),
+         ${misc:Depends}
 Description: zsh documentation - info/HTML format
  Zsh is a UNIX command interpreter (shell) usable as an
  interactive login shell and as a shell script command
@@ -78,7 +81,8 @@ Description: zsh documentation - info/HTML format
 
 Package: zsh-static
 Architecture: any
-Depends: zsh, ${misc:Depends}
+Depends: zsh,
+         ${misc:Depends}
 Suggests: zsh-doc
 Built-Using: ${Built-Using}
 Description: shell with lots of features (static link)
@@ -94,7 +98,8 @@ Description: shell with lots of features (static link)
 
 Package: zsh-dev
 Architecture: any
-Depends: ${misc:Depends}, zsh-common (= ${source:Version})
+Depends: zsh-common (= ${source:Version}),
+         ${misc:Depends}
 Section: libdevel
 Description: shell with lots of features (development files)
  Zsh is a UNIX command interpreter (shell) usable as an
@@ -112,7 +117,9 @@ Package: zsh-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: zsh (= ${binary:Version}), ${misc:Depends}, zsh-common (= ${source:Version})
+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
@@ -129,7 +136,9 @@ Package: zsh-beta
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: ${misc:Depends}, zsh (>= 5), zsh-common (= ${source:Version})
+Depends: zsh (>= 5),
+         zsh-common (= ${source:Version}),
+         ${misc:Depends}
 Suggests: zsh-beta-doc
 Description: transitional package to zsh
  The purpose of this package is solely the transition from the zsh-beta
@@ -140,7 +149,9 @@ Package: zsh-beta-doc
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: ${misc:Depends}, zsh-doc, zsh-common (= ${source:Version})
+Depends: zsh-common (= ${source:Version}),
+         zsh-doc,
+         ${misc:Depends}
 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
diff --git a/debian/zsh-common.install b/debian/zsh-common.install
index e5aeb05..21a6750 100644
--- a/debian/zsh-common.install
+++ b/debian/zsh-common.install
@@ -1,6 +1,6 @@
+debian/newuser.zshrc.recommended etc/zsh
 debian/zlogin etc/zsh
 debian/zlogout etc/zsh
 debian/zprofile etc/zsh
 debian/zshenv etc/zsh
 debian/zshrc etc/zsh
-debian/newuser.zshrc.recommended etc/zsh
diff --git a/debian/zsh-dev.install b/debian/zsh-dev.install
index 4e7edf9..8c06071 100644
--- a/debian/zsh-dev.install
+++ b/debian/zsh-dev.install
@@ -1,10 +1,10 @@
-obj/Src/*.epro usr/include/zsh
-obj/Src/sigcount.h usr/include/zsh
+Config/aczshoot.m4 usr/share/aclocal
 Src/hashtable.h usr/include/zsh
+Src/makepro.awk usr/share/zsh-dev
 Src/prototypes.h usr/include/zsh
 Src/signals.h usr/include/zsh
-Src/zsh_system.h usr/include/zsh
 Src/zsh.h usr/include/zsh
+Src/zsh_system.h usr/include/zsh
 Src/ztype.h usr/include/zsh
-Src/makepro.awk usr/share/zsh-dev
-Config/aczshoot.m4 usr/share/aclocal
+obj/Src/*.epro usr/include/zsh
+obj/Src/sigcount.h usr/include/zsh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git



More information about the Pkg-zsh-commits mailing list