mirror of https://github.com/vitalif/e2fsprogs
Separate out shared libraries out of e2fsprogs to real pacakges:
libss2, libcomerr2, libuuid1, and e2fslibs. Remove Yann's TODO and README.Debian files.bitmap-optimize
parent
9bf19713c8
commit
151c86abb9
4
TODO
4
TODO
|
@ -190,3 +190,7 @@ TODO list.
|
||||||
Debugfs's link command should set the file type information
|
Debugfs's link command should set the file type information
|
||||||
|
|
||||||
---------------------------------------------------------------
|
---------------------------------------------------------------
|
||||||
|
From e2fsprogs Debian TODO file as of 1.10-13.
|
||||||
|
|
||||||
|
* Maybe make -dbg packages. Look at how others do it.
|
||||||
|
|
||||||
|
|
|
@ -21,24 +21,49 @@ Description: A statically-linked version of the ext2 filesystem checker
|
||||||
You may want to install a statically-linked shell as well, to be able
|
You may want to install a statically-linked shell as well, to be able
|
||||||
to run this program if something like your C library gets corrupted.
|
to run this program if something like your C library gets corrupted.
|
||||||
|
|
||||||
Package: comerr-dev
|
Package: libcomerr2
|
||||||
Section: libdevel
|
Section: libs
|
||||||
Priority: extra
|
Priority: required
|
||||||
Depends: ${libcdev:Depends}, libcomerr2
|
Provides: libcomerr-kth-compat
|
||||||
Suggests: doc-base
|
Depends: ${shlibs:Depends}
|
||||||
Conflicts: e2fsprogs (<< 1.10-6)
|
Replaces: e2fsprogs (<< 1.34-1)
|
||||||
Replaces: e2fslibs-dev (<< 1.33-2), libkrb5-dev (<< 1.3)
|
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Description: The Common Error Description library - headers and static libraries
|
Description: The Common Error Description library
|
||||||
libcomerr is an attempt to present a common error-handling mechanism to
|
libcomerr is an attempt to present a common error-handling mechanism to
|
||||||
manipulate the most common form of error code in a fashion that does not
|
manipulate the most common form of error code in a fashion that does not
|
||||||
have the problems identified with mechanisms commonly in use.
|
have the problems identified with mechanisms commonly in use.
|
||||||
|
|
||||||
|
Package: comerr-dev
|
||||||
|
Section: libdevel
|
||||||
|
Priority: extra
|
||||||
|
Depends: libcomerr2
|
||||||
|
Suggests: doc-base
|
||||||
|
Replaces: e2fslibs-dev (<< 1.33-2), libkrb5-dev (<< 1.3)
|
||||||
|
Architecture: any
|
||||||
|
Description: The Common Error Description library - headers and static libraries
|
||||||
|
libcom_err is an attempt to present a common error-handling mechanism to
|
||||||
|
manipulate the most common form of error code in a fashion that does not
|
||||||
|
have the problems identified with mechanisms commonly in use.
|
||||||
|
.
|
||||||
|
This package contains the development environment for the com_err library.
|
||||||
|
|
||||||
|
Package: libss2
|
||||||
|
Section: libs
|
||||||
|
Priority: required
|
||||||
|
Depends: libcomerr2
|
||||||
|
Replaces: e2fsprogs (<< 1.34-1)
|
||||||
|
Architecture: any
|
||||||
|
Description: Command-line interface parsing library
|
||||||
|
This package includes a tool that parses a command table to generate
|
||||||
|
a simple command-line interface parser, the include files needed to
|
||||||
|
compile and use it, and the static libs.
|
||||||
|
.
|
||||||
|
It was originally inspired by the Multics SubSystem library.
|
||||||
|
|
||||||
Package: ss-dev
|
Package: ss-dev
|
||||||
Section: libdevel
|
Section: libdevel
|
||||||
Priority: extra
|
Priority: extra
|
||||||
Depends: ${libcdev:Depends}, libss2
|
Depends: libss2
|
||||||
Conflicts: e2fsprogs (<< 1.10-6)
|
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Description: Command-line interface parsing library - headers and static libraries
|
Description: Command-line interface parsing library - headers and static libraries
|
||||||
This package includes a tool that parses a command table to generate
|
This package includes a tool that parses a command table to generate
|
||||||
|
@ -46,12 +71,28 @@ Description: Command-line interface parsing library - headers and static librari
|
||||||
compile and use it, and the static libs.
|
compile and use it, and the static libs.
|
||||||
.
|
.
|
||||||
It was originally inspired by the Multics SubSystem library.
|
It was originally inspired by the Multics SubSystem library.
|
||||||
|
.
|
||||||
|
This package contains the development environment for the ss library.
|
||||||
|
|
||||||
|
Package: libuuid1
|
||||||
|
Section: libs
|
||||||
|
Priority: required
|
||||||
|
Depends: ${shlibs:Depends}
|
||||||
|
Replaces: e2fsprogs (<< 1.34-1)
|
||||||
|
Architecture: any
|
||||||
|
Description: Universally unique id library
|
||||||
|
libuuid generates and parses 128-bit universally unique id's (UUID's),
|
||||||
|
using a standard which is blessed by both Microsoft and DCE, and is
|
||||||
|
being proposed as an internet standard. See the internet-draft:
|
||||||
|
.
|
||||||
|
draft-leach-uuids-guids-01.txt
|
||||||
|
.
|
||||||
|
for more information.
|
||||||
|
|
||||||
Package: uuid-dev
|
Package: uuid-dev
|
||||||
Section: libdevel
|
Section: libdevel
|
||||||
Priority: extra
|
Priority: extra
|
||||||
Depends: ${libcdev:Depends}, e2fsprogs (= ${Source-Version})
|
Depends: libuuid1 (= ${Source-Version})
|
||||||
Conflicts: e2fsprogs (<< 1.10-6)
|
|
||||||
Replaces: e2fslibs-dev (<< 1.15)
|
Replaces: e2fslibs-dev (<< 1.15)
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Description: Universally unique id library - headers and static libraries
|
Description: Universally unique id library - headers and static libraries
|
||||||
|
@ -62,6 +103,8 @@ Description: Universally unique id library - headers and static libraries
|
||||||
draft-leach-uuids-guids-01.txt
|
draft-leach-uuids-guids-01.txt
|
||||||
.
|
.
|
||||||
for more information.
|
for more information.
|
||||||
|
.
|
||||||
|
This package contains the development environment for the uuid library.
|
||||||
|
|
||||||
Package: libblkid1
|
Package: libblkid1
|
||||||
Section: libs
|
Section: libs
|
||||||
|
@ -117,13 +160,44 @@ Description: A stripped-down versions of e2fsprogs, for debian-installer
|
||||||
Don't attempt to install this package, it has no support for a couple of
|
Don't attempt to install this package, it has no support for a couple of
|
||||||
features you surely want. Anyway it should refuse to install.
|
features you surely want. Anyway it should refuse to install.
|
||||||
|
|
||||||
|
Package: e2fslibs
|
||||||
|
Section: libs
|
||||||
|
Priority: required
|
||||||
|
Depends: ${shlibs:Depends}
|
||||||
|
Replaces: e2fsprogs (<< 1.34-1)
|
||||||
|
Provides: libext2fs2, libe2p2
|
||||||
|
Architecture: any
|
||||||
|
Description: The EXT2 filesystem libraries
|
||||||
|
The ext2fs and e2p libraries are used by programs that directly access
|
||||||
|
EXT2 filesystems from usermode programs. The EXT2 filesystem is very often
|
||||||
|
used as the default filesystem on Linux systems. Various system programs
|
||||||
|
that use libext2fs include e2fsck, mke2fs, tune2fs, etc. Programs that use
|
||||||
|
libe2p include dumpe2fs, chattr, and lsattr.
|
||||||
|
|
||||||
|
Package: e2fslibs-dev
|
||||||
|
Section: libdevel
|
||||||
|
Priority: extra
|
||||||
|
Depends: comerr-dev, e2fslibs (= ${Source-Version})
|
||||||
|
Suggests: doc-base
|
||||||
|
Provides: ext2fs-dev, e2p-dev
|
||||||
|
Replaces: libkrb5-dev (<< 1.3)
|
||||||
|
Architecture: any
|
||||||
|
Description: The EXT2 filesystem libraries - headers and static libraries
|
||||||
|
The ext2fs and e2p libraries are used by programs that directly access
|
||||||
|
EXT2 filesystems from usermode programs. The EXT2 filesystem is very often
|
||||||
|
used as the default filesystem on Linux systems. Various system programs
|
||||||
|
that use libext2fs include e2fsck, mke2fs, tune2fs, etc. Programs that use
|
||||||
|
libe2p include dumpe2fs, chattr, and lsattr.
|
||||||
|
.
|
||||||
|
This package contains the development environment for the ext2fs and e2p
|
||||||
|
libraries.
|
||||||
|
|
||||||
Package: e2fsprogs
|
Package: e2fsprogs
|
||||||
Essential: yes
|
Essential: yes
|
||||||
Pre-Depends: ${shlibs:Depends}
|
Pre-Depends: ${shlibs:Depends}
|
||||||
Depends:
|
Depends:
|
||||||
Suggests: gpart, parted, e2fsck-static
|
Suggests: gpart, parted, e2fsck-static
|
||||||
Conflicts: dump (<< 0.4b4-4), quota (<< 1.55-8.1), initscripts (<< 2.85-4)
|
Conflicts: dump (<< 0.4b4-4), quota (<< 1.55-8.1), initscripts (<< 2.85-4)
|
||||||
Provides: libcomerr2, libcomerr-kth-compat, libss2, libext2fs2, libe2p2, libuuid1
|
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Description: The EXT2 file system utilities and libraries
|
Description: The EXT2 file system utilities and libraries
|
||||||
EXT2 stands for "Extended Filesystem", version 2. It's the main
|
EXT2 stands for "Extended Filesystem", version 2. It's the main
|
||||||
|
@ -131,34 +205,3 @@ Description: The EXT2 file system utilities and libraries
|
||||||
.
|
.
|
||||||
This package contains programs for creating, checking, and maintaining EXT2
|
This package contains programs for creating, checking, and maintaining EXT2
|
||||||
filesystems, and the generic `fsck' wrapper.
|
filesystems, and the generic `fsck' wrapper.
|
||||||
|
|
||||||
Package: e2fslibs-dev
|
|
||||||
Section: libdevel
|
|
||||||
Priority: extra
|
|
||||||
Depends: comerr-dev, e2fsprogs (= ${Source-Version})
|
|
||||||
Suggests: doc-base
|
|
||||||
Provides: ext2fs-dev, e2p-dev
|
|
||||||
Conflicts: e2fsprogs (<< 1.10-6)
|
|
||||||
Replaces: libkrb5-dev (<< 1.3)
|
|
||||||
Architecture: any
|
|
||||||
Description: The headers and static libraries for ext2fs-aware tools-development
|
|
||||||
EXT2FS stands for "Extended Filesystem", version 2. It's the filesystem
|
|
||||||
type used for hard disks on Debian and other Linux systems.
|
|
||||||
.
|
|
||||||
This package contains the headers and shared libraries needed to compile
|
|
||||||
ext2fs-aware programs. Only programmers that really manipulate
|
|
||||||
features specific to the ext2 filesystem will need this. Most
|
|
||||||
programmers will use the generic filesystem-independent interface
|
|
||||||
from libc.
|
|
||||||
.
|
|
||||||
It also contains dev files for the e2p lib used by
|
|
||||||
the e2fsprogs, but which is not yet packaged all by itself
|
|
||||||
because it lacks documentation. It may also lack some support
|
|
||||||
files, by I can't really know until someone uses it...
|
|
||||||
.
|
|
||||||
libe2p is for user-level e2fsprogs commands. It's used by dumpe2fs,
|
|
||||||
chattr, and lsattr. Functions in libe2p typically have two
|
|
||||||
characteristics (a) don't require that block device containing the
|
|
||||||
filesystem be opened directly (functions in libext2fs do), and (b)
|
|
||||||
libe2p typically contains printf statements or parse user input, and so
|
|
||||||
have more internationalization issues.
|
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
This is the Debian GNU/Linux prepackaged version of the EXT2 file
|
||||||
|
system utilities (e2fsck, mke2fs, etc.). The EXT2 utilities were
|
||||||
|
written by Theodore Ts'o <tytso@mit.edu> and Remy Card <card@masi.ibp.fr>.
|
||||||
|
|
||||||
|
Sources were obtained from http://sourceforge.net/projects/e2fsprogs
|
||||||
|
|
||||||
|
Packaging is copyright (c) 2003 Theodore Ts'o <tytso@mit.edu>
|
||||||
|
copyright (c) 1997-2003 Yann Dirson <dirson@debian.org>
|
||||||
|
copyright (c) 2001 Alcove <http://www.alcove.com/>
|
||||||
|
copyright (c) 1997 Klee Dienes
|
||||||
|
copyright (c) 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk>
|
||||||
|
|
||||||
|
Upstream Author: Theodore Ts'o <tytso@mit.edu>
|
||||||
|
|
||||||
|
Copyright notice:
|
||||||
|
|
||||||
|
This package, the EXT2 filesystem libraries, are protected by the GNU
|
||||||
|
Public License.
|
||||||
|
|
||||||
|
Theodore Ts'o
|
||||||
|
15-Mar-2003
|
||||||
|
|
||||||
|
On Debian GNU systems, the complete text of the GNU General
|
||||||
|
Public License can be found in `/usr/share/common-licenses/GPL'.
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
lib/libext2fs*
|
||||||
|
lib/libe2p*
|
||||||
|
|
|
@ -1,101 +0,0 @@
|
||||||
e2fsprogs for Debian
|
|
||||||
====================
|
|
||||||
|
|
||||||
e2fsprogs includes the uuidgen(1) program, although it is not directly
|
|
||||||
to e2fsprogs - it would belong to the libuuid package, but the uuid
|
|
||||||
shared lib is currently part of the e2fsprogs package. See below for
|
|
||||||
more details.
|
|
||||||
|
|
||||||
|
|
||||||
Here's the documentation for the Conflicts/Provides fields:
|
|
||||||
|
|
||||||
* old dump and quota packages used to depend on old (libc5) e2fsprogs
|
|
||||||
itself, as it contained the shared libs. We must conflict with these
|
|
||||||
incompatible versions.
|
|
||||||
|
|
||||||
|
|
||||||
* All -g package names were a transient experiment during hamm
|
|
||||||
development.
|
|
||||||
|
|
||||||
|
|
||||||
* Here's the reasonning for not moving the libs outside of the
|
|
||||||
e2fsprogs package (this may be partly obsolete):
|
|
||||||
|
|
||||||
If we have:
|
|
||||||
|
|
||||||
e2fsprogs_1.10-2 is essential
|
|
||||||
|
|
||||||
e2fsprogs_1.10-11 is essential
|
|
||||||
predepends on comerr2g
|
|
||||||
|
|
||||||
comerr2g_2.0-1.10-11:
|
|
||||||
is not essential
|
|
||||||
conflicts with e2fsprogs_1.10-2
|
|
||||||
|
|
||||||
...then e2fsprogs_1.10-11 can't be installed before comerr2g because
|
|
||||||
of the predependency, and comerr2g cannot be installed before
|
|
||||||
e2fsprogs_1.10-11 because of the conflict.
|
|
||||||
|
|
||||||
This totally comes from the fact that e2fsprogs was initially built as
|
|
||||||
an *essential package with shared libs*.
|
|
||||||
|
|
||||||
My initial solution, namely changing the predependency into a simple
|
|
||||||
dependency, turns out to be a system-integrity problem:
|
|
||||||
|
|
||||||
$ dpkg -i e2fsprogs_1.10-11*deb comerr2g_2.0-1.10-11*deb
|
|
||||||
|
|
||||||
...will, if comerr2g fails to unpack or configure, let e2fsprogs in an
|
|
||||||
unusable state.
|
|
||||||
|
|
||||||
|
|
||||||
* This raises the problem that most of these libs are general-purpose
|
|
||||||
libs, and will be used by more and more packages. The lib-dependency
|
|
||||||
mechanism requires for proper fonctionning that we keep track of these
|
|
||||||
libs changing version, as well as infos such as libc5/6 issues.
|
|
||||||
|
|
||||||
The standard way to do it is using standalone packages for those libs,
|
|
||||||
which is not possible here (see above).
|
|
||||||
|
|
||||||
My solution in this case is the use of the following virtual packages:
|
|
||||||
|
|
||||||
libss2, libcomerr2, libe2p2, libuuid1, libext2fs2
|
|
||||||
|
|
||||||
These are automatically referenced thanks to the shlibs file. They
|
|
||||||
are currently provided by e2fsprogs.
|
|
||||||
|
|
||||||
|
|
||||||
* Additionally, we must add to the shlibs file a dep on "e2fsprogs (>=
|
|
||||||
<current-version>)", so that programs using new functions from those
|
|
||||||
libs will not break (see #139274). Note that this will be superceeded
|
|
||||||
by versionned Provides: when they will come in dpkg.
|
|
||||||
|
|
||||||
We can see the reality of the problem:
|
|
||||||
|
|
||||||
$ diff <(nm -D 1.18/lib/libuuid.so.1 | cut -c10- | grep -v ^U) \
|
|
||||||
<(nm -D 1.27/lib/libuuid.so.1 | cut -c10- | grep -v ^U)
|
|
||||||
3a4
|
|
||||||
> w __cxa_finalize
|
|
||||||
6a8,9
|
|
||||||
> T __udivdi3
|
|
||||||
> T __umoddi3
|
|
||||||
|
|
||||||
<=== Actually, there are **no** API changes in libuuid between
|
|
||||||
e2fsprogs 1.27 and 1.18. The observant reader will notice
|
|
||||||
that the "reality of the problem" show above shows symbol
|
|
||||||
names which are are prefixed with "__". This means no program
|
|
||||||
should be using them. In point of fact, these are functions
|
|
||||||
created by gcc, and the incompatibility reported in #139274
|
|
||||||
was much more likely casued by glibc or gcc incompatibilities,
|
|
||||||
not changes in the libuuid library. Hence, I am removing the
|
|
||||||
shlibs hack, because it does far more harm than it does good.
|
|
||||||
(Next time, *please* consult me before making changes like
|
|
||||||
this.)
|
|
||||||
-- Theodore Ts'o, tytso@mit.edu.
|
|
||||||
|
|
||||||
|
|
||||||
* e2fsprogs still Provides/Conflicts with e2fslibsg to allow upgrading
|
|
||||||
from pre 1.10-13 releases (from unstable hamm). This does not seem to
|
|
||||||
be possible for ss2g and comerr2g for some still-to-be-investigated
|
|
||||||
reason.
|
|
||||||
|
|
||||||
Yann Dirson <dirson@debian.org>
|
|
|
@ -1,13 +0,0 @@
|
||||||
e2fsprogs Debian TODO file as of 1.10-13.
|
|
||||||
This file may or may not be up to date.
|
|
||||||
|
|
||||||
* Report to Ted: inconsistent "et/com_err.h", <et/com_err.h>, <com_err.h>
|
|
||||||
under lib/
|
|
||||||
* What about making com_err more self-consistant ("et" / "com_err")
|
|
||||||
|
|
||||||
* Suppress as many references as possible to the libcom_err version number in
|
|
||||||
source control files and debian/ subdir.
|
|
||||||
|
|
||||||
* Maybe make -dbg packages. Look at how others do it.
|
|
||||||
|
|
||||||
* Fix com_err.texinfo.
|
|
|
@ -4,8 +4,8 @@ written by Theodore Ts'o <tytso@mit.edu> and Remy Card <card@masi.ibp.fr>.
|
||||||
|
|
||||||
Sources were obtained from http://sourceforge.net/projects/e2fsprogs
|
Sources were obtained from http://sourceforge.net/projects/e2fsprogs
|
||||||
|
|
||||||
Packaging is copyright (c) 1997-2003 Yann Dirson <dirson@debian.org>
|
Packaging is copyright (c) 2003 Theodore Ts'o <tytso@mit.edu>
|
||||||
copyright (c) 2003 Theodore Ts'o <tytso@mit.edu>
|
copyright (c) 1997-2003 Yann Dirson <dirson@debian.org>
|
||||||
copyright (c) 2001 Alcove <http://www.alcove.com/>
|
copyright (c) 2001 Alcove <http://www.alcove.com/>
|
||||||
copyright (c) 1997 Klee Dienes
|
copyright (c) 1997 Klee Dienes
|
||||||
copyright (c) 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk>
|
copyright (c) 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk>
|
||||||
|
@ -41,18 +41,3 @@ enough lead time.
|
||||||
On Debian GNU systems, the complete text of the GNU General
|
On Debian GNU systems, the complete text of the GNU General
|
||||||
Public License can be found in `/usr/share/common-licenses/GPL'.
|
Public License can be found in `/usr/share/common-licenses/GPL'.
|
||||||
|
|
||||||
|
|
||||||
The 1.19 RELEASE-NOTES mentions that the UUID library (libuuid) is
|
|
||||||
covered by the LGPL. After clarification from upstream author, it
|
|
||||||
appears to refer to the so-called "Library General Public License"
|
|
||||||
(aka LGPL v2), and not the "Lesser General Public License" (aka LGPL
|
|
||||||
v2.1).
|
|
||||||
|
|
||||||
On Debian GNU systems, the complete text of the GNU LGPL v2 can be
|
|
||||||
found in `/usr/share/common-licenses/LGPL-2'.
|
|
||||||
|
|
||||||
|
|
||||||
The ss and com_err libraries, available in separate packages, fall
|
|
||||||
under another licence. Please refer to the relevant copyright files
|
|
||||||
for these libs.
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
libcom_err 2 libcomerr2 (>= 1.34-1)
|
||||||
|
libss 2 libss2 (>= 1.34-1)
|
||||||
|
libuuid 1 libuuid1 (>= 1.34-1)
|
||||||
|
libext2fs 2 e2fslibs (>= 1.34-1)
|
||||||
|
libe2p 2 e2fslibs (>= 1.34-1)
|
|
@ -0,0 +1,2 @@
|
||||||
|
lib/libcom_err*
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
lib/libss*
|
|
@ -0,0 +1,18 @@
|
||||||
|
This package was added to the e2fsprogs debian source package by
|
||||||
|
Theodore Ts'o <tytso@mit.edu> on Sat Mar 15 15:33:37 EST 2003
|
||||||
|
|
||||||
|
It is part of the main e2fsprogs distribution, which can be found at:
|
||||||
|
|
||||||
|
http://sourceforge.net/projects/e2fsprogs
|
||||||
|
|
||||||
|
Upstream Author: Theodore Ts'o <tytso@mit.edu>
|
||||||
|
|
||||||
|
Copyright:
|
||||||
|
|
||||||
|
Copyright (C) 1999, 2000, 2003 by Theodore Ts'o
|
||||||
|
|
||||||
|
You are free to distribute this software under the terms of the GNU
|
||||||
|
Library General Public License. (aka LGPL v2)
|
||||||
|
|
||||||
|
On Debian GNU systems, the complete text of the GNU LGPL v2 can be
|
||||||
|
found in `/usr/share/common-licenses/LGPL-2'.
|
|
@ -0,0 +1,3 @@
|
||||||
|
lib/libuuid*
|
||||||
|
usr/bin/uuidgen
|
||||||
|
usr/share/man/man1/uuidgen.1*
|
|
@ -61,8 +61,6 @@ UDEB_PRIORITY = $(shell grep '^Package: e2fsprogs-udeb' debian/control -A 10 | g
|
||||||
BLKID_UDEB_NAME = libblkid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb
|
BLKID_UDEB_NAME = libblkid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb
|
||||||
BLKID_UDEB_PRIORITY = $(shell grep '^Package: libblkid1-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
|
BLKID_UDEB_PRIORITY = $(shell grep '^Package: libblkid1-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
|
||||||
|
|
||||||
SUBPACKAGES_DIRS = tmp e2fslibs-dev comerr-dev ss-dev
|
|
||||||
|
|
||||||
STAMPSDIR=debian/stampdir
|
STAMPSDIR=debian/stampdir
|
||||||
CFGSTDSTAMP=${STAMPSDIR}/configure-std-stamp
|
CFGSTDSTAMP=${STAMPSDIR}/configure-std-stamp
|
||||||
CFGBFSTAMP=${STAMPSDIR}/configure-bf-stamp
|
CFGBFSTAMP=${STAMPSDIR}/configure-bf-stamp
|
||||||
|
@ -275,106 +273,89 @@ binary-arch: install install-udeb
|
||||||
mkdir -p ${debdir}/e2fsck-static/usr/share/doc/
|
mkdir -p ${debdir}/e2fsck-static/usr/share/doc/
|
||||||
ln -sf e2fsprogs ${debdir}/e2fsck-static/usr/share/doc/e2fsck-static
|
ln -sf e2fsprogs ${debdir}/e2fsck-static/usr/share/doc/e2fsck-static
|
||||||
|
|
||||||
mkdir -p ${debdir}/e2fslibs-dev/usr/share/doc/e2fsprogs
|
|
||||||
ln -sf e2fsprogs ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev
|
|
||||||
|
|
||||||
mkdir -p ${debdir}/uuid-dev/usr/share/doc/e2fsprogs
|
|
||||||
ln -sf e2fsprogs ${debdir}/uuid-dev/usr/share/doc/uuid-dev
|
|
||||||
|
|
||||||
# comerr and ss have their own copyright notices
|
|
||||||
mkdir -p ${maindir}/usr/share/doc/libcomerr${COMERR_SOVERSION}
|
|
||||||
mkdir -p ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}
|
|
||||||
ln -sf libcomerr${COMERR_SOVERSION} ${debdir}/comerr-dev/usr/share/doc/comerr-dev
|
|
||||||
|
|
||||||
mkdir -p ${maindir}/usr/share/doc/libss${SS_SOVERSION}
|
|
||||||
mkdir -p ${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}
|
|
||||||
ln -sf libss${SS_SOVERSION} ${debdir}/ss-dev/usr/share/doc/ss-dev
|
|
||||||
|
|
||||||
mkdir -p ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}
|
mkdir -p ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}
|
||||||
mkdir -p ${debdir}/libblkid-dev/usr/share/doc
|
mkdir -p ${debdir}/libblkid-dev/usr/share/doc
|
||||||
ln -sf libblkid${BLKID_SOVERSION} ${debdir}/libblkid-dev/usr/share/doc/libblkid-dev
|
ln -sf libblkid${BLKID_SOVERSION} ${debdir}/libblkid-dev/usr/share/doc/libblkid-dev
|
||||||
|
|
||||||
for i in libcomerr${COMERR_SOVERSION} libss${SS_SOVERSION}; do \
|
mkdir -p ${debdir}/libss${SS_SOVERSION}/usr/share/doc/libss${SS_SOVERSION}
|
||||||
install -m 644 debian/$$i.copyright \
|
mkdir -p ${debdir}/ss-dev/usr/share/doc
|
||||||
${maindir}/usr/share/doc/$$i/copyright ; \
|
ln -sf libss${SS_SOVERSION} ${debdir}/ss-dev/usr/share/doc/ss-dev
|
||||||
done
|
|
||||||
|
mkdir -p ${debdir}/libcomerr${COMERR_SOVERSION}/usr/share/doc/libcomerr${COMERR_SOVERSION}
|
||||||
|
mkdir -p ${debdir}/comerr-dev/usr/share/doc
|
||||||
|
ln -sf libcomerr${COMERR_SOVERSION} ${debdir}/comerr-dev/usr/share/doc/comerr-dev
|
||||||
|
|
||||||
|
mkdir -p ${debdir}/libuuid${UUID_SOVERSION}/usr/share/doc/libuuid${UUID_SOVERSION}
|
||||||
|
mkdir -p ${debdir}/uuid-dev/usr/share/doc
|
||||||
|
ln -sf libuuid${UUID_SOVERSION} ${debdir}/uuid-dev/usr/share/doc/uuid-dev
|
||||||
|
|
||||||
|
mkdir -p ${debdir}/e2fslibs/usr/share/doc/e2fslibs
|
||||||
|
mkdir -p ${debdir}/e2fslibs-dev/usr/share/doc
|
||||||
|
ln -sf e2fslibs ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev
|
||||||
|
|
||||||
install -m 644 debian/libblkid.copyright \
|
install -m 644 debian/libblkid.copyright \
|
||||||
${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}/copyright
|
${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}/copyright
|
||||||
|
|
||||||
dh_installdocs -Ne2fsprogs-udeb -Nlibblkid1-udeb
|
dh_installdocs -Ne2fsprogs-udeb -Nlibblkid1-udeb
|
||||||
|
|
||||||
# libblkid is under the the LGPL
|
|
||||||
|
|
||||||
# HTML docs
|
# HTML docs
|
||||||
install -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev/html-info/
|
install -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
|
||||||
install -p ${stdbuilddir}/doc/libext2fs_*.html \
|
install -p ${stdbuilddir}/doc/libext2fs_*.html \
|
||||||
${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev/html-info/
|
${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
|
||||||
install -d ${debdir}/comerr-dev/usr/share/doc/comerr-dev/html-info/
|
install -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
|
||||||
install -p ${stdbuilddir}/lib/et/com_err_*.html \
|
install -p ${stdbuilddir}/lib/et/com_err_*.html \
|
||||||
${debdir}/comerr-dev/usr/share/doc/comerr-dev/html-info/
|
${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
|
||||||
|
|
||||||
# texinfo docs
|
# texinfo docs
|
||||||
|
mkdir -p ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}
|
||||||
install -p ${topdir}/doc/libext2fs.texinfo \
|
install -p ${topdir}/doc/libext2fs.texinfo \
|
||||||
${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev/libext2fs.texi
|
${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/libext2fs.texi
|
||||||
install -p ${topdir}/lib/et/com_err.texinfo \
|
install -p ${topdir}/lib/et/com_err.texinfo \
|
||||||
${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/com_err.texi
|
${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/com_err.texi
|
||||||
|
|
||||||
dh_installexamples
|
install -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/examples
|
||||||
|
install -p -m 0644 lib/ss/ss_err.et \
|
||||||
|
${stdbuilddir}/lib/ext2fs/ext2_err.et \
|
||||||
|
${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/examples
|
||||||
|
install -d ${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}/examples
|
||||||
|
install -p -m 0644 debugfs/debug_cmds.ct \
|
||||||
|
${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}/examples
|
||||||
|
|
||||||
|
install -d ${debdir}/uuid-dev/usr/share/doc/libuuid${UUID_SOVERSION}
|
||||||
|
install -p -m 0644 doc/draft-leach-uuids-guids-01.txt \
|
||||||
|
${debdir}/uuid-dev/usr/share/doc/libuuid${UUID_SOVERSION}
|
||||||
|
|
||||||
dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
|
dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
|
||||||
dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info
|
dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info
|
||||||
|
|
||||||
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibblkid${BLKID_SOVERSION}
|
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibblkid${BLKID_SOVERSION}
|
||||||
|
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibcomerr${COMERR_SOVERSION}
|
||||||
for i in libcomerr${COMERR_SOVERSION} libss${SS_SOVERSION} ; do \
|
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibss${SS_SOVERSION}
|
||||||
mkdir -p ${maindir}/usr/share/doc/$$i ; \
|
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibuuid${UUID_SOVERSION}
|
||||||
ln -s ../e2fsprogs/changelog.Debian.gz ${maindir}/usr/share/doc/$$i/ ; \
|
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -pe2fslibs
|
||||||
ln -s ../e2fsprogs/changelog.gz ${maindir}/usr/share/doc/$$i/ ; \
|
|
||||||
done
|
|
||||||
|
|
||||||
dh_strip
|
dh_strip
|
||||||
|
|
||||||
dh_compress
|
dh_compress
|
||||||
dh_fixperms
|
dh_fixperms
|
||||||
|
|
||||||
echo "libcdev:Depends=${LIBC-DEV}" > debian/comerr-dev.substvars
|
dh_makeshlibs
|
||||||
echo "libcdev:Depends=${LIBC-DEV}" > debian/ss-dev.substvars
|
dh_makeshlibs -plibcomerr${COMERR_SOVERSION} \
|
||||||
echo "libcdev:Depends=${LIBC-DEV}" > debian/uuid-dev.substvars
|
-V 'libcomerr2 (>= 1.33-3)'
|
||||||
echo "libcdev:Depends=${LIBC-DEV}" > debian/blkid-dev.substvars
|
|
||||||
echo "libcdev:Depends=${LIBC-DEV}" > debian/e2fslibs-dev.substvars
|
|
||||||
|
|
||||||
# Call this mostly to get the maintainer-script snippets
|
|
||||||
dh_makeshlibs -pe2fsprogs
|
|
||||||
# We overwrite the shlibs by hand because of virtual packages used
|
|
||||||
: > debian/e2fsprogs/DEBIAN/shlibs
|
|
||||||
echo "libext2fs ${EXT2FS_SOVERSION} libext2fs${EXT2FS_SOVERSION}" \
|
|
||||||
>> debian/e2fsprogs/DEBIAN/shlibs
|
|
||||||
echo "libe2p ${E2P_SOVERSION} libe2p${E2P_SOVERSION}" \
|
|
||||||
>> debian/e2fsprogs/DEBIAN/shlibs
|
|
||||||
echo "libuuid ${UUID_SOVERSION} libuuid${UUID_SOVERSION}" \
|
|
||||||
>> debian/e2fsprogs/DEBIAN/shlibs
|
|
||||||
echo "libcom_err ${COMERR_SOVERSION} libcomerr${COMERR_SOVERSION}, libcomerr-kth-compat" \
|
|
||||||
>> debian/e2fsprogs/DEBIAN/shlibs
|
|
||||||
echo "libss ${SS_SOVERSION} libss${SS_SOVERSION}" \
|
|
||||||
>> debian/e2fsprogs/DEBIAN/shlibs
|
|
||||||
|
|
||||||
dh_makeshlibs -plibblkid${BLKID_SOVERSION}
|
|
||||||
|
|
||||||
dh_installdeb
|
dh_installdeb
|
||||||
dh_shlibdeps -l${stdbuilddir}/lib
|
dh_shlibdeps -l${stdbuilddir}/lib
|
||||||
|
dh_shlibdeps -pe2fsprogs -l${stdbuilddir}/lib \
|
||||||
|
-u"-Ldebian/e2fsprogs.shlibs.local"
|
||||||
|
|
||||||
dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev -Ne2fsprogs-udeb -Nlibblkid1-udeb
|
dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev \
|
||||||
|
-Ne2fsprogs-udeb -Nlibblkid1-udeb
|
||||||
DH_OPTIONS= dh_gencontrol -pcomerr-dev \
|
DH_OPTIONS= dh_gencontrol -pcomerr-dev \
|
||||||
-u '-v${COMERR_VERSION}-${MAIN_VERSION}'
|
-u '-v${COMERR_VERSION}-${MAIN_VERSION}'
|
||||||
DH_OPTIONS= dh_gencontrol -pss-dev \
|
DH_OPTIONS= dh_gencontrol -pss-dev \
|
||||||
-u '-v${SS_VERSION}-${MAIN_VERSION}'
|
-u '-v${SS_VERSION}-${MAIN_VERSION}'
|
||||||
DH_OPTIONS= dh_gencontrol -puuid-dev \
|
DH_OPTIONS= dh_gencontrol -puuid-dev \
|
||||||
-u '-v${UUID_VERSION}-${MAIN_VERSION}'
|
-u '-v${UUID_VERSION}-${MAIN_VERSION}'
|
||||||
DH_OPTIONS= dh_gencontrol -plibblkid-dev \
|
|
||||||
-u '-v${MAIN_VERSION}'
|
|
||||||
DH_OPTIONS= dh_gencontrol -plibblkid${BLKID_SOVERSION} \
|
|
||||||
-u '-v${MAIN_VERSION}'
|
|
||||||
|
|
||||||
dh_md5sums -Ne2fsprogs-udeb -Nlibblkid1-udeb
|
dh_md5sums -Ne2fsprogs-udeb -Nlibblkid1-udeb
|
||||||
dh_builddeb -Ne2fsprogs-udeb -Nlibblkid1-udeb
|
dh_builddeb -Ne2fsprogs-udeb -Nlibblkid1-udeb
|
||||||
|
|
|
@ -3,3 +3,4 @@ libe2p 2
|
||||||
libuuid 1
|
libuuid 1
|
||||||
libcom_err 2
|
libcom_err 2
|
||||||
libss 2
|
libss 2
|
||||||
|
libblkid 1
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue