[23134] in Source-Commits
/svn/athena r22796 - trunk/athena/bin/firefox-wrapper/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Mon Mar 17 21:19:14 2008
Date: Mon, 17 Mar 2008 21:18:42 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200803180118.VAA26179@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-03-17 21:18:41 -0400 (Mon, 17 Mar 2008)
New Revision: 22796
Modified:
trunk/athena/bin/firefox-wrapper/debian/control
trunk/athena/bin/firefox-wrapper/debian/control.in
trunk/athena/bin/firefox-wrapper/debian/rules
Log:
Here are the changes that were supposed to be in r22794
Modified: trunk/athena/bin/firefox-wrapper/debian/control
===================================================================
--- trunk/athena/bin/firefox-wrapper/debian/control 2008-03-18 01:09:03 UTC (rev 22795)
+++ trunk/athena/bin/firefox-wrapper/debian/control 2008-03-18 01:18:41 UTC (rev 22796)
@@ -2,12 +2,12 @@
Section: debathena/web
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.2.0), autoconf, debathena-config-build-common (>= 3.7~), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), lsb-release
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.2.0), autoconf, debathena-config-build-common (>= 3.7~), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1)
Standards-Version: 3.7.2
Package: debathena-firefox-wrapper
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, iceweasel | firefox
+Depends: ${shlibs:Depends}, ${misc:Depends}, iceweasel | firefox, lsb-release
Description: Wrapper to configure Mozilla Firefox for Debathena
This package provides a wrapper for the stock Mozilla Firefox web
browser. It handles disposing of stale profile locks, as well as
Modified: trunk/athena/bin/firefox-wrapper/debian/control.in
===================================================================
--- trunk/athena/bin/firefox-wrapper/debian/control.in 2008-03-18 01:09:03 UTC (rev 22795)
+++ trunk/athena/bin/firefox-wrapper/debian/control.in 2008-03-18 01:18:41 UTC (rev 22796)
@@ -2,12 +2,12 @@
Section: debathena/web
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: @cdbs@, lsb-release
+Build-Depends: @cdbs@
Standards-Version: 3.7.2
Package: debathena-firefox-wrapper
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, iceweasel | firefox
+Depends: ${shlibs:Depends}, ${misc:Depends}, iceweasel | firefox, lsb-release
Description: Wrapper to configure Mozilla Firefox for Debathena
This package provides a wrapper for the stock Mozilla Firefox web
browser. It handles disposing of stale profile locks, as well as
Modified: trunk/athena/bin/firefox-wrapper/debian/rules
===================================================================
--- trunk/athena/bin/firefox-wrapper/debian/rules 2008-03-18 01:09:03 UTC (rev 22795)
+++ trunk/athena/bin/firefox-wrapper/debian/rules 2008-03-18 01:18:41 UTC (rev 22796)
@@ -4,34 +4,14 @@
DEB_AUTO_UPDATE_AUTOCONF = 2.50
DEBATHENA_DIVERT_FILES_debathena-firefox-wrapper += \
- /usr/bin/firefox.debathena
-
-binary-fixup/debathena-firefox-wrapper:: fix-iceweasel-path
-
-LSB_ID = $(shell lsb_release --short --id)
-ifeq ($(LSB_ID), Debian)
-
-fix-iceweasel-path: FORCE
- ln -sf firefox.debathena debian/debathena-firefox-wrapper/usr/bin/iceweasel.debathena
-DEBATHENA_DIVERT_FILES_debathena-firefox-wrapper += \
+ /usr/bin/firefox.debathena \
/usr/bin/iceweasel.debathena
-else
-
- ifeq ($(LSB_ID), Ubuntu)
-fix-iceweasel-path: FORCE
- else
- $(error Unrecognized distribution ID $(LSB_ID).)
- endif
-
-endif
-
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debathena-divert.mk
+DEB_DH_LINK_ARGS += usr/bin/firefox.debathena usr/bin/iceweasel.debathena
+
clean::
rm -f configure
-
-FORCE:
