mirror of https://github.com/vitalif/e2fsprogs
Update Debian packaging for 1.39+1.40-WIP-2006.10.02+dfsg-1
Remove I-D because of DFSG license Nazi's. Make e2fsck and uuid-dev have its own /usr/share/doc directories, and make the e2fsck-static package not depend on the e2fsprogs package. Addresses Debian Bug: #383521 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>bitmap-optimize
Theodore Ts'o
parent
8938ce64dc
commit
ec3bb41be7
|
|
@ -1,3 +1,20 @@
|
|||
e2fsprogs (1.39+1.40-WIP-2006.10.02+dfsg-1) unstable; urgency=low
|
||||
|
||||
* New +dfsg source tarball that has useful documentation removed to
|
||||
satisfy the DFSG License Nazi's. (Closes: #390664)
|
||||
* Remove dependency on e2fsprogs from the e2fsck-static package
|
||||
(Closes: #383521)
|
||||
* Fix badblocks interpretation of its first optional argument (last-block)
|
||||
(Closes: #386475)
|
||||
|
||||
-- Theodore Y. Ts'o <tytso@mit.edu> Tue, 3 Oct 2006 23:36:05 -0400
|
||||
|
||||
e2fsprogs (1.39+1.40-WIP-2006.10.02-2) unstable; urgency=low
|
||||
|
||||
* Build using the sid version of libc, not experimental!
|
||||
|
||||
-- Theodore Y. Ts'o <tytso@mit.edu> Mon, 2 Oct 2006 21:43:44 -0400
|
||||
|
||||
e2fsprogs (1.39+1.40-WIP-2006.10.02-1) unstable; urgency=low
|
||||
|
||||
* Previous NMU acknowledged (Closes: #388718)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ Standards-Version: 3.7.2
|
|||
Package: e2fsck-static
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Depends: e2fsprogs (= ${Source-Version})
|
||||
Depends:
|
||||
Recommends: sash | zsh-static | busybox-static | zsh30-static
|
||||
Architecture: any
|
||||
Description: statically-linked version of the ext2 filesystem checker
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
This is the Debian GNU/Linux prepackaged version of the static EXT2
|
||||
file system consistency checker (e2fsck.static). 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-2006 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 utilities, are protected by the GNU
|
||||
Public License.
|
||||
|
||||
However, I request that if the version string in the file version.h
|
||||
contains the string "pre-", or "WIP" that this version of e2fsprogs be
|
||||
distributed in source form only. Please feel free to give a copy of
|
||||
the e2fsck binary to help a friend recover his or her filesystem, as
|
||||
the need arises. However, "pre" or "WIP" indicates that this release
|
||||
is under development, and available for ALPHA testing. So for your
|
||||
protection as much as mine, I'd prefer that it not appear in a some
|
||||
distribution --- especially not a CD-ROM distribution!
|
||||
|
||||
The most recent officially distributed version can be found at
|
||||
http://e2fsprogs.sourceforge.net. If you need to make a distribution,
|
||||
that's the one you should use. If there is some reason why you'd like
|
||||
a more recent version that is still in ALPHA testing for your
|
||||
distribution, please contact me (tytso@mit.edu), and we will very
|
||||
likely be able to work out something that will work for all concerned.
|
||||
The release schedules for this package are flexible, if you give me
|
||||
enough lead time.
|
||||
|
||||
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'.
|
||||
|
||||
|
|
@ -221,7 +221,7 @@ install-std: build
|
|||
|
||||
# statically-linked fsck
|
||||
${INSTALL_PROGRAM} ${stdbuilddir}/e2fsck/e2fsck.static ${tmpdir}/sbin
|
||||
ln -s e2fsck.8.gz ${mandir}/man8/e2fsck.static.8.gz
|
||||
cp ${mandir}/man8/e2fsck.8 ${mandir}/man8/e2fsck.static.8
|
||||
|
||||
ln -s et/com_err.h ${tmpdir}/usr/include
|
||||
|
||||
|
|
@ -291,8 +291,6 @@ binary-arch: install install-udeb
|
|||
|
||||
|
||||
# symlinks to prepare dh_installdocs run
|
||||
mkdir -p ${debdir}/e2fsck-static/usr/share/doc/
|
||||
ln -sf e2fsprogs ${debdir}/e2fsck-static/usr/share/doc/e2fsck-static
|
||||
|
||||
mkdir -p ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}
|
||||
mkdir -p ${debdir}/libblkid-dev/usr/share/doc
|
||||
|
|
@ -308,7 +306,7 @@ binary-arch: install install-udeb
|
|||
|
||||
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
|
||||
# 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
|
||||
|
|
@ -352,11 +350,10 @@ binary-arch: install install-udeb
|
|||
dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
|
||||
dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info
|
||||
|
||||
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibblkid${BLKID_SOVERSION}
|
||||
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibcomerr${COMERR_SOVERSION}
|
||||
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibss${SS_SOVERSION}
|
||||
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibuuid${UUID_SOVERSION}
|
||||
DH_OPTIONS= dh_installchangelogs -pe2fsprogs -pe2fslibs
|
||||
DH_OPTIONS= dh_installchangelogs -pe2fsprogs \
|
||||
-plibblkid${BLKID_SOVERSION} -plibcomerr${COMERR_SOVERSION} \
|
||||
-plibss${SS_SOVERSION} -plibuuid${UUID_SOVERSION} \
|
||||
-pe2fslibs -puuid-dev -pe2fsck-static
|
||||
|
||||
ifneq ($(ismips),)
|
||||
dh_strip -Xlib64ext2fs-nopic.a
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
|
||||
In order to santize e2fsprogs to be DFSG free, the file
|
||||
draft-leach-uuids-guids-01.txt has been removed. It can be obtained
|
||||
by downloading e2fsprogs from the upstream sources. It may also be
|
||||
available from other sites on the network, if you do a quick web
|
||||
search for the string "draft-leach-uuids-guids-01".
|
||||
|
||||
Note that debian/rules is set up to include the file on Ubuntu
|
||||
systems, so for people trying to build e2fsprogs on Ubuntu systems,
|
||||
they should start from the upstream sources, and not the
|
||||
Debian-expurgated sources found in the Debian repository. (n.b., for
|
||||
WIP releases the command "./util/gen-tarball ubuntu" will help create
|
||||
tar file which is appropriately named to make life easier for
|
||||
dpkg-buildpackage.) Since Ubuntu doesn't have the DFSG restrictions,
|
||||
the documentation which has been removed for Debian's DFSG license
|
||||
purity shouldn't be denied to Ubuntu users.
|
||||
|
||||
Theodore Ts'o
|
||||
Ocotober 3, 2006
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
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, 2004 by Theodore Ts'o
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, and the entire permission notice in its entirety,
|
||||
including the disclaimer of warranties.
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
3. The name of the author may not be used to endorse or promote
|
||||
products derived from this software without specific prior
|
||||
written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
DAMAGE.
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
.hg
|
||||
.hgignore
|
||||
.pc
|
||||
patches
|
||||
README.subset
|
||||
build
|
||||
rpm.log
|
||||
TODO
|
||||
powerquest
|
||||
.exclude-file
|
||||
po/stamp-cat-id
|
||||
po/cat-id-tbl.c
|
||||
doc/draft-leach-uuids-guids-01.txt
|
||||
|
|
@ -50,6 +50,26 @@ esac
|
|||
|
||||
case $1 in
|
||||
debian)
|
||||
date_spec="@E2FSPROGS_YEAR@.$mon.@E2FSPROGS_DAY@"
|
||||
case @E2FSPROGS_VERSION@ in
|
||||
*-WIP|pre-*)
|
||||
deb_vers=`echo $base_ver 0.01 - p | dc`
|
||||
SRCROOT="e2fsprogs-$deb_vers+$base_ver-WIP-$date_spec+dfsg"
|
||||
;;
|
||||
*-rc*)
|
||||
deb_vers=`echo @E2FSPROGS_VERSION@ | sed -e 's/-rc/rc/'`
|
||||
SRCROOT="e2fsprogs-$deb_vers+dfsg"
|
||||
;;
|
||||
*-PLUS)
|
||||
SRCROOT="e2fsprogs-$base_ver+$date_spec+dfsg"
|
||||
;;
|
||||
*)
|
||||
SRCROOT="e2fsprogs-$base_ver+dfsg"
|
||||
;;
|
||||
esac
|
||||
list=debian
|
||||
;;
|
||||
ubuntu)
|
||||
date_spec="@E2FSPROGS_YEAR@.$mon.@E2FSPROGS_DAY@"
|
||||
case @E2FSPROGS_VERSION@ in
|
||||
*-WIP|pre-*)
|
||||
|
|
|
|||
Loading…
Reference in New Issue