[SCM] calf/master: Add patch 1001 to resolve paths from autoconf, adjust location of documentation, and use separately packaged Javascript.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2583065d97597d6bc51cb790020dc3044ad737eb
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Sep 15 02:41:02 2014 +0200

    Add patch 1001 to resolve paths from autoconf, adjust location of documentation, and use separately packaged Javascript.

diff --git a/debian/control.in b/debian/control.in
index d9dc544..6770bbb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,7 +13,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/calf.git
 
 Package: calf-plugins
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${cdbs:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: gtk2-engines-pixbuf
 Suggests: ladish
 Provides: lv2-plugin
diff --git a/debian/patches/1001_use_autoconf_dirnames.patch b/debian/patches/1001_use_autoconf_dirnames.patch
new file mode 100644
index 0000000..5d92a09
--- /dev/null
+++ b/debian/patches/1001_use_autoconf_dirnames.patch
@@ -0,0 +1,48 @@
+Description: Resolve paths from autoconf dirnames (not hardcoded strings)
+Author: Jonas Smedegaard <dr at jones.dk>
+Last-Update: 2014-09-15
+Forwarded: No
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,8 +7,6 @@
+ desktopfilesdir = $(datadir)/applications
+ dist_desktopfiles_DATA = calf.desktop
+ 
+-docdir = $(datadir)/doc/${PACKAGE}
+-
+ EXTRA_DIST = COPYING.GPL TODO autogen.sh presets.xml calf.7 calfjackhost.1 calf-gui.xml doc/manuals
+ 
+ dist_man_MANS = calf.7 calfjackhost.1
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,12 +10,13 @@
+ noinst_PROGRAMS = calfbenchmark
+ pkglib_LTLIBRARIES = calf.la
+ 
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
++AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -DPKGLIBDIR='"$(datarootdir)/${PACKAGE_TARNAME}/"'
+ # TODO: Remove -finline flags is clang is used
+ AM_CXXFLAGS = -ffast-math -finline-limit=80 $(FLUIDSYNTH_DEPS_CFLAGS) $(LV2_DEPS_CFLAGS)
+ 
+ if USE_GUI
+ AM_CXXFLAGS += $(GUI_DEPS_CFLAGS)
++AM_CPPFLAGS += -DPKGDOCDIR='"$(htmldir)/"'
+ endif
+ if USE_JACK
+ AM_CXXFLAGS += $(JACK_DEPS_CFLAGS)
+--- a/configure.ac
++++ b/configure.ac
+@@ -210,12 +210,6 @@
+ fi
+ 
+ ############################################################################################
+-
+-# Other defines
+-AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/share/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)])
+-AC_DEFINE_UNQUOTED(PKGDOCDIR,"$prefix/share/doc/calf/",[Calf documentation directory])
+-
+-############################################################################################
+ # Output files for configure step
+ AC_CONFIG_FILES([Makefile
+                  calf.desktop
diff --git a/debian/patches/series b/debian/patches/series
index 301ddf4..2c9db86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-#0001-libglade_to_gtkbuilder.patch
-#1001_fix-ftbfs-with-gcc-4.7.patch
+1001_use_autoconf_dirnames.patch
 1002-lv2core_to_lv2.patch
diff --git a/debian/rules b/debian/rules
index 5fe4f23..d6197f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,9 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+pkg = calf-plugins
+docdir = /usr/share/doc/$(pkg)
+
 DEB_UPSTREAM_URL = http://downloads.sourceforge.net/calf
 
 # Needed by upstream build process
@@ -62,6 +65,20 @@ clean::
 # put aside upstream-shipped temp files during build but after copyright-check
 DEB_UPSTREAM_CRUFT_MOVE = calf.desktop configure INSTALL
 
-install/calf-plugins::
+# adjust location of documentation
+DEB_CONFIGURE_EXTRA_FLAGS += --htmldir=$(docdir)/html
+
+install/$(pkg)::
 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 	rm -rf $(DEB_DESTDIR)/usr/share/doc/calf
+
+# use separately packaged Javascript
+CDBS_BUILD_DEPENDS +=, libjs-jquery, libjs-jquery-colorbox
+CDBS_DEPENDS_$(pkg) = libjs-jquery, libjs-jquery-colorbox
+binary-post-install/$(pkg)::
+	rm -f $(cdbs_curdestdir)$(docdir)/html/scripts/jquery.js
+	ln -sT ../../../../javascript/jquery/jquery.min.js \
+		$(cdbs_curdestdir)$(docdir)/html/scripts/jquery.js
+	rm -f $(cdbs_curdestdir)$(docdir)/html/scripts/jquery.prettyPhoto.js
+	ln -sT ../../../../javascript/jquery-colorbox/jquery.colorbox-min.js \
+		$(cdbs_curdestdir)$(docdir)/html/scripts/jquery.prettyPhoto.js

-- 
calf audio plugins packaging