Build cleanup and update debian changelog file for 3.1.0 update.

Document numerous bugs resolved in this release affecting Debian,
and add to LDIRT and .gitignore files for a cleaner build.

Signed-off-by: Nathan Scott <nathans@debian.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/.gitignore b/.gitignore
index 1703fdaa41c0fde8436dbadb682046123f5fdeee..b06e07489cc697251151e1379ccf64961d39a2a1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,18 +7,23 @@ include/platform_defs.h
 include/builddefs
 install-sh
 
-# magic diretory symlinks
+# magic directory symlinks
 include/disk
 include/xfs
 
-# Makepgs
-build/src-manifest
-build/xfsprogs-*.tar.gz
+# packaging
 doc/CHANGES.gz
 xfsprogs-*
+xfsprogs_*
+xfslibs-dev_*
 
 # autoconf generated files
 aclocal.m4
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
 autom4te.cache/
 config.guess
 config.log
@@ -34,9 +39,13 @@ ltmain.sh
 .libs
 
 # gettext
+po/de.mo
 po/pl.mo
 po/xfsprogs.pot
 
+# cscope stuff
+cscope.*
+
 # quilt stuff
 .pc/
 patches/

diff --git a/debian/Makefile b/debian/Makefile
index 9a284a765ef2fdd4a727613a81f1960f81f08f35..1ba204c3347e5b582b536746a839225b6813458e 100644 (file)
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -8,6 +8,8 @@ include $(TOPDIR)/include/builddefs
 LSRCFILES = changelog compat control copyright rules
 DEV_DOC_DIR = $(PKG_DOC_DIR)/../xfslibs-dev
 BOOT_MKFS_BIN = $(TOPDIR)/mkfs/mkfs.xfs-xfsprogs-udeb
+LDIRDIRT = xfslibs-dev xfsprogs xfsprogs-udeb
+LDIRT = files *.log *.substvars *.debhelper
 
 default:
 

diff --git a/debian/changelog b/debian/changelog
index 7e556148dfe3c45275f60e3869c53cdb53ac5fe8..462ebff9aa027bb778765f9425df332ffc08346a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xfsprogs (3.1.0) unstable; urgency=low
+
+  * New bugfix release
+  * Merged German translation (closes: #521389)
+  * Merged German translation update (closes: #557100)
+  * Uptodate po file is provided now (closes: #538962)
+  * Fixed typos in xfs_quota man page (closes: #481715)
+  * Tighten permissions on temp fsr files (closes: #559490)
+
+ -- Nathan Scott <nathans@debian.org>  Thu, 10 Dec 2009 09:19:37 +1100
+
 xfsprogs (3.0.4) unstable; urgency=low
 
   * New bugfix release