Debian package updates

diff --git a/debian/changelog b/debian/changelog
index ce880cad27c2f4287e93a7687503f6f4bfebcb66..a37117c894ebb8d087406c612bfcb23c6598d1bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wimlib (1.0.4-1) unstable; urgency=low
+
+  * Update to v1.0.4
+
+ -- Eric Biggers <ebiggers3@gmail.com>  Mon, 29 Oct 2012 03:57:13 +0000
+
 wimlib (0.6.3-1) unstable; urgency=low
 
   * Initial release of Debian package

diff --git a/debian/control b/debian/control
index f42524fff7a36dc071748113325a59afdaca066e..34510d8b75351a9ab51044a077a6e201e716d607 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,9 @@
 Source: wimlib
 Priority: optional
 Maintainer: Eric Biggers <ebiggers3@gmail.com>
-Build-Depends: debhelper (>= 7.0.0), autotools-dev, libfuse-dev, libxml2-dev, libssl-dev
+Build-Depends: debhelper (>= 7.0.0), autotools-dev, pkg-config,
+               libfuse-dev, libxml2-dev, libssl-dev,
+               ntfs-3g-dev (>= 2011.4.12), attr-dev, bash
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://sourceforge.net/projects/wimlib
@@ -12,11 +14,18 @@ Section: libdevel
 Architecture: any
 Depends: wimlib (= ${binary:Version})
 Description: Development files for wimlib
+ wimlib is a library that can be used to create, extract, and modify files in
+ the Windows Imaging Format. These files are normally created by the
+ 'imagex.exe' program on Windows, but this library provides a free
+ implementation of 'imagex' for UNIX-based systems. wimlib supports mounting
+ WIM files, just like imagex.exe.
 
 Package: wimlib
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libfuse2, libxml2, libssl0.9.8 | libssl1.0.0
+Depends: ${shlibs:Depends}, ${misc:Depends}, libfuse2, libxml2,
+         libssl0.9.8 | libssl1.0.0, ntfs-3g (>= 2011.4.12), attr
+Suggests: genisoimage, mtools, syslinux, cabextract, ntfsprogs
 Description: Library to extract, create, and modify WIM files
  wimlib is a library that can be used to create, extract, and modify files in
  the Windows Imaging Format. These files are normally created by the

diff --git a/debian/copyright b/debian/copyright
index b0ab08b65bf2bb7ad33c8407805434f30a4e494e..f44bd59c32e63c44157868f4428d9d9ac8f4157e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,28 +14,8 @@ License: GPLv3+
  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
