[pkg-horde] [SCM] Debian Horde Packages repository: ansel1 package branch, debian-sid, updated. debian/1.0+debian0-1-12-g8ed8199

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit 8ed819924ce8223f8445d583f37fee52cee81f42
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Fri Dec 18 14:31:42 2009 +0100

    Check for accidental lightbox.js or cropper.js

diff --git a/debian/changelog b/debian/changelog
index 2d45f77..7ac3816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ansel1 (1.1+debian0-1) UNRELEASED; urgency=low
   * Removing lightbox.js as it is non-free (CC-by 2.5)
     Asked upstream to relicense see
     http://marc.info/?l=horde-dev&m=124524746519545&w=2 
+  * Check for accidental lightbox.js or cropper.js
   * Correct include path in prefs.php.dist
   * debian/rules: Depends on tools mentioned in docs/INSTALL
   * debian/rules:
diff --git a/debian/rules b/debian/rules
index c350681..232519c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ configure-stamp:
 	touch configure-stamp
 
 
-build: build-stamp
+build: check-external-libs build-stamp
 
 build-stamp: configure-stamp  
 	dh_testdir
@@ -79,17 +79,8 @@ binary-indep: install
 	dh_builddeb
 
 check-external-libs:
-	if [ -e services/editor/fckeditor ] || \
-	   [ -e services/editor/tinymce ] || \
-	   [ -e js/builder.js ] || [ -e js/src/builder.js ] || \
-	   [ -e js/controls.js ] || [ -e js/src/controls.js ] || \
-	   [ -e js/dragdrop.js ] || [ -e js/src/dragdrop.js ] || \
-	   [ -e js/effects.js ] || [ -e js/src/effects.js ] || \
-	   [ -e js/prototype.js ] || [ -e js/src/prototype.js ] || \
-	   [ -e js/scriptaculous.js ] || [ -e js/src/scriptaculous.js ] || \
-	   [ -e js/slider.js ] || [ -e js/src/slider.js ] || \
-	   [ -e js/sound.js ] || [ -e js/src/sound.js ] || \
-	   [ -e js/unittest.js ] || [ -e js/src/unittest.js ]; then \
+	if [ -e js/lightbox.js ] || [ -e js/src/lightbox.js ] || \
+	   [ -e js/cropper.js ] || [ -e js/src/cropper.js ]; then \
                echo ""; \
 	      echo " **                                  **"; \
 	      echo " **  tar contains external files!    **"; \

-- 
Debian Horde Packages repository: ansel1 package