Hashar has submitted this change and it was merged.
Change subject: Forward port precise dh-virtualenv to trusty
......................................................................
Forward port precise dh-virtualenv to trusty
Use Debian packages for prettytable and babel since they match the
requirement.
There is still no documentation being generated.
Bug: T48552
Change-Id: Ic770cf8d7afcb40a81c5e2b39765398f51cec225
---
M debian/changelog
M debian/control
2 files changed, 16 insertions(+), 4 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 60a46d8..9579dc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+zuul (2.0.0-304-g685ca22-wmf1trusty1) trusty-wikimedia; urgency=low
+
+ * Port precise-wikimedia dh-virtualenv to trusty-wikimedia
+
+ * Use Debian packages for prettytable and babel since they match the
+ requirement.
+ * There is still no documentation being generated.
+
+ -- Antoine Musso <has...@free.fr> Tue, 17 Mar 2015 16:19:11 +0100
+
zuul (2.0.0-304-g685ca22-wmf1precise1) precise-wikimedia; urgency=low
* Snapshot from upstream, target is Wikimedia Ubuntu Precise which has some
diff --git a/debian/control b/debian/control
index 5d0b8cd..dc2fe3a 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@
python-paste,
python-webob,
python-paramiko,
- python-git (= 0.3.2.RC1-1),
+ python-git (>= 0.3.2~RC1), python-git (<<0.3.3),
python-gitdb,
python-smmap,
python-lockfile (>= 0.8),
@@ -35,9 +35,9 @@
python-voluptuous (>= 0.7),
python-gear (>= 0.5.4),
python-apscheduler (>= 2.1.1),
-#python-prettytable (>= 0.6),
+ python-prettytable (>= 0.6),
python-tz,
-#python-babel (>= 1.0),
+ python-babel (>= 1.0),
python-six (>= 1.6.0),
###################################
# test-requirements.txt
@@ -78,7 +78,7 @@
python-paste,
python-webob,
python-paramiko,
- python-git (= 0.3.2.RC1-1),
+ python-git (>= 0.3.2~RC1), python-git (<<0.3.3),
python-gitdb,
python-smmap,
python-lockfile (>= 0.8),
@@ -87,8 +87,10 @@
python-voluptuous (>= 0.7),
python-gear (>= 0.5.4),
python-apscheduler (>= 2.1.1),
+ python-prettytable (>= 0.6),
python-six (>= 1.6.0),
python-tz,
+ python-babel (>= 1.0),
${misc:Depends},
${python:Depends},
# shlibs since dh-virtualenv includes python
--
To view, visit https://gerrit.wikimedia.org/r/197329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic770cf8d7afcb40a81c5e2b39765398f51cec225
Gerrit-PatchSet: 7
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/trusty-wikimedia
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
