[Pkg-telepathy-commits] [SCM] telepathy-spec packaging branch, debian, updated. debian/0.19.7-1-3-ge0b83b7

[Simon McVittie]

The following commit has been merged in the debian branch:
commit e0b83b721ea4f3afa25dca96d3bff90e04b59791
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 1 14:49:48 2010 +0100

    New upstream version
    
    * New upstream version
    * Recommend libjs-jquery, to have collapsible rationales without shipping
      a duplicate copy in telepathy-specification; if you don't install it,
      jquery.min.js will be a dangling symlink and rationale sections will
      always be shown
    * Standards-Version: 3.9.0 (no changes)

diff --git a/debian/changelog b/debian/changelog
index 6b55188..a6bf59f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+telepathy-spec (0.19.8-1) unstable; urgency=low
+
+  * New upstream version
+  * Simplify debian/rules using override_dh_foo
+  * Stop installing the HTML twice; make the version in /usr/share/doc
+    a symlink into /usr/share/gtk-doc/html instead
+  * Recommend libjs-jquery, to have collapsible rationales without shipping
+    a duplicate copy in telepathy-specification; if you don't install it,
+    jquery.min.js will be a dangling symlink and rationale sections will
+    always be shown
+  * Standards-Version: 3.9.0 (no changes)
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 01 Jul 2010 14:49:42 +0100
+
 telepathy-spec (0.19.7-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index da84e4d..89189fd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,12 @@ Uploaders: Laurent Bigonville <bigon at debian.org>,
            Simon McVittie <smcv at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>,
            Jonny Lamb <jonny at debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50)
 Build-Depends-Indep: xsltproc,
                      python (>= 2.5) | python-elementtree,
                      python-docutils,
                      python-cheetah
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-spec.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-spec.git
 Homepage: http://telepathy.freedesktop.org/wiki/
@@ -19,6 +19,7 @@ Homepage: http://telepathy.freedesktop.org/wiki/
 Package: telepathy-specification
 Architecture: all
 Depends: ${misc:Depends}
+Recommends: libjs-jquery
 Suggests: doc-base
 Enhances: libtelepathy-dev, libtelepathy-glib-doc
 Description: Telepathy D-Bus specification
diff --git a/debian/rules b/debian/rules
index ab1d886..d38e444 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,16 @@
 #!/usr/bin/make -f
 
-# skip "make check", it's not actually very useful in this package
-build:
-	dh build --before test
-	dh build --after test
+%:
+	dh $@
 
-clean:
-	dh clean
+override_dh_auto_test:
+	# skip "make check", it's not actually very useful in this package
 
-install: build
-	dh install --before compress
+override_dh_compress:
 	dh_compress -X.xml
-	dh install --after compress
 
-binary-arch: install
-	# do nothing
+spec=debian/telepathy-specification/usr/share/gtk-doc/html/telepathy-spec
 
-binary-indep: install
-	dh binary-indep
-
-binary: binary-indep
+override_dh_link:
+	rm $(spec)/jquery.min.js
+	dh_link
diff --git a/debian/telepathy-specification.docs b/debian/telepathy-specification.docs
index a205ae0..3907177 100644
--- a/debian/telepathy-specification.docs
+++ b/debian/telepathy-specification.docs
@@ -3,4 +3,3 @@ NEWS
 README
 doc/dispatch.html
 doc/request.html
-spec
diff --git a/debian/telepathy-specification.links b/debian/telepathy-specification.links
index ee024be..e2715f0 100644
--- a/debian/telepathy-specification.links
+++ b/debian/telepathy-specification.links
@@ -1 +1,3 @@
 usr/share/gtk-doc/html/telepathy-spec/spec.html usr/share/doc/telepathy-specification/spec.html
+usr/share/gtk-doc/html/telepathy-spec/spec usr/share/doc/telepathy-specification/spec
+usr/share/javascript/jquery/jquery.min.js usr/share/gtk-doc/html/telepathy-spec/jquery.min.js

-- 
telepathy-spec packaging