Update debian package

diff --git a/debian/changelog b/debian/changelog
index ae75197e15ba773f4d29b1bf66adb1a7eed5f564..a958b472de8366a00cfb081d4a4cbf4b40c7ed94 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,68 +2,68 @@ wimlib (1.4.1-1) unstable; urgency=low
 
   * Update to v1.4.1
 
 
   * Update to v1.4.1
 

- -- Eric Biggers <ebiggers3gmail.com>  Mon, 20 May 2013 14:01:44 -0500
+ -- Eric Biggers <ebiggers3@gmail.com>  Mon, 20 May 2013 14:01:44 -0500

 
 wimlib (1.4.0-1) unstable; urgency=low
 
   * Update to v1.4.0; moved wimlib-imagex and mkwinpeimg to "wimtools"
     package.
 
 
 wimlib (1.4.0-1) unstable; urgency=low
 
   * Update to v1.4.0; moved wimlib-imagex and mkwinpeimg to "wimtools"
     package.
 

- -- Eric Biggers <ebiggers3gmail.com>  Sun, 12 May 2013 22:59:55 -0500
+ -- Eric Biggers <ebiggers3@gmail.com>  Sun, 12 May 2013 22:59:55 -0500

 
 wimlib (1.3.3-1) unstable; urgency=low
 
   * Update to v1.3.3
 
 
 wimlib (1.3.3-1) unstable; urgency=low
 
   * Update to v1.3.3
 

- -- Eric Biggers <ebiggers3gmail.com>  Mon, 08 Apr 2013 00:16:50 -0500
+ -- Eric Biggers <ebiggers3@gmail.com>  Mon, 08 Apr 2013 00:16:50 -0500

 
 wimlib (1.3.2-1) unstable; urgency=low
 
   * Update to v1.3.2
 
 
 wimlib (1.3.2-1) unstable; urgency=low
 
   * Update to v1.3.2
 

- -- Eric Biggers <ebiggers3gmail.com>  Sat, 23 Mar 2013 20:00:14 -0500
+ -- Eric Biggers <ebiggers3@gmail.com>  Sat, 23 Mar 2013 20:00:14 -0500

 
 wimlib (1.3.1-1) unstable; urgency=low
 
   * Update to v1.3.1
 
 
 wimlib (1.3.1-1) unstable; urgency=low
 
   * Update to v1.3.1
 

- -- Eric Biggers <ebiggers3gmail.com>  Fri, 22 Mar 2013 01:05:27 -0500
+ -- Eric Biggers <ebiggers3@gmail.com>  Fri, 22 Mar 2013 01:05:27 -0500

 
 wimlib (1.3.0-1) unstable; urgency=low
 
   * Update to v1.3.0
 
 
 wimlib (1.3.0-1) unstable; urgency=low
 
   * Update to v1.3.0
 

- -- Eric Biggers <ebiggers3gmail.com>  Sun, 10 Mar 2013 18:46:29 -0700
+ -- Eric Biggers <ebiggers3@gmail.com>  Sun, 10 Mar 2013 18:46:29 -0700

 
 wimlib (1.2.6-1) unstable; urgency=low
 
   * Update to v1.2.6
 
 
 wimlib (1.2.6-1) unstable; urgency=low
 
   * Update to v1.2.6
 

- -- Eric Biggers <ebiggers3gmail.com>  Tue, 05 Mar 2013 14:26:59 -0600
+ -- Eric Biggers <ebiggers3@gmail.com>  Tue, 05 Mar 2013 14:26:59 -0600

 
 wimlib (1.2.5-1) unstable; urgency=low
 
   * Update to v1.2.5
 
 
 wimlib (1.2.5-1) unstable; urgency=low
 
   * Update to v1.2.5
 

- -- Eric Biggers <ebiggers3gmail.com>  Tue, 05 Feb 2013 20:26:47 -0600
+ -- Eric Biggers <ebiggers3@gmail.com>  Tue, 05 Feb 2013 20:26:47 -0600

 
 wimlib (1.2.4-1) unstable; urgency=low
 
   * Update to v1.2.4
 
 
 wimlib (1.2.4-1) unstable; urgency=low
 
   * Update to v1.2.4
 

- -- Eric Biggers <ebiggers3gmail.com>  Tue, 29 Jan 2013 20:19:29 -0600
+ -- Eric Biggers <ebiggers3@gmail.com>  Tue, 29 Jan 2013 20:19:29 -0600

 
 wimlib (1.2.3-1) unstable; urgency=low
 
   * Update to v1.2.3
 
 
 wimlib (1.2.3-1) unstable; urgency=low
 
   * Update to v1.2.3
 

- -- Eric Biggers <ebiggers3gmail.com>  Mon, 31 Dec 2012 14:33:36 -0600
+ -- Eric Biggers <ebiggers3@gmail.com>  Mon, 31 Dec 2012 14:33:36 -0600

 
 wimlib (1.2.2-1) unstable; urgency=low
 
   * Update to v1.2.2
 
 
 wimlib (1.2.2-1) unstable; urgency=low
 
   * Update to v1.2.2
 

