This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository gdal.
commit 2304e25607e0e8fda372680e0c54a153d9caee63 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat May 23 16:13:56 2015 +0200 Use packaged jquery.js instead of Doxygen copy. --- debian/changelog | 1 + debian/control | 3 ++- debian/libgdal-doc.links | 2 ++ debian/rules | 5 ++++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2cd5814..067b7b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ gdal (1.10.1+dfsg-9) UNRELEASED; urgency=medium * Use uscan in get-orig-source target. * Update Vcs-Browser URL to use cgit instead of gitweb. * Remove trailing whitespace to fix syntax error in symbols files. + * Use packaged jquery.js instead of Doxygen copy. -- Bas Couwenberg <sebas...@debian.org> Sun, 28 Jun 2015 12:01:44 +0200 diff --git a/debian/control b/debian/control index e3bb2e9..6dd1766 100644 --- a/debian/control +++ b/debian/control @@ -162,7 +162,8 @@ Description: Geospatial Data Abstraction Library - Development files Package: libgdal-doc Architecture: all Section: doc -Depends: ${misc:Depends} +Depends: libjs-jquery, + ${misc:Depends} Suggests: libgdal1h Description: Documentation for the Geospatial Data Abstraction Library GDAL is a translator library for raster geospatial data formats. diff --git a/debian/libgdal-doc.links b/debian/libgdal-doc.links new file mode 100644 index 0000000..56612f8 --- /dev/null +++ b/debian/libgdal-doc.links @@ -0,0 +1,2 @@ +usr/share/javascript/jquery/jquery.js usr/share/doc/libgdal-doc/gdal/jquery.js +usr/share/javascript/jquery/jquery.js usr/share/doc/libgdal-doc/ogr/jquery.js diff --git a/debian/rules b/debian/rules index 6ce5a51..652c044 100755 --- a/debian/rules +++ b/debian/rules @@ -170,7 +170,10 @@ override_dh_auto_install: # removing la file rm -f $(CURDIR)/debian/tmp/usr/lib/libgdal.la - + + # Remove doxygen jquery.js copy in favor of libjs-jquery + rm -f $(CURDIR)/debian/*/usr/share/doc/libgdal-doc/*/jquery.js + # removing embedded rpath in main lib -find $(CURDIR)/debian/tmp/usr/lib -type f -name "*.so*" -exec chrpath --delete {} \; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel