Ottomata has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378258 )
Change subject: Versionless .jar symlink fix
......................................................................
Versionless .jar symlink fix
Change-Id: I51958c3c87f4c30490be86e54fdcc78aa274bf2f
---
M debian/README.Debian
M debian/changelog
A debian/prometheus-jmx-exporter.links
M debian/rules
4 files changed, 14 insertions(+), 9 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/debs/prometheus-jmx-exporter
refs/changes/58/378258/1
diff --git a/debian/README.Debian b/debian/README.Debian
index 0d332c0..47dd0a5 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -10,6 +10,11 @@
- jmx_prometheus_javaagent.jar
- jmx_prometheus_httpserver.jar
+NOTE: If you are building a new upstream version, in addition to merging the
tags
+into this debian branch and updating debian/changelog, you must also edit
+debian/prometheus-jmx-exporter.links to change the versionless .jar symlink.
+
+
== Building with WMF package_builder
WMF uses a custom setup of pbuilder and cowbuilder to build packages. In our
setup
diff --git a/debian/changelog b/debian/changelog
index 3cf553a..57a60ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+prometheus-jmx-exporter (0.10-2) stretch-wikimedia; urgency=low
+
+ * Versionless .jar symlink fix
+
+ -- Andrew Otto (WMF) <o...@wikimedia.org> Fri, 15 Sep 2017 15:51:00 +0000
+
+
prometheus-jmx-exporter (0.10-1) stretch-wikimedia; urgency=low
* Initial release of 0.10
diff --git a/debian/prometheus-jmx-exporter.links
b/debian/prometheus-jmx-exporter.links
new file mode 100644
index 0000000..c5748a8
--- /dev/null
+++ b/debian/prometheus-jmx-exporter.links
@@ -0,0 +1,2 @@
+usr/share/java/prometheus/jmx_prometheus_javaagent-0.10.jar
usr/share/java/prometheus/jmx_prometheus_javaagent.jar
+usr/share/java/prometheus/jmx_prometheus_httpserver-0.10.jar
usr/share/java/prometheus/jmx_prometheus_httpserver.jar
diff --git a/debian/rules b/debian/rules
index 315b064..7e8aeb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,23 +15,14 @@
dh_auto_build
override_dh_install:
- # NOTE: We use ln here below rather than
debian/prometheus-jmx-exporter.links to create
- # versionless symlinks to avoid hardcoding DEB_VERSION_UPSTREAM into
the .links file.
-
# Install jmx_prometheus_javaagent.jar
install -o root -g root -m 644 \
$(CURDIR)/jmx_prometheus_javaagent/target/jmx_prometheus_javaagent-$(DEB_VERSION_UPSTREAM).jar
\
$(CURDIR)/debian/prometheus-jmx-exporter/usr/share/java/prometheus/jmx_prometheus_javaagent-$(DEB_VERSION_UPSTREAM).jar
- ln -s \
-
$(CURDIR)/debian/prometheus-jmx-exporter/usr/share/java/prometheus/jmx_prometheus_javaagent-$(DEB_VERSION_UPSTREAM).jar
\
-
$(CURDIR)/debian/prometheus-jmx-exporter/usr/share/java/prometheus/jmx_prometheus_javaagent.jar
# Install jmx_prometheus_httpserver.jar
install -o root -g root -m 644 \
$(CURDIR)/jmx_prometheus_httpserver/target/jmx_prometheus_httpserver-$(DEB_VERSION_UPSTREAM).jar
\
$(CURDIR)/debian/prometheus-jmx-exporter/usr/share/java/prometheus/jmx_prometheus_httpserver-$(DEB_VERSION_UPSTREAM).jar
- ln -s \
-
$(CURDIR)/debian/prometheus-jmx-exporter/usr/share/java/prometheus/jmx_prometheus_httpserver-$(DEB_VERSION_UPSTREAM).jar
\
-
$(CURDIR)/debian/prometheus-jmx-exporter/usr/share/java/prometheus/jmx_prometheus_httpserver.jar
dh_install
--
To view, visit https://gerrit.wikimedia.org/r/378258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51958c3c87f4c30490be86e54fdcc78aa274bf2f
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/prometheus-jmx-exporter
Gerrit-Branch: debian
Gerrit-Owner: Ottomata <ao...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
