diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2003-08-21 01:53:07 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2003-08-21 01:53:07 -0400 |
| commit | 1d658a136150d02e84eccb8ca11e6bdef781b46c (patch) | |
| tree | 6cd8e5ce8a644306ee48e934dd60468e410e5f2e /debian | |
| parent | a435ec3449694a8fa299337197cc09624960a3a6 (diff) | |
| download | e2fsprogs-1d658a136150d02e84eccb8ca11e6bdef781b46c.tar.gz | |
Fix misc. debian packaging problems.
* Move the initrd script from /etc/mkinitrd/scripts to
/usr/share/initrd-tools/scripts so that mkinitrd will not remove
the file when it is uninstalled. (Addresses Debian bug #204019)
* Remove unneeded files in debian directory: blkid-dev.substvars and
e2fsprogs-bf.lintian-overrides. (Addresses Debian bug #203914)
* Support "noopt" in DEB_BUILD_OPTIONS instead of "debug".
(Addresses Debian bug #203914)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/blkid-dev.substvars | 1 | ||||
| -rw-r--r-- | debian/e2fsprogs-bf.lintian-overrides | 3 | ||||
| -rw-r--r-- | debian/rules | 10 |
3 files changed, 5 insertions, 9 deletions
diff --git a/debian/blkid-dev.substvars b/debian/blkid-dev.substvars deleted file mode 100644 index 1f62fda6..00000000 --- a/debian/blkid-dev.substvars +++ /dev/null @@ -1 +0,0 @@ -libcdev:Depends=libc6-dev diff --git a/debian/e2fsprogs-bf.lintian-overrides b/debian/e2fsprogs-bf.lintian-overrides deleted file mode 100644 index 2772b554..00000000 --- a/debian/e2fsprogs-bf.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -e2fsprogs-bf: binary-without-manpage -e2fsprogs-bf: no-shlibs-control-file -e2fsprogs-bf: postinst-must-call-ldconfig diff --git a/debian/rules b/debian/rules index b3081528..e0118f08 100644 --- a/debian/rules +++ b/debian/rules @@ -59,13 +59,13 @@ CFGBFSTAMP=${STAMPSDIR}/configure-bf-stamp BUILDSTDSTAMP=${STAMPSDIR}/build-std-stamp BUILDBFSTAMP=${STAMPSDIR}/build-bf-stamp -CCOPTS = -O2 -fsigned-char +CCOPTS = -g -fsigned-char INSTALL = install INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -CCOPTS += -g -O1 +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CCOPTS += -O2 endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s @@ -255,9 +255,9 @@ binary-arch: install install-udeb done # mkinitrd script - mkdir -p debian/e2fsprogs/etc/mkinitrd/scripts + mkdir -p debian/e2fsprogs/usr/share/initrd-tools/scripts install -m755 debian/e2fsprogs.mkinitrd \ - debian/e2fsprogs/etc/mkinitrd/scripts/e2fsprogs + debian/e2fsprogs/usr/share/initrd-tools/scripts # symlinks to prepare dh_installdocs run mkdir -p ${debdir}/e2fsck-static/usr/share/doc/ |