Control: tag -1 patch
Dear maintainer,
I have uploaded a fixed package to DELAYED/10; please feel free to
reschedule or cancel my upload as you see fit. The patches I applied to
my local git clone are attached to this mail.
Cheers,
-Hilko
>From 89bc2d6ac0cf92c65ef015b239928b54b0ae9270 Mon Sep 17 00:00:00 2001
From: Hilko Bengen
Date: Fri, 21 Dec 2018 23:16:58 +0100
Subject: [PATCH 1/3] Add python3- prefix to dtfabric, introduce Python 2
package (Closes: #917042)
---
debian/README.Debian | 6 --
debian/changelog | 6 ++
debian/control | 30 +-
debian/rules | 12 +---
4 files changed, 40 insertions(+), 14 deletions(-)
delete mode 100644 debian/README.Debian
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 26612ca..000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-dtfabric for Debian
-
-Since python 2.7 python will EOL in 2020, I only enable python 3 in this
-package. Furthermore, I removed the dtfabric script extension.
-
- -- SZ Lin (林上智) Wed, 12 Sep 2018 20:29:43 +0800
diff --git a/debian/changelog b/debian/changelog
index a6b87e6..89106a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dtfabric (20180808-2) UNRELEASED; urgency=medium
+
+ * Add python3- prefix to dtfabric, introduce Python 2 package
+
+ -- Hilko Bengen Fri, 21 Dec 2018 23:16:09 +0100
+
dtfabric (20180808-1) unstable; urgency=low
* Initial release (Closes: #908665)
diff --git a/debian/control b/debian/control
index 2975362..562631e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,27 +4,47 @@ Priority: optional
Maintainer: SZ Lin (林上智)
Build-Depends: debhelper (>= 11),
dh-python,
- python3-all,
- python3-setuptools,
- python3-yaml
+ python-all, python3-all,
+ python-setuptools, python3-setuptools,
+ python-yaml, python3-yaml,
Standards-Version: 4.2.1
Homepage: https://github.com/libyal/dtfabric
Vcs-Git: https://salsa.debian.org/debian/dtfabric.git
Vcs-Browser: https://salsa.debian.org/debian/dtfabric
Testsuite: autopkgtest-pkg-python
-Package: dtfabric
+Package: python-dtfabric
Architecture: all
Multi-Arch: foreign
+Depends: ${misc:Depends}, ${python:Depends},
+ python3-yaml
+Description: Tooling for data type and structure management
+ Data types fabric (dtFabric) is a proof-of-concept YAML-based
+ definition language to specify format and data types.
+ .
+ Supported data types
+ .
+ Storage data types, such as integers, characters, structures
+ Semantic data types, such as constants, enumerations
+ Layout data types, such as format, vectors, trees
+ .
+ This package contains the Python 2 version of the package.
+
+Package: python3-dtfabric
+Architecture: all
+Breaks: dtfabric (<< 20180808-1.1)
+Replaces: dtfabric (<< 20180808-1.1)
+Multi-Arch: foreign
Depends: ${misc:Depends}, ${python3:Depends},
python3-yaml
Description: Tooling for data type and structure management
Data types fabric (dtFabric) is a proof-of-concept YAML-based
definition language to specify format and data types.
.
- Support data types
+ Supported data types
.
Storage data types, such as integers, characters, structures
Semantic data types, such as constants, enumerations
Layout data types, such as format, vectors, trees
.
+ This package contains the Python 3 version of the package.
diff --git a/debian/rules b/debian/rules
index 418db83..216412f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,17 @@
export PYBUILD_NAME:=dtfabric
%:
- dh $@ --with python3 --buildsystem=pybuild
-
+ dh $@ --with python2,python3 --buildsystem=pybuild
+
override_dh_install:
dh_install
- mv debian/dtfabric/usr/bin/validate-definitions.py debian/dtfabric/usr/bin/validate-definitions
+ mv debian/python3-dtfabric/usr/bin/validate-definitions.py \
+ debian/python3-dtfabric/usr/bin/validate-definitions
+ mv debian/python3-dtfabric/usr/share/doc/dtfabric \
+ debian/python3-dtfabric/usr/share/doc/python3-dtfabric
+ mv debian/python-dtfabric/usr/share/doc/dtfabric \
+ debian/python-dtfabric/usr/share/doc/python-dtfabric
+ rm -rf debian/python-dtfabric/usr/bin
override_dh_auto_install:
dh_auto_install
--
2.19.1
>From 3f80b2258e37b76675945c0782c5b99b648b24bd Mon Sep 17 00:00:00 2001
From: Hilko Bengen
Date: Sat, 22 Dec 2018 21:56:09 +0100
Subject: [PATCH 2/3] Move package to section python
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 562631e..9204bf8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: dtfabric
-Section: utils
+Section: python
Priority: optional
Maintainer: SZ Lin (林上智)
Build-Depends: debhelper (>= 11),
--
2.19.1
>From c3bebfe4fe7194da9892b1a591cfbeb13a46e990 Mon Sep 17 00:00:00 2001
From: Hilko Bengen
Date: Sat, 22 Dec 2018
