[23122] in Source-Commits
/svn/athena r22783 - in trunk/athena/lib/firefox-extension: chrome/content debian
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Fri Mar 7 11:41:02 2008
Date: Fri, 7 Mar 2008 10:52:56 -0500 (EST)
From: ghudson@MIT.EDU
Message-Id: <200803071552.KAA15652@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-03-07 10:52:55 -0500 (Fri, 07 Mar 2008)
New Revision: 22783
Removed:
trunk/athena/lib/firefox-extension/debian/patches/
Modified:
trunk/athena/lib/firefox-extension/chrome/content/athena.dtd
trunk/athena/lib/firefox-extension/chrome/content/athena.xul
trunk/athena/lib/firefox-extension/debian/changelog
trunk/athena/lib/firefox-extension/debian/rules
Log:
Eliminate the quilt patches for firefox-extension. Fold in
no-titlemodifier.patch. firefox-extensions-paths.patch was already
taken care of.
* debian/patches/firefox-extension-paths.patch,
debian/patches/no-titlemodifier.patch,
debian/patches/series: Remove.
* debian/rules: Remove patchsys-quilt invocation.
* chrome/content/athena-xul, chrome/content/athena.dtd: Remove the
title bar setting, which would be confusing for Iceweasel.
Modified: trunk/athena/lib/firefox-extension/chrome/content/athena.dtd
===================================================================
--- trunk/athena/lib/firefox-extension/chrome/content/athena.dtd 2008-03-06 20:24:43 UTC (rev 22782)
+++ trunk/athena/lib/firefox-extension/chrome/content/athena.dtd 2008-03-07 15:52:55 UTC (rev 22783)
@@ -1,4 +1,3 @@
-<!ENTITY mainWindow.titlemodifier "Mozilla Firefox: MIT Athena Edition">
<!ENTITY athenaHelp.label "Athena On-Line Help">
<!ENTITY athenaHelp.url "http://web.mit.edu/olh">
<!ENTITY athenaHelp.accesskey "">
Modified: trunk/athena/lib/firefox-extension/chrome/content/athena.xul
===================================================================
--- trunk/athena/lib/firefox-extension/chrome/content/athena.xul 2008-03-06 20:24:43 UTC (rev 22782)
+++ trunk/athena/lib/firefox-extension/chrome/content/athena.xul 2008-03-07 15:52:55 UTC (rev 22783)
@@ -4,8 +4,6 @@
<script src="chrome://global/content/globalOverlay.js"/>
<script src="chrome://browser/content/utilityOverlay.js"/>
- <window id="main-window" titlemodifier="&mainWindow.titlemodifier;"/>
-
<menupopup id="menu_HelpPopup">
<menuseparator insertafter="aboutSeparator"/>
<menuitem label="&athenaHelp.label;" insertafter="aboutSeparator"
Modified: trunk/athena/lib/firefox-extension/debian/changelog
===================================================================
--- trunk/athena/lib/firefox-extension/debian/changelog 2008-03-06 20:24:43 UTC (rev 22782)
+++ trunk/athena/lib/firefox-extension/debian/changelog 2008-03-07 15:52:55 UTC (rev 22783)
@@ -1,3 +1,9 @@
+debathena-firefox-extension (10.0.0-0debathena1) unstable; urgency=low
+
+ * Patches folded into main source.
+
+ -- Greg Hudson <ghudson@equal-rites.mit.edu> Fri, 07 Mar 2008 10:52:24 -0500
+
debathena-firefox-extension (9.4.34-0debathena1) unstable; urgency=low
* Initial release.
Modified: trunk/athena/lib/firefox-extension/debian/rules
===================================================================
--- trunk/athena/lib/firefox-extension/debian/rules 2008-03-06 20:24:43 UTC (rev 22782)
+++ trunk/athena/lib/firefox-extension/debian/rules 2008-03-07 15:52:55 UTC (rev 22783)
@@ -4,7 +4,6 @@
DEB_AUTO_UPDATE_AUTOCONF = 1
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
clean::
rm -f configure
