Legoktm has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392784 )
Change subject: Remove dead code to mess with $wgVersion
......................................................................
Remove dead code to mess with $wgVersion
This code was supposed to set the Debian version of the package as $wgVersion,
but it was broken. Regardless of that, it's a bad idea as it would break the
compatibility checking used in extension.json since the version number would
no longer be semver compliant.
Change-Id: I83d1ba1f51a45d352000df840106c488b78485ca
---
M debian/changelog
M debian/rules
2 files changed, 2 insertions(+), 8 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/debian/changelog b/debian/changelog
index 9adb278..61435fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@
* Use debhelper compat 10
* Add a systemd unit to run runJobs.php as a service
* Get rid of unnecessary dh_installdeb override
+ * Remove dead code to mess with $wgVersion
- -- Kunal Mehta <lego...@member.fsf.org> Tue, 21 Nov 2017 22:16:34 -0800
+ -- Kunal Mehta <lego...@member.fsf.org> Tue, 21 Nov 2017 22:20:52 -0800
mediawiki (1:1.27.4-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index efea41f..ab8ace8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,5 @@
#!/usr/bin/make -f
-DEB_VERSION:=$(shell dpkg-parsechangelog -n1 | sed -n '/^Version: /s///p')
-DEB_NOEPOCH_VERSION:=$(shell DEB_VERSION=${DEB_VERSION}; echo
$${DEB_VERSION\#*:})
-DEB_UPSTREAM_VERSION:=$(shell DEB_NOEPOCH_VERSION=${DEB_NOEPOCH_VERSION}; echo
$${DEB_NOEPOCH_VERSION%+dfsg-*})
-
override_dh_install:
dh_install
# Now some tidying up is required
@@ -28,9 +24,6 @@
done
# Remove Makefiles
find debian/mediawiki/ -iname makefile -exec rm {} \;
- # Put debian version for mediawiki version..
- sed -e "s#$(DEB_UPSTREAM_VERSION)#$(DEB_NOEPOCH_VERSION)#" \
- -i
debian/mediawiki/usr/share/mediawiki/includes/DefaultSettings.php
# Move extensions
mkdir -p debian/mediawiki/usr/share/doc/mediawiki
mv debian/mediawiki/var/lib/mediawiki/extensions/README \
--
To view, visit https://gerrit.wikimedia.org/r/392784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83d1ba1f51a45d352000df840106c488b78485ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