- You should have received a copy of the GNU General Public License along with
- this library; if not, write to the Free Software Foundation, Inc., 59 Temple
- Place, Suite 330, Boston, MA 02111-1307 USA
-
-Files: debian/*
-Copyright: 2012 Eric Biggers <ebiggers3@gmail.com>
-License: GPL-3+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+ On Debian systems, the complete text of the GNU General Public License version
+ 3 can be found in "/usr/share/common-licenses/GPL-3".

diff --git a/debian/wimlib-dev.install b/debian/wimlib-dev.install
index 525ba51626537ae54444915d4e146087047f29fe..aff5182a4a36b3943844a2e7dc956645d1e595bf 100644 (file)
--- a/debian/wimlib-dev.install
+++ b/debian/wimlib-dev.install
@@ -1,3 +1,4 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/pkgconfig/*
+usr/include/wimlib.h
+usr/lib/libwim.a
+usr/lib/libwim.so
+usr/lib/pkgconfig/wimlib.pc

diff --git a/debian/wimlib.install b/debian/wimlib.install
index a884bdf43d5b356efbd3d87723b4cc28c293ff2a..5cdf88470bd090e4b6a60105841182af3511bb37 100644 (file)
--- a/debian/wimlib.install
+++ b/debian/wimlib.install
@@ -1,3 +1,3 @@
-usr/lib/lib*.so*
+usr/lib/libwim.so.*
 usr/bin/*
 usr/share/man/man1/*

diff --git a/doc/imagex-apply.1.in b/doc/imagex-apply.1.in
index 3d982a7bd2aa5d96ee75a74024b0365e863eadf4..9125d6c73ad44557c2a6e23566803cc6464b8370 100644 (file)
--- a/doc/imagex-apply.1.in
+++ b/doc/imagex-apply.1.in
@@ -1,6 +1,6 @@
 .TH IMAGEX "1" "October 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
-imagex apply \- Extract one image, or all images, from a WIM archive
+imagex-apply \- Extract one image, or all images, from a WIM archive
 
 .SH SYNOPSIS
 \fBimagex apply\fR \fIWIMFILE\fR \fIIMAGE\fR \fITARGET\fR [\fIOPTION\fR]...
@@ -181,7 +181,6 @@ mywim2.swm
 mywim3.swm
 mywim4.swm
 mywim5.swm
-\. ... etc.
 .RE
 
 To apply the first image of this split WIM to the directory "dir", we would do:

diff --git a/doc/imagex-capture.1.in b/doc/imagex-capture.1.in
index dbacc36d5dfd2696a7b025aa532ec78ee7a90be3..7365aa8d1bad18c49a1602b5293ec3f8599ab5f6 100644 (file)
--- a/doc/imagex-capture.1.in
+++ b/doc/imagex-capture.1.in
@@ -1,6 +1,6 @@
 .TH IMAGEX "1" "October 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
-imagex capture, append \- Capture a WIM image from a directory tree
+imagex-capture, imagex-append \- Capture a WIM image from a directory tree
 
 .SH SYNOPSIS
 \fBimagex capture\fR \fISOURCE\fR \fIWIMFILE\fR [\fIIMAGE_NAME\fR] \

diff --git a/doc/imagex-delete.1.in b/doc/imagex-delete.1.in
index dd3007fa8ddd0852cc7af2e7f34542b314746a36..976239eae5769415b0a374de3d4c492a571bcb9a 100644 (file)
--- a/doc/imagex-delete.1.in
+++ b/doc/imagex-delete.1.in
@@ -1,6 +1,6 @@
 .TH IMAGEX "1" "October 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
-imagex delete \- Delete an image from a WIM archive
+imagex-delete \- Delete an image from a WIM archive
 
 .SH SYNOPSIS
 \fBimagex delete\fR \fIWIMFILE\fR \fIIMAGE\fR [--check]

diff --git a/doc/imagex-dir.1.in b/doc/imagex-dir.1.in
index 3e31a0a435172181e3f9abafc8c0915dfa442a2c..7ff18e8bb2cf9ed85d0bbd8ff2af9f3f7f958002 100644 (file)
--- a/doc/imagex-dir.1.in
+++ b/doc/imagex-dir.1.in
@@ -1,6 +1,6 @@
 .TH IMAGEX "1" "October 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
-imagex dir \- Show the files contained in a WIM archive
+imagex-dir \- Show the files contained in a WIM archive
 
 .SH SYNOPSIS
 \fBimagex dir\fR \fIWIMFILE\fR \fIIMAGE\fR

diff --git a/doc/imagex-export.1.in b/doc/imagex-export.1.in
index ec53f2f967fab3c5a6c92af51c6af8a899368f5d..164b1d01d2c33c029a7822d2aa8318b54eee6d5b 100644 (file)
--- a/doc/imagex-export.1.in
+++ b/doc/imagex-export.1.in
@@ -1,6 +1,6 @@
 .TH IMAGEX "1" "October 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
-imagex export \- Exports an image from a WIM archive to an existing or new WIM archive
+imagex-export \- Exports an image from a WIM archive to an existing or new WIM archive
 
 .SH SYNOPSIS
 \fBimagex export\fR \fISRC_WIMFILE\fR (\fISRC_IMAGE_NUM\fR | \
@@ -88,7 +88,6 @@ mywim2.swm
 mywim3.swm
 mywim4.swm
 mywim5.swm
-\. ... etc.
 .RE
 
 To export the first image of this split WIM to a new or existing WIM file

diff --git a/doc/imagex-info.1.in b/doc/imagex-info.1.in
index acc2ca18fc91055e0679a33d05a5257c1381e97b..2354d311d43cf56e8524be93bec75d5a6fcf46d8 100644 (file)
--- a/doc/imagex-info.1.in
+++ b/doc/imagex-info.1.in
@@ -1,6 +1,6 @@
 .TH IMAGEX "1" "October 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
-imagex info \- Display information about a WIM file, or change information about
+imagex-info \- Display information about a WIM file, or change information about
 an image
 
 .SH SYNOPSIS

diff --git a/doc/imagex-join.1.in b/doc/imagex-join.1.in
index c6fc2626443740648cc3cb32d68c30051b69ab62..277f10a51ef8af499afb73d0c1d8cadad23eb14e 100644 (file)
--- a/doc/imagex-join.1.in
+++ b/doc/imagex-join.1.in
@@ -1,6 +1,6 @@
 .TH IMAGEX "1" "October 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
-imagex join \- Join split WIMs into a standalone one-part WIM
+imagex-join \- Join split WIMs into a standalone one-part WIM
 
 .SH SYNOPSIS
 \fBimagex join\fR [\fIOPTION...] \fIOUT_WIMFILE\fR \fISPLIT_WIM...\fR

diff --git a/doc/imagex-mount.1.in b/doc/imagex-mount.1.in
index e00e8674fee34f76a86d529960a1589151c6cb4d..89a81a0a018acbb82827b4ac6ac6dcad28986add 100644 (file)
--- a/doc/imagex-mount.1.in
+++ b/doc/imagex-mount.1.in
@@ -1,6 +1,6 @@
 .TH IMAGEX "1" "October 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
-imagex mount, mountrw, unmount \- Mount and unmount an image from a WIM archive
+imagex-mount, imagex-mountrw, imagex-unmount \- Mount and unmount an image from a WIM archive
 
 .SH SYNOPSIS
 \fBimagex mount\fR \fIWIMFILE\fR \fIIMAGE\fR \fIDIRECTORY\fR [--check]
@@ -52,7 +52,6 @@ mywim2.swm
 mywim3.swm
 mywim4.swm
 mywim5.swm
-\. ... etc.
 .RE
 
 To mount the first image of this split WIM to the directory "dir", we would do:

diff --git a/doc/imagex-split.1.in b/doc/imagex-split.1.in
index b2f5ce3319c19bbd1157b877c73619456a4e469d..5c5cb19b28c319385797ec98d03fa3bc3f8c3cb2 100644 (file)
--- a/doc/imagex-split.1.in
+++ b/doc/imagex-split.1.in
@@ -1,6 +1,6 @@
 .TH IMAGEX "1" "October 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands"
 .SH NAME
-imagex split \- Split a WIM into multiple parts
+imagex-split \- Split a WIM into multiple parts
 
 .SH SYNOPSIS
 \fBimagex split\fR \fIWIMFILE\fR \fISPLIT_WIMFILE\fR \fIPART_SIZE\fR [\fIOPTION...\fR]

diff --git a/tests/test-imagex b/tests/test-imagex
index 00bf0044711888ecd040889b7fd0239e3d40fa5f..0d49e22e63a5713868c684acf601505b0cfaab01 100755 (executable)
--- a/tests/test-imagex
+++ b/tests/test-imagex
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # This script does some sanity testing of the 'imagex' program.  It by no means
 # tests every aspect of wimlib comprehensively.

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 0e94af8124a49a531b34918f8b054a3748ae6962..dcfb27d758488e5269438762ee6ad2a4fc15ea94 100755 (executable)
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Test WIM mounting