Updated gitignore and dpkg files.

libyal · Nov 8, 2015 · cb7a073 · cb7a073
1 parent b33faaf
commit cb7a073
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,27 +1,33 @@
 # Files to ignore by git
 #
-# Version: 20141014
+# Version: 20141227
 
 # Generic auto-generated build files
 *~
 *.a
 *.la
 *.lai
+*.lib
 *.lineno
 *.lo
+*.log
 *.Plo
 *.Po
 *.o
+*.obj
 *.so
 *.so.[0-9][0-9]*
 *.so.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*
+*.swp
+*.trs
 *.Tpo
 .deps
 .libs
 INSTALL
 Makefile
+Makefile.bcc
 Makefile.in
-stamp-h1
+stamp-h[1-9]
 
 # Specific auto-generated build files
 /ABOUT-NLS

diff --git a/ChangeLog b/ChangeLog
@@ -69,6 +69,11 @@ Tests:
   - compressed (done)
   - (compressed) with parent (done)
 
+20141229
+* updated dpkg files
+* updated dependencies
+* updated .gitignore
+
 20141221
 * worked on Python 3 support
 * worked on tests

diff --git a/Makefile.am b/Makefile.am
@@ -29,14 +29,15 @@ SUBDIRS = \
 DPKG_FILES = \
 	dpkg/changelog \
 	dpkg/changelog.in \
-       	dpkg/compat \
-       	dpkg/control \
-       	dpkg/copyright \
-       	dpkg/copyright.in \
-       	dpkg/rules \
-       	dpkg/libvmdk-dev.docs \
-       	dpkg/libvmdk.docs \
-       	dpkg/libvmdk-tools.docs
+	dpkg/compat \
+	dpkg/control \
+	dpkg/copyright \
+	dpkg/copyright.in \
+	dpkg/rules \
+	dpkg/libvmdk-dev.docs \
+	dpkg/libvmdk.docs \
+	dpkg/libvmdk-tools.docs \
+	dpkg/source/format
 
 GETTEXT_FILES = \
 	config.rpath \

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
 
 AC_INIT(
  [libvmdk],
- [20141221],
+ [20141229],
  [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(

diff --git a/dpkg/control b/dpkg/control
@@ -1,13 +1,12 @@
 Source: libvmdk
-Section: unknown
+Section: libs
 Priority: extra
 Maintainer: Joachim Metz <joachim.metz@gmail.com>
 Build-Depends: debhelper (>= 7), autotools-dev, zlib1g-dev, libfuse-dev, python-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.5
 Homepage: https://github.com/libyal/libvmdk/
 
 Package: libvmdk
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libvmdk-dbg
@@ -17,36 +16,36 @@ Description: Library to access the VMware Virtual Disk (VMDK) format
 Package: libvmdk-dbg
 Architecture: any
 Section: debug
-Depends: libvmdk (= ${Source-Version}), ${misc:Depends}
+Depends: libvmdk (= ${binary:Version}), ${misc:Depends}
 Description: Debugging symbols for libvmdk
  Debugging symbols for libvmdk.
 
 Package: libvmdk-dev
 Section: libdevel
 Architecture: any
-Depends: libvmdk (= ${Source-Version})
+Depends: libvmdk (= ${binary:Version}), ${misc:Depends}
 Description: Header files and libraries for developing applications for libvmdk
  Header files and libraries for developing applications for libvmdk.
 
 Package: libvmdk-tools
 Section: utils
 Architecture: any
-Depends: libvmdk (= ${Source-Version}), ${shlibs:Depends}
+Depends: libvmdk (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Several tools for reading VMware Virtual Disk (VMDK) files
  Several tools for reading VMware Virtual Disk (VMDK) files.
 
 Package: libvmdk-python
 Section: python
 Architecture: any
-Depends: libvmdk (= ${Source-Version}), ${shlibs:Depends}, ${python:Depends}
+Depends: libvmdk (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libvmdk-python-dbg
 Description: Python bindings for libvmdk
  Python bindings for libvmdk.
 
 Package: libvmdk-python-dbg
 Section: debug
 Architecture: any
-Depends: libvmdk-python (= ${Source-Version})
+Depends: libvmdk-python (= ${binary:Version}), ${misc:Depends}
 Description: Debugging symbols for libvmdk-python
  Debugging symbols for libvmdk-python.
 
diff --git a/dpkg/rules b/dpkg/rules
@@ -88,7 +88,7 @@ endif
 
 .PHONY: override_dh_shlibdeps
 override_dh_shlibdeps:
-	dh_shlibdeps -Llibvmdk -l${PWD}/debian/tmp/usr/lib
+	dh_shlibdeps -Llibvmdk -l${CURDIR}/debian/tmp/usr/lib
 
 .PHONY: override_dh_makeshlibs
 override_dh_makeshlibs:

diff --git a/dpkg/source/format b/dpkg/source/format
@@ -0,0 +1 @@
+1.0
diff --git a/pyvmdk/pyvmdk_file_object_io_handle.c b/pyvmdk/pyvmdk_file_object_io_handle.c
@@ -1270,7 +1270,6 @@ int pyvmdk_file_object_get_size(
 {
 	PyObject *method_name   = NULL;
 	PyObject *method_result = NULL;
-	char *error_string      = NULL;
 	static char *function   = "pyvmdk_file_object_get_size";
 
 	if( file_object == NULL )