[Pkg-sysvinit-devel] Bug#774179: sysvinit: wrap-and-sort debian/control
mdt
mdt at cryptolab.net
Mon Dec 29 22:56:34 UTC 2014
Package: sysvinit
Severity: wishlist
Tags: patch
Hi,
these patchs are only cosmetics changes, but make control file ordered.
Feel free to adjust whatever thing to improve the patches.
For the second patch i've used: wrap-and-sort --verbose -f debian/control --max-line-length=5
Thanks for considering.
*** /home/mdt/sysvinit-exp/debian/0001-Preparing-to-run-wrap-and-sort-from-devscripts.patch
>From 3b36d0f98c35dbddb3a92823daeb1b1fd7a2bd63 Mon Sep 17 00:00:00 2001
From: mdt <mdt at cryptolab.net>
Date: Mon, 29 Dec 2014 20:26:54 +0100
Subject: [PATCH 1/2] Preparing to run wrap-and-sort from devscripts. So,
removing all commented line to let wrap-and-sort work properly.
---
debian/control | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/debian/control b/debian/control
index b15586e..ca546f1 100644
--- a/debian/control
+++ b/debian/control
@@ -43,9 +43,7 @@ Depends: initscripts (>= 2.88dsf-13.3),
sysvinit-utils (>= 2.86.ds1-66),
${shlibs:Depends},
${misc:Depends},
-# For ischroot
debianutils (>= 4),
-# Required for TERM=xterm switch (see #605777)
kbdcontrol (>= 8.2+ds2-6) [kfreebsd-any]
Conflicts: systemd-sysv, upstart
Replaces: sysvinit (<< 2.88dsf-44~), systemd-sysv, upstart
@@ -105,12 +103,8 @@ Conflicts:
libdevmapper1.02.1 (<< 2:1.02.24-1),
Replaces: libc6, libc6.1, libc0.1, libc0.3
Breaks:
-# Needed for ifquery
ifupdown (<< 0.7.46),
-# Needed to ensure migration of UTC setting before /etc/default/rcS is updated.
util-linux (<< 2.20.1-5),
-# Packages using /lib/init/rw which must transition to /run.
-# These breaks may be removed after wheezy is released.
aide (<< 0.15.1-5),
atm-tools (<< 1:2.5.1-1.3),
console-common (<< 0.7.86),
@@ -134,16 +128,10 @@ Breaks:
wpasupplicant (<< 0.7.3-4),
xymon (<< 4.3.0~beta2.dfsg-9),
selinux-policy-default (<= 2:0.2.20100524-9),
-# Packages relying on a writable /etc/mtab which need fixing
-# before they can work with /proc/mounts and utab with libmount.
libpam-mount (<< 2.13-1),
autofs (<< 5.0.0),
-# Older versions of initramfs-tools can't cope with /etc/mtab
-# being a symlink #668616 and #668650
initramfs-tools (<< 0.104),
-# Needed for transition to dependency-based boot for wheezy
bootchart (<< 0.10~svn407-4),
-# Older versions of hurd do not implement the neccessary functionality
hurd (<< 0.5.git20131101~)
Description: scripts for initializing and shutting down the system
The scripts in this package initialize a standard Debian
--
2.1.1
*** /home/mdt/sysvinit-exp/debian/0002-wrap-and-sort.patch
>From be596baee731eb5ed77d236fb4c0d34934b73aed Mon Sep 17 00:00:00 2001
From: mdt <mdt at cryptolab.net>
Date: Mon, 29 Dec 2014 20:49:02 +0100
Subject: [PATCH 2/2] wrap-and-sort
---
debian/control | 167 +++++++++++++++++++++++++++++++--------------------------
1 file changed, 91 insertions(+), 76 deletions(-)
diff --git a/debian/control b/debian/control
index ca546f1..d9adfe7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,16 @@ Source: sysvinit
Section: admin
Priority: required
Maintainer: Debian sysvinit maintainers <pkg-sysvinit-devel at lists.alioth.debian.org>
-Uploaders:
- Petter Reinholdtsen <pere at debian.org>,
- Henrique de Moraes Holschuh <hmh at debian.org>,
- Kel Modderman <kel at otaku42.de>,
- Roger Leigh <rleigh at debian.org>,
- Thomas Goirand <zigo at debian.org>
-Build-Depends:
- debhelper (>= 9.20120410),
- po-debconf,
- quilt (>= 0.40),
- libselinux1-dev (>= 1.14) [linux-any],
- libsepol1-dev [linux-any]
+Uploaders: Petter Reinholdtsen <pere at debian.org>,
+ Henrique de Moraes Holschuh <hmh at debian.org>,
+ Kel Modderman <kel at otaku42.de>,
+ Roger Leigh <rleigh at debian.org>,
+ Thomas Goirand <zigo at debian.org>
+Build-Depends: debhelper (>= 9.20120410),
+ libselinux1-dev (>= 1.14) [linux-any],
+ libsepol1-dev [linux-any],
+ po-debconf,
+ quilt (>= 0.40)
Standards-Version: 3.9.5
Homepage: http://savannah.nongnu.org/projects/sysvinit
Vcs-Git: git://anonscm.debian.org/collab-maint/sysvinit.git
@@ -23,7 +21,8 @@ Package: sysvinit
Priority: optional
Architecture: any
Pre-Depends: init
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Description: System-V-like init utilities - transitional package
This package depends on init, which is an essential package that
pulls in the default init system. Starting with jessie, this will be
@@ -38,15 +37,18 @@ Description: System-V-like init utilities - transitional package
Package: sysvinit-core
Priority: extra
Architecture: any
-Depends: initscripts (>= 2.88dsf-13.3),
- sysv-rc | file-rc,
- sysvinit-utils (>= 2.86.ds1-66),
- ${shlibs:Depends},
- ${misc:Depends},
- debianutils (>= 4),
- kbdcontrol (>= 8.2+ds2-6) [kfreebsd-any]
-Conflicts: systemd-sysv, upstart
-Replaces: sysvinit (<< 2.88dsf-44~), systemd-sysv, upstart
+Depends: debianutils (>= 4),
+ initscripts (>= 2.88dsf-13.3),
+ kbdcontrol (>= 8.2+ds2-6) [kfreebsd-any],
+ sysv-rc | file-rc,
+ sysvinit-utils (>= 2.86.ds1-66),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts: systemd-sysv,
+ upstart
+Replaces: systemd-sysv,
+ sysvinit (<< 2.88dsf-44~),
+ upstart
Description: System-V-like init utilities
This package contains programs required for booting
a Debian system and doing basic process management.
@@ -59,12 +61,18 @@ Description: System-V-like init utilities
Package: sysvinit-utils
Essential: yes
Architecture: any
-Conflicts: last, sysvconfig, chkconfig (<< 11.0-79.1-2), startpar (<< 0.58-2)
-Replaces: last, sysvinit (<= 2.86.ds1-65)
-Depends: ${shlibs:Depends}, ${misc:Depends}
- , startpar
+Conflicts: chkconfig (<< 11.0-79.1-2),
+ last,
+ startpar (<< 0.58-2),
+ sysvconfig
+Replaces: last,
+ sysvinit (<= 2.86.ds1-65)
+Depends: startpar,
+ ${misc:Depends},
+ ${shlibs:Depends}
Breaks: upstart (<< 1.5-0ubuntu5)
-Suggests: bootlogd, sash
+Suggests: bootlogd,
+ sash
Description: System-V-like utilities
This package contains the important System-V-like utilities.
.
@@ -78,11 +86,10 @@ Recommends: lsb-base (>= 3.2-14)
Conflicts: file-rc
Replaces: file-rc
Suggests: bum
-Depends:
- ${misc:Depends},
- sysvinit-utils (>= 2.86.ds1-62),
- insserv (>> 1.12.0-10)
- , startpar
+Depends: insserv (>> 1.12.0-10),
+ startpar,
+ sysvinit-utils (>= 2.86.ds1-62),
+ ${misc:Depends}
Breaks: initscripts (<< 2.86.ds1-63)
Description: System-V-like runlevel change mechanism
This package provides support for the System-V like system
@@ -92,47 +99,51 @@ Description: System-V-like runlevel change mechanism
Package: initscripts
Architecture: any
Multi-Arch: foreign
-Depends:
- ${shlibs:Depends}, ${misc:Depends}, ${mount:Depends},
- debianutils (>= 4),
- lsb-base (>= 3.2-14),
- sysvinit-utils (>= 2.88dsf-50), sysv-rc | file-rc,
- coreutils (>= 5.93)
-Recommends: psmisc, e2fsprogs
-Conflicts:
- libdevmapper1.02.1 (<< 2:1.02.24-1),
-Replaces: libc6, libc6.1, libc0.1, libc0.3
-Breaks:
- ifupdown (<< 0.7.46),
- util-linux (<< 2.20.1-5),
- aide (<< 0.15.1-5),
- atm-tools (<< 1:2.5.1-1.3),
- console-common (<< 0.7.86),
- console-setup (<< 1.74),
- cruft (<< 0.9.16),
- eepc-acpi-scripts (<< 1.1.12),
- fcheck (<< 2.7.59-16),
- hostapd (<< 1:0.7.3-3),
- live-build (<< 3.0~a26-1),
- ltsp-client-core (<< 5.2.16-1),
- mdadm (<< 3.2.2-1),
- nbd-client (<< 1:2.9.23-1),
- nfs-common (<< 1:1.2.5-3),
- portmap (<< 6.0.0-2),
- readahead-fedora (<< 2:1.5.6-3),
- resolvconf (<< 1.49),
- rpcbind (<< 0.2.0-7),
- rsyslog (<< 5.8.2-2),
- splashy (<< 0.3.13-5.1+b1),
- sysklogd (<< 1.5-6.2),
- wpasupplicant (<< 0.7.3-4),
- xymon (<< 4.3.0~beta2.dfsg-9),
- selinux-policy-default (<= 2:0.2.20100524-9),
- libpam-mount (<< 2.13-1),
- autofs (<< 5.0.0),
- initramfs-tools (<< 0.104),
- bootchart (<< 0.10~svn407-4),
- hurd (<< 0.5.git20131101~)
+Depends: coreutils (>= 5.93),
+ debianutils (>= 4),
+ lsb-base (>= 3.2-14),
+ sysv-rc | file-rc,
+ sysvinit-utils (>= 2.88dsf-50),
+ ${misc:Depends},
+ ${mount:Depends},
+ ${shlibs:Depends}
+Recommends: e2fsprogs,
+ psmisc
+Conflicts: libdevmapper1.02.1 (<< 2:1.02.24-1)
+Replaces: libc0.1,
+ libc0.3,
+ libc6,
+ libc6.1
+Breaks: aide (<< 0.15.1-5),
+ atm-tools (<< 1:2.5.1-1.3),
+ autofs (<< 5.0.0),
+ bootchart (<< 0.10~svn407-4),
+ console-common (<< 0.7.86),
+ console-setup (<< 1.74),
+ cruft (<< 0.9.16),
+ eepc-acpi-scripts (<< 1.1.12),
+ fcheck (<< 2.7.59-16),
+ hostapd (<< 1:0.7.3-3),
+ hurd (<< 0.5.git20131101~),
+ ifupdown (<< 0.7.46),
+ initramfs-tools (<< 0.104),
+ libpam-mount (<< 2.13-1),
+ live-build (<< 3.0~a26-1),
+ ltsp-client-core (<< 5.2.16-1),
+ mdadm (<< 3.2.2-1),
+ nbd-client (<< 1:2.9.23-1),
+ nfs-common (<< 1:1.2.5-3),
+ portmap (<< 6.0.0-2),
+ readahead-fedora (<< 2:1.5.6-3),
+ resolvconf (<< 1.49),
+ rpcbind (<< 0.2.0-7),
+ rsyslog (<< 5.8.2-2),
+ selinux-policy-default (<= 2:0.2.20100524-9),
+ splashy (<< 0.3.13-5.1+b1),
+ sysklogd (<< 1.5-6.2),
+ util-linux (<< 2.20.1-5),
+ wpasupplicant (<< 0.7.3-4),
+ xymon (<< 4.3.0~beta2.dfsg-9)
Description: scripts for initializing and shutting down the system
The scripts in this package initialize a standard Debian
system at boot time and shut it down at halt or reboot time.
@@ -140,9 +151,13 @@ Description: scripts for initializing and shutting down the system
Package: bootlogd
Architecture: any
Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14)
-Replaces: sysvinit-utils (<< 2.88dsf-17), initscripts (<< 2.88dsf-17)
-Breaks: sysvinit-utils (<< 2.88dsf-17), initscripts (<< 2.88dsf-17)
+Depends: lsb-base (>= 3.2-14),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces: initscripts (<< 2.88dsf-17),
+ sysvinit-utils (<< 2.88dsf-17)
+Breaks: initscripts (<< 2.88dsf-17),
+ sysvinit-utils (<< 2.88dsf-17)
Description: daemon to log boot messages
bootlogd logs all messages printed to the system console during system boot,
and records those messages to a logfile.
--
2.1.1
-- System Information:
Debian Release: 7.7
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-0.bpo.4-amd64 (SMP w/4 CPU cores)
Locale: LANG=it_IT.utf8, LC_CTYPE=it_IT.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages sysvinit depends on:
ii debianutils 4.3.2
ii initscripts 2.88dsf-41+deb7u1
ii libc6 2.18-7
ii libselinux1 2.3-2
ii libsepol1 2.3-2
ii sysv-rc 2.88dsf-41+deb7u1
ii sysvinit-utils 2.88dsf-41+deb7u1
sysvinit recommends no packages.
sysvinit suggests no packages.
-- no debconf information
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-wrap-and-sort.patch
Type: text/x-diff
Size: 7869 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-sysvinit-devel/attachments/20141229/bbb9f937/attachment.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Preparing-to-run-wrap-and-sort-from-devscripts.patch
Type: text/x-diff
Size: 2086 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-sysvinit-devel/attachments/20141229/bbb9f937/attachment-0001.patch>
More information about the Pkg-sysvinit-devel
mailing list