[Pkg-sdl-commits] [sdlgfx] 01/01: Using dh_linktree for embedded jquery, thanks Colin Watson!

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Fri Jul 4 10:40:12 UTC 2014


This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository sdlgfx.

commit 568ac5acffec69eadb0c91bb745e01beddf7dee4
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jul 4 12:39:45 2014 +0200

    Using dh_linktree for embedded jquery, thanks Colin Watson!
---
 debian/control                     | 6 ++++--
 debian/libsdl-gfx1.2-doc.linktrees | 1 +
 debian/rules                       | 4 +---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 7f9df67..cfb15f4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,9 @@ Priority: optional
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9),
                libsdl1.2-dev,
-               dh-autoreconf
+               dh-autoreconf,
+               dh-linktree,
+               libjs-jquery
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-sdl/packages/sdlgfx.git
 Vcs-Git: git://anonscm.debian.org/pkg-sdl/packages/sdlgfx.git
 Homepage: http://www.ferzkopp.net/joomla/content/view/19/14/
@@ -46,7 +48,7 @@ Package: libsdl-gfx1.2-doc
 Architecture: all
 Section: doc
 Priority: extra
-Depends: ${misc:Depends}, libjs-jquery
+Depends: ${misc:Depends}
 Recommends: libsdl-gfx1.2-dev (= ${binary:Version})
 Description: documentation files for SDL_gfx
  The SDL_gfx library is an extension to the SDL library which provides
diff --git a/debian/libsdl-gfx1.2-doc.linktrees b/debian/libsdl-gfx1.2-doc.linktrees
new file mode 100644
index 0000000..c95d564
--- /dev/null
+++ b/debian/libsdl-gfx1.2-doc.linktrees
@@ -0,0 +1 @@
+replace usr/share/javascript/jquery/jquery.js usr/share/doc/libsdl-gfx1.2-doc/html/jquery.js
diff --git a/debian/rules b/debian/rules
index 5abf8fa..b3bd5ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ LIBPKG = libsdl-gfx1.2-5
 
 
 %:
-	dh $@ --parallel --with autoreconf
+	dh $@ --parallel --with autoreconf --with linktree
 
 CONFIGURE_FLAGS ?=--disable-mmx
 
@@ -33,8 +33,6 @@ override_dh_install:
 	dh_install --fail-missing -XlibSDL_gfx.la -Xjquery.js
 
 override_dh_link:
-	# fix lintian warning embedded-javascript-library
-	dh_link -plibsdl-gfx1.2-doc usr/share/javascript/jquery/jquery.js usr/share/doc/libsdl-gfx1.2-doc/html/jquery.js
 	# fix lintian warning dev-pkg-without-shlib-symlink
 	dh_link -p$(LIBPKG) usr/lib/$(DEB_HOST_MULTIARCH)/libSDL_gfx.so.15.9.1 \
 		usr/lib/$(DEB_HOST_MULTIARCH)/libSDL_gfx.so.5

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/sdlgfx.git



More information about the pkg-sdl-commits mailing list