From fd4b7f8da1550b65583b351a9af2672e6f825963 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 29 Oct 2012 05:11:15 +0000 Subject: [PATCH] Debian package updates --- debian/changelog | 6 ++++++ debian/control | 13 +++++++++++-- debian/copyright | 24 ++---------------------- debian/wimlib-dev.install | 7 ++++--- debian/wimlib.install | 2 +- doc/imagex-apply.1.in | 3 +-- doc/imagex-capture.1.in | 2 +- doc/imagex-delete.1.in | 2 +- doc/imagex-dir.1.in | 2 +- doc/imagex-export.1.in | 3 +-- doc/imagex-info.1.in | 2 +- doc/imagex-join.1.in | 2 +- doc/imagex-mount.1.in | 3 +-- doc/imagex-split.1.in | 2 +- tests/test-imagex | 2 +- tests/test-imagex-mount | 2 +- 16 files changed, 35 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce880cad..a37117c8 100644 --- 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 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 f42524ff..34510d8b 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,9 @@ Source: wimlib Priority: optional Maintainer: Eric Biggers -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 b0ab08b6..f44bd59c 100644 --- 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 -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 - . - 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 525ba516..aff5182a 100644 --- 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 a884bdf4..5cdf8847 100644 --- 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 3d982a7b..9125d6c7 100644 --- 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 dbacc36d..7365aa8d 100644 --- 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 dd3007fa..976239ea 100644 --- 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 3e31a0a4..7ff18e8b 100644 --- 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 ec53f2f9..164b1d01 100644 --- 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 acc2ca18..2354d311 100644 --- 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 c6fc2626..277f10a5 100644 --- 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 e00e8674..89a81a0a 100644 --- 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 b2f5ce33..5c5cb19b 100644 --- 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 00bf0044..0d49e22e 100755 --- 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 0e94af81..dcfb27d7 100755 --- a/tests/test-imagex-mount +++ b/tests/test-imagex-mount @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Test WIM mounting -- 2.43.0