diff -Nru dfvfs-20190122/config/dpkg/changelog dfvfs-20190128/config/dpkg/changelog --- dfvfs-20190122/config/dpkg/changelog 2019-01-22 21:11:46.000000000 +0000 +++ dfvfs-20190128/config/dpkg/changelog 2019-01-28 19:11:44.000000000 +0000 @@ -1,5 +1,5 @@ -dfvfs (20190122-1) unstable; urgency=low +dfvfs (20190128-1) unstable; urgency=low * Auto-generated - -- Log2Timeline maintainers Tue, 22 Jan 2019 22:11:39 +0100 \ No newline at end of file + -- Log2Timeline maintainers Mon, 28 Jan 2019 17:08:52 +0100 diff -Nru dfvfs-20190122/config/linux/gift_copr_install.sh dfvfs-20190128/config/linux/gift_copr_install.sh --- dfvfs-20190122/config/linux/gift_copr_install.sh 2019-01-22 21:11:46.000000000 +0000 +++ dfvfs-20190128/config/linux/gift_copr_install.sh 2019-01-28 19:11:44.000000000 +0000 @@ -8,27 +8,27 @@ # Dependencies for running dfvfs, alphabetized, one per line. # This should not include packages only required for testing or development. -PYTHON2_DEPENDENCIES="PyYAML - libbde-python - libewf-python +PYTHON2_DEPENDENCIES="libbde-python2 + libewf-python2 libfsapfs-python2 - libfsntfs-python - libfvde-python - libfwnt-python - libqcow-python - libsigscan-python - libsmdev-python - libsmraw-python - libvhdi-python - libvmdk-python - libvshadow-python - libvslvm-python - python-backports-lzma - python-crypto - python-dfdatetime - python-dtfabric - python-pysqlite - python-pytsk3"; + libfsntfs-python2 + libfvde-python2 + libfwnt-python2 + libqcow-python2 + libsigscan-python2 + libsmdev-python2 + libsmraw-python2 + libvhdi-python2 + libvmdk-python2 + libvshadow-python2 + libvslvm-python2 + python2-backports-lzma + python2-crypto + python2-dfdatetime + python2-dtfabric + python2-pysqlite + python2-pytsk3 + python2-pyyaml"; # Additional dependencies for running tests, alphabetized, one per line. TEST_DEPENDENCIES="python2-funcsigs @@ -41,33 +41,33 @@ # Additional dependencies for debugging, alphabetized, one per line. DEBUG_DEPENDENCIES="libbde-debuginfo - libbde-python-debuginfo + libbde-python2-debuginfo libewf-debuginfo - libewf-python-debuginfo + libewf-python2-debuginfo libfsapfs-debuginfo libfsapfs-python2-debuginfo libfsntfs-debuginfo - libfsntfs-python-debuginfo + libfsntfs-python2-debuginfo libfvde-debuginfo - libfvde-python-debuginfo + libfvde-python2-debuginfo libfwnt-debuginfo - libfwnt-python-debuginfo + libfwnt-python2-debuginfo libqcow-debuginfo - libqcow-python-debuginfo + libqcow-python2-debuginfo libsigscan-debuginfo - libsigscan-python-debuginfo + libsigscan-python2-debuginfo libsmdev-debuginfo - libsmdev-python-debuginfo + libsmdev-python2-debuginfo libsmraw-debuginfo - libsmraw-python-debuginfo + libsmraw-python2-debuginfo libvhdi-debuginfo - libvhdi-python-debuginfo + libvhdi-python2-debuginfo libvmdk-debuginfo - libvmdk-python-debuginfo + libvmdk-python2-debuginfo libvshadow-debuginfo - libvshadow-python-debuginfo + libvshadow-python2-debuginfo libvslvm-debuginfo - libvslvm-python-debuginfo"; + libvslvm-python2-debuginfo"; sudo dnf install dnf-plugins-core sudo dnf copr -y enable @gift/dev diff -Nru dfvfs-20190122/debian/changelog dfvfs-20190128/debian/changelog --- dfvfs-20190122/debian/changelog 2019-01-23 00:17:32.000000000 +0000 +++ dfvfs-20190128/debian/changelog 2019-01-30 08:01:38.000000000 +0000 @@ -1,3 +1,9 @@ +dfvfs (20190128-1) unstable; urgency=medium + + * New upstream version 20190128 + + -- Hilko Bengen Wed, 30 Jan 2019 09:01:38 +0100 + dfvfs (20190122-1) unstable; urgency=medium * New upstream version 20190122 diff -Nru dfvfs-20190122/dependencies.ini dfvfs-20190128/dependencies.ini --- dfvfs-20190122/dependencies.ini 2019-01-22 21:11:46.000000000 +0000 +++ dfvfs-20190128/dependencies.ini 2019-01-28 19:11:44.000000000 +0000 @@ -3,19 +3,19 @@ minimum_version: 2.6 l2tbinaries_name: pycrypto pypi_name: pycrypto -rpm_name: python-crypto +rpm_name: python2-crypto version_property: __version__ [dfdatetime] dpkg_name: python-dfdatetime minimum_version: 20181025 -rpm_name: python-dfdatetime +rpm_name: python2-dfdatetime version_property: __version__ [dtfabric] dpkg_name: python-dtfabric minimum_version: 20170524 -rpm_name: python-dtfabric +rpm_name: python2-dtfabric version_property: __version__ [lzma] @@ -24,7 +24,7 @@ l2tbinaries_name: backports.lzma pypi_name: backports.lzma python2_only: true -rpm_name: python-backports-lzma +rpm_name: python2-backports-lzma version_property: __version__ [pybde] @@ -32,7 +32,7 @@ l2tbinaries_name: libbde minimum_version: 20140531 pypi_name: libbde-python -rpm_name: libbde-python +rpm_name: libbde-python2 version_property: get_version() [pyewf] @@ -40,7 +40,7 @@ l2tbinaries_name: libewf minimum_version: 20131210 pypi_name: libewf-python -rpm_name: libewf-python +rpm_name: libewf-python2 version_property: get_version() [pyfsapfs] @@ -56,7 +56,7 @@ l2tbinaries_name: libfsntfs minimum_version: 20151130 pypi_name: libfsntfs-python -rpm_name: libfsntfs-python +rpm_name: libfsntfs-python2 version_property: get_version() [pyfvde] @@ -64,7 +64,7 @@ l2tbinaries_name: libfvde minimum_version: 20160719 pypi_name: libfvde-python -rpm_name: libfvde-python +rpm_name: libfvde-python2 version_property: get_version() [pyfwnt] @@ -72,7 +72,7 @@ l2tbinaries_name: libfwnt minimum_version: 20160418 pypi_name: libfwnt-python -rpm_name: libfwnt-python +rpm_name: libfwnt-python2 version_property: get_version() [pyqcow] @@ -80,7 +80,7 @@ l2tbinaries_name: libqcow minimum_version: 20131204 pypi_name: libqcow-python -rpm_name: libqcow-python +rpm_name: libqcow-python2 version_property: get_version() [pysigscan] @@ -88,7 +88,7 @@ l2tbinaries_name: libsigscan minimum_version: 20150627 pypi_name: libsigscan-python -rpm_name: libsigscan-python +rpm_name: libsigscan-python2 version_property: get_version() [pysmdev] @@ -96,7 +96,7 @@ l2tbinaries_name: libsmdev minimum_version: 20140529 pypi_name: libsmdev-python -rpm_name: libsmdev-python +rpm_name: libsmdev-python2 version_property: get_version() [pysmraw] @@ -104,13 +104,13 @@ l2tbinaries_name: libsmraw minimum_version: 20140612 pypi_name: libsmraw-python -rpm_name: libsmraw-python +rpm_name: libsmraw-python2 version_property: get_version() [pytsk3] dpkg_name: python-pytsk3 minimum_version: 20160721 -rpm_name: python-pytsk3 +rpm_name: python2-pytsk3 version_property: get_version() [pyvhdi] @@ -118,7 +118,7 @@ l2tbinaries_name: libvhdi minimum_version: 20131210 pypi_name: libvhdi-python -rpm_name: libvhdi-python +rpm_name: libvhdi-python2 version_property: get_version() [pyvmdk] @@ -126,7 +126,7 @@ l2tbinaries_name: libvmdk minimum_version: 20140421 pypi_name: libvmdk-python -rpm_name: libvmdk-python +rpm_name: libvmdk-python2 version_property: get_version() [pyvshadow] @@ -134,7 +134,7 @@ l2tbinaries_name: libvshadow minimum_version: 20160109 pypi_name: libvshadow-python -rpm_name: libvshadow-python +rpm_name: libvshadow-python2 version_property: get_version() [pyvslvm] @@ -142,7 +142,7 @@ l2tbinaries_name: libvslvm minimum_version: 20160109 pypi_name: libvslvm-python -rpm_name: libvslvm-python +rpm_name: libvslvm-python2 version_property: get_version() [sqlite3] @@ -150,7 +150,7 @@ l2tbinaries_name: pysqlite pypi_name: pysqlite python2_only: true -rpm_name: python-pysqlite +rpm_name: python2-pysqlite version_property: __version__ [yaml] @@ -158,5 +158,5 @@ l2tbinaries_name: PyYAML minimum_version: 3.10 pypi_name: PyYAML -rpm_name: PyYAML +rpm_name: python2-pyyaml version_property: __version__ diff -Nru dfvfs-20190122/dfvfs/__init__.py dfvfs-20190128/dfvfs/__init__.py --- dfvfs-20190122/dfvfs/__init__.py 2019-01-22 21:11:46.000000000 +0000 +++ dfvfs-20190128/dfvfs/__init__.py 2019-01-28 19:11:44.000000000 +0000 @@ -6,4 +6,4 @@ storage media types and file formats. """ -__version__ = '20190122' +__version__ = '20190128' diff -Nru dfvfs-20190122/setup.cfg dfvfs-20190128/setup.cfg --- dfvfs-20190122/setup.cfg 2019-01-22 21:11:46.000000000 +0000 +++ dfvfs-20190128/setup.cfg 2019-01-28 19:11:44.000000000 +0000 @@ -16,28 +16,28 @@ AUTHORS LICENSE README -build_requires = python-setuptools -requires = PyYAML >= 3.10 - libbde-python >= 20140531 - libewf-python >= 20131210 +build_requires = python2-setuptools +requires = libbde-python2 >= 20140531 + libewf-python2 >= 20131210 libfsapfs-python2 >= 20181205 - libfsntfs-python >= 20151130 - libfvde-python >= 20160719 - libfwnt-python >= 20160418 - libqcow-python >= 20131204 - libsigscan-python >= 20150627 - libsmdev-python >= 20140529 - libsmraw-python >= 20140612 - libvhdi-python >= 20131210 - libvmdk-python >= 20140421 - libvshadow-python >= 20160109 - libvslvm-python >= 20160109 - python-backports-lzma - python-crypto >= 2.6 - python-dfdatetime >= 20181025 - python-dtfabric >= 20170524 - python-pysqlite - python-pytsk3 >= 20160721 + libfsntfs-python2 >= 20151130 + libfvde-python2 >= 20160719 + libfwnt-python2 >= 20160418 + libqcow-python2 >= 20131204 + libsigscan-python2 >= 20150627 + libsmdev-python2 >= 20140529 + libsmraw-python2 >= 20140612 + libvhdi-python2 >= 20131210 + libvmdk-python2 >= 20140421 + libvshadow-python2 >= 20160109 + libvslvm-python2 >= 20160109 + python2-backports-lzma + python2-crypto >= 2.6 + python2-dfdatetime >= 20181025 + python2-dtfabric >= 20170524 + python2-pysqlite + python2-pytsk3 >= 20160721 + python2-pyyaml >= 3.10 [bdist_wheel] universal = 1 diff -Nru dfvfs-20190122/setup.py dfvfs-20190128/setup.py --- dfvfs-20190122/setup.py 2019-01-22 21:11:46.000000000 +0000 +++ dfvfs-20190128/setup.py 2019-01-28 19:11:44.000000000 +0000 @@ -96,7 +96,7 @@ python_spec_file = [] for line in iter(spec_file): if line.startswith('Summary: '): - summary = line + summary = line[9:] elif line.startswith('BuildRequires: '): line = 'BuildRequires: {0:s}-setuptools, {0:s}-devel'.format( @@ -107,6 +107,7 @@ if python_package == 'python3': requires = requires.replace('python-', 'python3-') requires = requires.replace('python2-', 'python3-') + continue elif line.startswith('%description'): in_description = True @@ -166,10 +167,15 @@ python_spec_file.extend([ 'Obsoletes: python-dfvfs < %{version}', 'Provides: python-dfvfs = %{version}']) + python_summary = 'Python 2 module of {0:s}'.format(summary) + else: + python_summary = 'Python 3 module of {0:s}'.format(summary) + + if requires: + python_spec_file.append('Requires: {0:s}'.format(requires)) python_spec_file.extend([ - 'Requires: {0:s}'.format(requires), - '{0:s}'.format(summary), + 'Summary: {0:s}'.format(python_summary), '', '%description -n {0:s}-%{{name}}'.format(python_package)])