- -- Eric Biggers <ebiggers3gmail.com>  Fri, 21 Dec 2012 12:39:22 -0600
+ -- Eric Biggers <ebiggers3@gmail.com>  Fri, 21 Dec 2012 12:39:22 -0600

 
 wimlib (1.2.1-1) unstable; urgency=low
 
 
 wimlib (1.2.1-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index b6921a000898774742762efaa8949a256fe0ca4a..6193389fdd0dd9a061d1781d904e20c227b645af 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Priority: optional
 Maintainer: Eric Biggers <ebiggers3@gmail.com>
 Build-Depends: debhelper (>= 8.9.7), autotools-dev, pkg-config,
                libfuse-dev, libxml2-dev, libssl-dev,
 Maintainer: Eric Biggers <ebiggers3@gmail.com>
 Build-Depends: debhelper (>= 8.9.7), autotools-dev, pkg-config,
                libfuse-dev, libxml2-dev, libssl-dev,

-               ntfs-3g-dev (>= 2011.4.12), attr-dev, bash, attr
+               ntfs-3g-dev (>= 2011.4.12), attr-dev, attr

 Build-Depends-Indep: doxygen
 Build-Depends-Indep: doxygen

-Standards-Version: 3.9.2
+Standards-Version: 3.9.3

 Section: libs
 Homepage: http://sourceforge.net/projects/wimlib
 Vcs-Git: git://git.code.sf.net/p/wimlib/code
 Section: libs
 Homepage: http://sourceforge.net/projects/wimlib
 Vcs-Git: git://git.code.sf.net/p/wimlib/code

diff --git a/debian/copyright b/debian/copyright
index f44bd59c32e63c44157868f4428d9d9ac8f4157e..d527408754a85f8a199c83c6e433037f1cf8f654 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,13 +9,13 @@ License: GPLv3+
  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.
  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 library 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.
  This library 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/>
  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
  3 can be found in "/usr/share/common-licenses/GPL-3".
  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-doc.docs b/debian/wimlib-doc.docs
index b2ea5b5fa8b3ef6338768cf2e029c60405c9cbb4..a6af802829a3a8003570da4e07dd3429764c6bb7 100644 (file)
--- a/debian/wimlib-doc.docs
+++ b/debian/wimlib-doc.docs
@@ -2,4 +2,3 @@ doc/html
 AUTHORS
 NEWS
 README
 AUTHORS
 NEWS
 README

-README.WINDOWS

diff --git a/debian/wimlib7.install b/debian/wimlib7.install
new file mode 100644 (file)
index 0000000..8161387
--- /dev/null
+++ b/debian/wimlib7.install
@@ -0,0 +1 @@
+usr/lib/libwim.so.*

diff --git a/doc/imagex-capture.1.in b/doc/imagex-capture.1.in
index 3685e8ee1d19db431a7e49c88c7928bb4306ec92..c345bd66a5b43a447a4981afdeb90033ac6fd38d 100644 (file)
--- a/doc/imagex-capture.1.in
+++ b/doc/imagex-capture.1.in
@@ -193,7 +193,7 @@ For compatibility with Windows, the path separators in the globs may be either
 forward slashes or backslashes, and the line separators may be either UNIX-style
 or DOS-style.  Globs with spaces in them must be quoted, and leading and
 trailing whitespace is not significant.  Empty lines and lines beginning with
 forward slashes or backslashes, and the line separators may be either UNIX-style
 or DOS-style.  Globs with spaces in them must be quoted, and leading and
 trailing whitespace is not significant.  Empty lines and lines beginning with

-'#' or whitespace followed by '#' are ignored.
+\'#' or whitespace followed by '#' are ignored.

 .IP ""
 Paths may not have drive letters in them, as they are all relative to the root
 of capture and not absolute external paths.
 .IP ""
 Paths may not have drive letters in them, as they are all relative to the root
 of capture and not absolute external paths.

diff --git a/make-release b/make-release
index 5ff293ed9e09fe28e9206356e606d72ea6de3c77..fad85cf52366be93f4e3a46251e84fb0c7300836 100755 (executable)
--- a/make-release
+++ b/make-release
@@ -32,7 +32,7 @@ wimlib ($newver-1) unstable; urgency=low\\
 \\
   * Update to v$newver\\
 \\
 \\
   * Update to v$newver\\
 \\

- -- Eric Biggers <ebiggers3gmail.com>  $(date -R)\\
+ -- Eric Biggers <ebiggers3@gmail.com>  $(date -R)\\

 " debian/changelog
 
 sed -i 's/\(Version:[[:space:]]*\)[^[:space:]]\+/\1'"$newver"'/' \
 " debian/changelog
 
 sed -i 's/\(Version:[[:space:]]*\)[^[:space:]]\+/\1'"$newver"'/' \