summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2011-04-11 14:51:59 +0100
committerSimon McVittie <smcv@debian.org>2011-04-11 14:51:59 +0100
commit54c6ba91ff4b7181fe79e41f5351c7adab5459c6 (patch)
tree968a92ae87365de0b1ab6dfcde88ed841fb39e79
parent10014dcc9bc71af9c270e108d0bef7c5f60162f9 (diff)
downloaddbus-54c6ba91ff4b7181fe79e41f5351c7adab5459c6.tar.gz
Remove the unused copy of jquery.js that doxygen now wants to install
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c9745fe2..79bf04a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dbus (1.4.8-1) UNRELEASED; urgency=low
* New upstream version
- Use upstream-merged support for installing HTML docs
* Mark dbus, dbus-x11 as Multi-Arch: foreign
+ * Remove the unused copy of jquery.js that doxygen now wants to install
* Correctly credit Michael for his changes in the previous changelog entry
-- Simon McVittie <smcv@debian.org> Fri, 18 Feb 2011 10:45:35 +0000
diff --git a/debian/rules b/debian/rules
index 10979cad..2a14939f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,9 @@ override_dh_link:
dh_link -plibdbus-1-dev lib/$$(basename $$(readlink debian/tmp/usr/lib/libdbus-1.so)) usr/lib/libdbus-1.so
dh_link --remaining-packages
+# jquery.js isn't actually used at the moment, and is an embedded code copy
override_dh_install:
+ rm -f debian/tmp/usr/share/doc/dbus-1-doc/html/api/jquery.js
dh_install --list-missing
install -m 644 -D debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch