summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2011-06-10 22:11:18 +0100
committerSimon McVittie <smcv@debian.org>2011-06-10 22:11:18 +0100
commitf892be72f93adfabf14412d80ff4e4206682207e (patch)
tree8d4c3f7dab9c84c6db4bf24230f1ed08895f4b44
parent6024cd5359a3870ff7cfc9f21c4cdf07c8d6141b (diff)
downloaddbus-f892be72f93adfabf14412d80ff4e4206682207e.tar.gz
Don't delete jquery.js, no longer installed by recent Doxygen
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
2 files changed, 1 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index d83293a7..5eca5dba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
dbus (1.4.12-1) UNRELEASED; urgency=medium
* New upstream release fixes local DoS (Closes: #629938, no CVE number yet)
+ * Don't delete jquery.js, no longer installed by recent Doxygen
-- Simon McVittie <smcv@debian.org> Fri, 10 Jun 2011 20:51:33 +0100
diff --git a/debian/rules b/debian/rules
index 7c8f6e39..84ab1dbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,9 +62,7 @@ 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/api/jquery.js
dh_install -Xlibdbus-1.la --list-missing
install -m 644 -D debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch