summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-12-28 14:19:18 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-12-28 14:19:18 +0100
commitc4cf44cdd4782802342d5d206759f7975d552c9c (patch)
tree6f9badf5b8f69055849260093eb76ce184e746ef /debian
parent7adee3792b49c90ac4cb47114abee86c2b3c3590 (diff)
parent6298ea00640a74af4eecbf3528ea87bd191a2eba (diff)
Merge tag 'debian/3.1.2-1' into develop
New Upstream Release
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/control2
-rw-r--r--debian/patches/series2
-rwxr-xr-xdebian/rules2
4 files changed, 6 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 6f51ba0..65d0dc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-scons (3.1.2-1) UNRELEASED; urgency=medium
+scons (3.1.2-1) experimental; urgency=medium
* New upstream release.
- Refresh patches.
@@ -8,8 +8,9 @@ scons (3.1.2-1) UNRELEASED; urgency=medium
* Declare compliance with Debian Policy 4.4.1.2 (No changes needed).
* debian/control:
- Switch to Rules-Requires-Root: no.
+ * Upload to experimental.
- -- Jörg Frings-Fürst <debian@jff.email> Fri, 27 Dec 2019 09:24:55 +0100
+ -- Jörg Frings-Fürst <debian@jff.email> Fri, 27 Dec 2019 10:03:54 +0100
scons (3.1.1-4) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index a1862f0..cc2b861 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser: https://salsa.debian.org/debian/scons
Package: scons
Architecture: all
Depends:
- ${python3:Depends},
+ ${python:Depends},
${misc:Depends}
Description: replacement for make
SCons is a make replacement providing a range of enhanced features such
diff --git a/debian/patches/series b/debian/patches/series
index 5325217..291c188 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@
0100-parallel_build.patch
0120-fix-bibtex-call.patch
#0125-printf_regression.patch
-0130-python3.patch
+#0130-python3.patch
diff --git a/debian/rules b/debian/rules
index e759c42..a6576fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,4 @@
export PYBUILD_INSTALL_ARGS=--no-version-script --standalone-lib --no-install-man --no-install-bat
%:
- dh $@ --with python3 --buildsystem=pybuild
+ dh $@ --with python2,python3 --buildsystem=pybuild