Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/213954
Change subject: build 5.3.4 for jessie, remove old patches ...................................................................... build 5.3.4 for jessie, remove old patches Bug:T95008 Change-Id: Ied5ff34c99a9c3b3c963385841702418d0700953 --- M debian/changelog M debian/install D debian/patches/root-usr-share D debian/patches/series M debian/rules 5 files changed, 6 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/ruby-jsduck refs/changes/54/213954/1 diff --git a/debian/changelog b/debian/changelog index 75f4586..346ffdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ruby-jsduck (5.3.4-1~wmf1) jessie-wikimedia; urgency=low + + * New upstream release. Build for jessie. T95008 + + -- Daniel Zahn <[email protected]> Tue, 26 May 2015 20:27:48 +0000 + ruby-jsduck (4.10.4-1~wmf1) precise-wikimedia; urgency=low * New upstream release. diff --git a/debian/install b/debian/install index 8cab16a..e69de29 100644 --- a/debian/install +++ b/debian/install @@ -1 +0,0 @@ -js-classes/* /usr/share/ruby-jsduck/js-classes/ diff --git a/debian/patches/root-usr-share b/debian/patches/root-usr-share deleted file mode 100644 index eeb9100..0000000 --- a/debian/patches/root-usr-share +++ /dev/null @@ -1,19 +0,0 @@ -Description: set /usr/share/ruby-jsduck as the root_dir - At least two subdirectories of root_dir are being used (template-min & - js-classes). The current value was very gem-specific and in the package it - was set to "/usr/lib/ruby", an obviously wrong choice. Hardcode our value, - this should probably be made configurable before pushing upstream. -Author: Faidon Liambotis <[email protected]> -Last-Update: 2013-04-30 - ---- a/lib/jsduck/options.rb -+++ b/lib/jsduck/options.rb -@@ -120,7 +120,7 @@ module JsDuck - - # Debugging - @warnings_exit_nonzero = false -- @root_dir = File.dirname(File.dirname(File.dirname(__FILE__))) -+ @root_dir = "/usr/share/ruby-jsduck" - @template_dir = @root_dir + "/template-min" - @template_links = false - @extjs_path = "extjs/ext-all.js" diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 146bace..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -root-usr-share diff --git a/debian/rules b/debian/rules index 2af5ab8..ebe3061 100755 --- a/debian/rules +++ b/debian/rules @@ -9,11 +9,5 @@ # delete useless ambiguously named binaries rm -f debian/ruby-jsduck/usr/bin/compare rm -f debian/ruby-jsduck/usr/bin/graph - # put template-min in place - mkdir -p debian/ruby-jsduck/usr/share/ruby-jsduck/ - cp -r template-min/ debian/ruby-jsduck/usr/share/ruby-jsduck/ - find debian/ruby-jsduck/usr/share/ruby-jsduck/ -type f \ - -print0 2>/dev/null | xargs -0r chmod 644 - rm -f debian/ruby-jsduck/usr/share/ruby-jsduck/template-min/README.md .PHONY: override_dh_auto_install -- To view, visit https://gerrit.wikimedia.org/r/213954 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied5ff34c99a9c3b3c963385841702418d0700953 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/ruby-jsduck Gerrit-Branch: master Gerrit-Owner: Dzahn <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
