summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2018-02-08 23:39:22 -0500
committerTheodore Ts'o <tytso@mit.edu>2018-02-08 23:48:13 -0500
commit146649cd226580b4a5480cc5940982295072971d (patch)
treecdf1b0c158d9a9fc8fb282958ad8998faa860669 /debian
parent5dd8efe378ba575e53b05087958dd7064c9a4c0c (diff)
Update release notes, etc., for the 1.43.9 release
This also includes some debian package renames to conform with Debian naming conventions. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog18
-rw-r--r--debian/control47
-rw-r--r--debian/control.legacy-dbg8
-rw-r--r--debian/e2fsprogs-udeb.lintian-overrides2
-rw-r--r--debian/e2fsprogs.shlibs.local6
-rw-r--r--debian/libcom-err2.copyright (renamed from debian/libcomerr2.copyright)0
-rw-r--r--debian/libcom-err2.files (renamed from debian/libcomerr2.files)0
-rw-r--r--debian/libcom-err2.symbols (renamed from debian/libcomerr2.symbols)2
-rw-r--r--debian/libext2fs-dev.doc-base (renamed from debian/e2fslibs-dev.doc-base)4
-rw-r--r--debian/libext2fs-dev.files (renamed from debian/e2fslibs-dev.files)0
-rw-r--r--debian/libext2fs2.files (renamed from debian/e2fslibs.files)0
-rw-r--r--debian/libext2fs2.symbols (renamed from debian/e2fslibs.symbols)4
-rwxr-xr-xdebian/rules50
-rw-r--r--debian/source.lintian-overrides2
14 files changed, 96 insertions, 47 deletions
diff --git a/debian/changelog b/debian/changelog
index 306b89f6..6713ad0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+e2fsprogs (1.43.9-1) unstable; urgency=medium
+
+ * Remove some obsolete flags and add document new flags in the chattr
+ man page
+ * Remove misplaced "MNP is unsupported" message from debugfs
+ * Suppress false positive lintian warning about "new essential
+ package" (caused by preparatory work to make the e2fsprogs
+ package no longer essential)
+ * Fixing missing "General" in "GNU General Public License" in
+ copyright files.
+ * Fix whitespace issue in the debian control file
+ * Update the Hungarian translation.
+ * Rename the packages e2fslibs* to libext2fs* and libcomerr2* to
+ libcom-err2* to conform with the standard Debian library package
+ naming conventions. (Closes: #269569)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu> Thu, 08 Feb 2018 13:09:49 -0500
+
e2fsprogs (1.43.8-2) unstable; urgency=medium
* Update debian policy version to 4.1.3
diff --git a/debian/control b/debian/control
index c5a0b3cd..9bcac640 100644
--- a/debian/control
+++ b/debian/control
@@ -48,11 +48,20 @@ Description: ext2/ext3/ext4 file system utilities - translations
the 'e2fsprogs' package.
Package: libcomerr2
+Depends: libcom-err2, ${misc:Depends}
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+
+Package: libcom-err2
Section: libs
Priority: optional
-Provides: libcomerr-kth-compat
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: e2fsprogs (<< 1.34-1)
+Replaces: libcomerr2 (<< 1.43.9-1~)
+Breaks: libcomerr2 (<< 1.43.9-1~)
+Provides: libcomerr2 (= ${binary:Version})
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -64,7 +73,7 @@ Description: common error description library
Package: comerr-dev
Section: libdevel
Priority: optional
-Depends: libc6-dev | libc-dev, libcomerr2 (= ${mainBinary}), ${misc:Depends}
+Depends: libc6-dev | libc-dev, libcom-err2 (= ${mainBinary}), ${misc:Depends}
Suggests: doc-base
Replaces: e2fslibs-dev (<< 1.33-2), libkrb5-dev (<< 1.3)
Architecture: any
@@ -79,7 +88,7 @@ Description: common error description library - headers and static libraries
Package: libss2
Section: libs
Priority: optional
-Depends: libcomerr2, ${shlibs:Depends}, ${misc:Depends}
+Depends: libcom-err2, ${shlibs:Depends}, ${misc:Depends}
Replaces: e2fsprogs (<< 1.34-1)
Architecture: any
Multi-Arch: same
@@ -121,11 +130,28 @@ Description: stripped-down versions of e2fsprogs, for debian-installer
features you surely want. Anyway it should refuse to install.
Package: e2fslibs
+Depends: libext2fs2, ${misc:Depends}
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+
+Package: e2fslibs-dev
+Depends: libext2fs-dev, ${misc:Depends}
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+
+Package: libext2fs2
Section: libs
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: e2fsprogs (<< 1.34-1)
-Provides: libext2fs2, libe2p2
+Replaces: e2fslibs (<< 1.43.9-1~)
+Breaks: e2fslibs (<< 1.43.9-1~)
+Provides: e2fslibs (= ${binary:Version})
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -139,13 +165,14 @@ Description: ext2/ext3/ext4 file system libraries
include e2fsck, mke2fs, and tune2fs. Programs that use libe2p include
dumpe2fs, chattr, and lsattr.
-Package: e2fslibs-dev
+Package: libext2fs-dev
Section: libdevel
Priority: optional
-Depends: libc6-dev | libc-dev, comerr-dev, e2fslibs (= ${binary:Version}), ${misc:Depends}
+Depends: libc6-dev | libc-dev, comerr-dev, libext2fs2 (= ${binary:Version}), ${misc:Depends}
+Replaces: e2fslibs-dev (<< 1.43.9-1~)
+Breaks: e2fslibs-dev (<< 1.43.9-1~)
+Provides: e2fslibs-dev (= ${binary:Version})
Suggests: doc-base
-Provides: ext2fs-dev, e2p-dev
-Replaces: libkrb5-dev (<< 1.3)
Architecture: any
Description: ext2/ext3/ext4 file system libraries - headers and static libraries
The ext2, ext3 and ext4 file systems are successors of the original ext
diff --git a/debian/control.legacy-dbg b/debian/control.legacy-dbg
index 852fa236..d0184360 100644
--- a/debian/control.legacy-dbg
+++ b/debian/control.legacy-dbg
@@ -10,22 +10,22 @@ Description: debugging information for e2fsprogs
The debug information is used for execution tracing and core
dump analysis.
-Package: e2fslibs-dbg
+Package: libext2fs2-dbg
Build-Profiles: <pkg.e2fsprogs.legacy-dbg>
Section: debug
Priority: extra
-Depends: e2fslibs (= ${binary:Version}), ${misc:Depends}
+Depends: libext2fs2 (= ${binary:Version}), ${misc:Depends}
Architecture: any
Description: debugging information for e2fslibs
This package includes the debug information useful for debugging the
ext2fs and e2p libraries, contained in the e2fslibs package. The debug
information is used for execution tracing and core dump analysis.
-Package: libcomerr2-dbg
+Package: libcom-err2-dbg
Build-Profiles: <pkg.e2fsprogs.legacy-dbg>
Section: debug
Priority: extra
-Depends: libcomerr2 (= ${binary:Version}), ${misc:Depends}
+Depends: libcom-err2 (= ${binary:Version}), ${misc:Depends}
Architecture: any
Description: debugging information for libcomerr2
This package includes the debug information useful for debugging the
diff --git a/debian/e2fsprogs-udeb.lintian-overrides b/debian/e2fsprogs-udeb.lintian-overrides
new file mode 100644
index 00000000..683a11fc
--- /dev/null
+++ b/debian/e2fsprogs-udeb.lintian-overrides
@@ -0,0 +1,2 @@
+e2fsprogs-udeb udeb: package-name-doesnt-match-sonames libcom-err2 libe2p2 libext2fs2 libss2
+
diff --git a/debian/e2fsprogs.shlibs.local b/debian/e2fsprogs.shlibs.local
index 5390fd8c..49d1cbb7 100644
--- a/debian/e2fsprogs.shlibs.local
+++ b/debian/e2fsprogs.shlibs.local
@@ -1,4 +1,4 @@
-libcom_err 2 libcomerr2 (>= 1.42~WIP-2011-10-05-1)
+libcom_err 2 libcom-err2 (>= 1.42~WIP-2011-10-05-1)
libss 2 libss2 (>= 1.34-1)
-libext2fs 2 e2fslibs (= ${binary:Version})
-libe2p 2 e2fslibs (= ${binary:Version})
+libext2fs 2 libext2fs2 (= ${binary:Version})
+libe2p 2 libext2fs2 (= ${binary:Version})
diff --git a/debian/libcomerr2.copyright b/debian/libcom-err2.copyright
index 578628a5..578628a5 100644
--- a/debian/libcomerr2.copyright
+++ b/debian/libcom-err2.copyright
diff --git a/debian/libcomerr2.files b/debian/libcom-err2.files
index 16b039ef..16b039ef 100644
--- a/debian/libcomerr2.files
+++ b/debian/libcom-err2.files
diff --git a/debian/libcomerr2.symbols b/debian/libcom-err2.symbols
index ce3b74a1..7742e2ee 100644
--- a/debian/libcomerr2.symbols
+++ b/debian/libcom-err2.symbols
@@ -1,4 +1,4 @@
-libcom_err.so.2 libcomerr2 #MINVER#
+libcom_err.so.2 libcom-err2 #MINVER#
_et_dynamic_list@Base 1.38
_et_list@Base 1.01
add_error_table@Base 1.34
diff --git a/debian/e2fslibs-dev.doc-base b/debian/libext2fs-dev.doc-base
index 19d04f42..cef5974b 100644
--- a/debian/e2fslibs-dev.doc-base
+++ b/debian/libext2fs-dev.doc-base
@@ -6,5 +6,5 @@ Abstract: The EXT2FS library is designed to allow
Section: Programming
Format: HTML
-Index: /usr/share/doc/e2fslibs/html-info/libext2fs.html
-Files: /usr/share/doc/e2fslibs/html-info/*.html
+Index: /usr/share/doc/libext2fs/html-info/libext2fs.html
+Files: /usr/share/doc/libext2fs/html-info/*.html
diff --git a/debian/e2fslibs-dev.files b/debian/libext2fs-dev.files
index b2cd6c92..b2cd6c92 100644
--- a/debian/e2fslibs-dev.files
+++ b/debian/libext2fs-dev.files
diff --git a/debian/e2fslibs.files b/debian/libext2fs2.files
index 11198f76..11198f76 100644
--- a/debian/e2fslibs.files
+++ b/debian/libext2fs2.files
diff --git a/debian/e2fslibs.symbols b/debian/libext2fs2.symbols
index 777649f5..38858f05 100644
--- a/debian/e2fslibs.symbols
+++ b/debian/libext2fs2.symbols
@@ -1,4 +1,4 @@
-libe2p.so.2 e2fslibs #MINVER#
+libe2p.so.2 libext2fs2 #MINVER#
e2p_edit_feature2@Base 1.40.7
e2p_edit_feature@Base 1.37
e2p_edit_mntopts@Base 1.37
@@ -37,7 +37,7 @@ libe2p.so.2 e2fslibs #MINVER#
print_fs_state@Base 1.37
setflags@Base 1.37
setversion@Base 1.37
-libext2fs.so.2 e2fslibs #MINVER#
+libext2fs.so.2 libext2fs2 #MINVER#
badblocks_list_add@Base 1.37
badblocks_list_create@Base 1.37
badblocks_list_free@Base 1.37
diff --git a/debian/rules b/debian/rules
index 3d95d986..b6df0230 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ dh_strip_args2 = -p$(1) --dbgsym-migration='$(2)-dbg (<= 1.43-1)'
else
dh_strip_args = -p$(1) --dbg-package=$(1)-dbg
dh_strip_args2 = -p$(1) --dbg-package=$(2)-dbg
-DBG_PACKAGES += -pe2fsprogs-dbg -pe2fslibs-dbg -plibcomerr2-dbg -plibss2-dbg
+DBG_PACKAGES += -pe2fsprogs-dbg -plibext2fs-dbg -plibcom-err2-dbg -plibss2-dbg
export DEB_BUILD_PROFILES += pkg.e2fsprogs.legacy-dbg
endif
@@ -78,15 +78,15 @@ topdir ?= $(shell pwd)
debdir ?= ${topdir}/debian
tmpdir ?= ${debdir}/tmp
udebdir ?= ${debdir}/e2fsprogs-udeb
-libcomerrdir ?= ${debdir}/libcomerr${COMERR_SOVERSION}
+libcomerrdir ?= ${debdir}/libcom-err${COMERR_SOVERSION}
comerrdevdir ?= ${debdir}/comerr-dev
-libcomerrdbgdir ?= ${debdir}/libcomerr2-dbg
+libcomerrdbgdir ?= ${debdir}/libcom-err2-dbg
libssdir ?= ${debdir}/libss${SS_SOVERSION}
ssdevdir ?= ${debdir}/ss-dev
libssdbgdir ?= ${debdir}/libss2-dbg
-libext2dir ?= ${debdir}/e2fslibs
-libext2devdir ?= ${debdir}/e2fslibs-dev
-libext2dbgdir ?= ${debdir}/e2fslibs-dbg
+libext2dir ?= ${debdir}/libext2fs2
+libext2devdir ?= ${debdir}/libext2fs-dev
+libext2dbgdir ?= ${debdir}/libext2fs2-dbg
maindir ?= ${debdir}/e2fsprogs
e2fsckstaticdir ?= ${debdir}/e2fsck-static
debugdir ?= ${debdir}/e2fsprogs-dbg
@@ -112,7 +112,7 @@ INSTALL_PROGRAM ?= $(INSTALL) -p -o root -g root -m 0755
#endif
ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS)))
-SYMBOL_LIBS := e2fslibs libcomerr2 libss2
+SYMBOL_LIBS := libext2fs libcomerr2 libss2
endif
DEFAULT_CFLAGS ?= -g -O2
@@ -379,41 +379,41 @@ binary-arch: install $(INSTALL_UDEB)
mkdir -p ${debdir}/ss-dev/usr/share/doc
ln -sf libss${SS_SOVERSION} ${debdir}/ss-dev/usr/share/doc/ss-dev
- mkdir -p ${debdir}/libcomerr${COMERR_SOVERSION}/usr/share/doc/libcomerr${COMERR_SOVERSION}
+ mkdir -p ${debdir}/libcom-err${COMERR_SOVERSION}/usr/share/doc/libcom-err${COMERR_SOVERSION}
mkdir -p ${debdir}/comerr-dev/usr/share/doc
- ln -sf libcomerr${COMERR_SOVERSION} ${debdir}/comerr-dev/usr/share/doc/comerr-dev
+ ln -sf libcom-err${COMERR_SOVERSION} ${debdir}/comerr-dev/usr/share/doc/comerr-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
+ mkdir -p ${debdir}/libext2fs2/usr/share/doc/libext2fs
+ mkdir -p ${debdir}/libext2fs-dev/usr/share/doc
+ ln -sf libext2fs2 ${debdir}/libext2fs-dev/usr/share/doc/libext2fs-dev
dh_installdocs -a -Ne2fsprogs-udeb
# HTML docs
- $(INSTALL) -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
+ $(INSTALL) -d ${debdir}/libext2fs-dev/usr/share/doc/libext2fs/html-info/
$(INSTALL) -p -m 0644 ${stdbuilddir}/doc/*.html \
- ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
- $(INSTALL) -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
+ ${debdir}/libext2fs-dev/usr/share/doc/libext2fs/html-info/
+ $(INSTALL) -d ${debdir}/comerr-dev/usr/share/doc/libcom-err${COMERR_SOVERSION}/html-info/
$(INSTALL) -p -m 0644 ${stdbuilddir}/lib/et/*.html \
- ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
+ ${debdir}/comerr-dev/usr/share/doc/libcom-err${COMERR_SOVERSION}/html-info/
# texinfo docs
- mkdir -p ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}
+ mkdir -p ${debdir}/comerr-dev/usr/share/doc/libcom-err${COMERR_SOVERSION}
$(INSTALL) -p -m 0644 ${topdir}/doc/libext2fs.texinfo \
- ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/libext2fs.texi
+ ${debdir}/libext2fs-dev/usr/share/doc/libext2fs/libext2fs.texi
$(INSTALL) -p -m 0644 ${topdir}/lib/et/com_err.texinfo \
- ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/com_err.texi
+ ${debdir}/comerr-dev/usr/share/doc/libcom-err${COMERR_SOVERSION}/com_err.texi
- $(INSTALL) -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/examples
+ $(INSTALL) -d ${debdir}/comerr-dev/usr/share/doc/libcom-err${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
+ ${debdir}/comerr-dev/usr/share/doc/libcom-err${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
dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
- dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info
+ dh_installinfo -plibext2fs-dev ${stdbuilddir}/doc/libext2fs.info
dh_installchangelogs -a
dh_fixperms -a
@@ -421,9 +421,9 @@ binary-arch: install $(INSTALL_UDEB)
ifneq ($(SKIP_E2FSCK_STATIC),yes)
dh_strip $(call dh_strip_args2,e2fsck-static,e2fsprogs)
endif
- dh_strip $(call dh_strip_args,e2fslibs)
+ dh_strip $(call dh_strip_args,libext2fs2)
dh_strip $(call dh_strip_args,libss${SS_SOVERSION})
- dh_strip $(call dh_strip_args,libcomerr${COMERR_SOVERSION})
+ dh_strip $(call dh_strip_args,libcom-err${COMERR_SOVERSION})
dh_strip -a
# dpkg symbol handling
@@ -440,6 +440,8 @@ endif
dh_makeshlibs -a --add-udeb=e2fsprogs-udeb
+ $(INSTALL) -D -p -m644 debian/e2fsprogs-udeb.lintian-overrides \
+ debian/e2fsprogs-udeb/usr/share/lintian/overrides/e2fsprogs-udeb
dh_installdeb -a
dh_shlibdeps -a -l${stdbuilddir}/lib
dh_shlibdeps -pe2fsprogs -l${stdbuilddir}/lib \
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 62988c57..52e733e3 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,2 +1,2 @@
e2fsprogs source: weak-library-dev-dependency ss-dev on libss2 (= ${mainBinary})
-e2fsprogs source: weak-library-dev-dependency comerr-dev on libcomerr2 (= ${mainBinary})
+e2fsprogs source: weak-library-dev-dependency comerr-dev on libcom-err2 (= ${mainBinary})