[26300] in Source-Commits
/svn/athena r25503 - trunk/athena/lib/firefox-extension/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon May 14 17:20:55 2012
Date: Mon, 14 May 2012 17:20:54 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205142120.q4ELKsfv017104@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-14 17:20:53 -0400 (Mon, 14 May 2012)
New Revision: 25503
Modified:
trunk/athena/lib/firefox-extension/debian/changelog
trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.links
trunk/athena/lib/firefox-extension/debian/rules
Log:
In firefox-extension:
* Don't attempt to symlink two things in the same place; on newer
versions of Firefox, /usr/lib/firefox/extensions is a symlink into
firefox-addons
Modified: trunk/athena/lib/firefox-extension/debian/changelog
===================================================================
--- trunk/athena/lib/firefox-extension/debian/changelog 2012-05-14 19:31:50 UTC (rev 25502)
+++ trunk/athena/lib/firefox-extension/debian/changelog 2012-05-14 21:20:53 UTC (rev 25503)
@@ -1,3 +1,11 @@
+debathena-firefox-extension (10.0.7-0debathena5) unstable; urgency=low
+
+ * Don't attempt to symlink two things in the same place; on newer
+ versions of Firefox, /usr/lib/firefox/extensions is a symlink into
+ firefox-addons
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 14 May 2012 17:07:11 -0400
+
debathena-firefox-extension (10.0.7-0debathena4) unstable; urgency=low
* No change rebuild to pick up config-package-dev 4.13 changes
Modified: trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.links
===================================================================
--- trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.links 2012-05-14 19:31:50 UTC (rev 25502)
+++ trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.links 2012-05-14 21:20:53 UTC (rev 25503)
@@ -1,3 +1,2 @@
-usr/lib/debathena-firefox-extension usr/lib/firefox/extensions/athena@mit.edu
usr/lib/debathena-firefox-extension usr/lib/firefox-addons/extensions/athena@mit.edu
usr/lib/debathena-firefox-extension usr/lib/iceweasel/extensions/athena@mit.edu
Modified: trunk/athena/lib/firefox-extension/debian/rules
===================================================================
--- trunk/athena/lib/firefox-extension/debian/rules 2012-05-14 19:31:50 UTC (rev 25502)
+++ trunk/athena/lib/firefox-extension/debian/rules 2012-05-14 21:20:53 UTC (rev 25503)
@@ -6,6 +6,11 @@
/etc/firefox-3.0/pref/ubufox.js.debathena
endif
+ifneq ($(shell readlink -f /usr/lib/firefox/extensions),/usr/lib/firefox-addons/extensions)
+DEB_DH_LINK_debathena-firefox-extension += \
+ usr/lib/debathena-firefox-extension usr/lib/firefox/extensions/athena@mit.edu
+endif
+
DEB_AUTO_UPDATE_AUTOCONF = 2.50
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
