[pkg-horde] [SCM] Debian Horde Packages repository: nag2 package branch, debian-sid, updated. c4e752bdde04f7992c9e9df708148024f3a0b9b9

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit 775c1605fed28b85e45ea5e428df216632ada316
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Mon Jan 4 10:40:37 2010 +0100

    New upstream release
    
    * Repack to remove external JS libs
    * Added check for upstream JS libs
    * Added me to uploaders

diff --git a/debian/changelog b/debian/changelog
index 6f22d49..1173bb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nag2 (2.3.4+debian0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Repack to remove external JS libs
+  * Added check for upstream JS libs
+  * Added me to uploaders
+
+ -- Mathieu Parent <sathieu at debian.org>  Mon, 04 Jan 2010 10:36:11 +0100
+
 nag2 (2.3.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 3e405b0..797def4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: nag2
 Section: web
 Priority: optional
 Maintainer: Horde Maintainers <pkg-horde-hackers at lists.alioth.debian.org>
-Uploaders: Ola Lundqvist <opal at debian.org>, Lionel Elie Mamane <lmamane at debian.org>, Gregory Colpart <reg at debian.org>
+Uploaders: Ola Lundqvist <opal at debian.org>, Lionel Elie Mamane <lmamane at debian.org>, Gregory Colpart <reg at debian.org>, Mathieu Parent <sathieu at debian.org>
 Build-Depends: debhelper (>= 5)
 Vcs-Git: git://git.debian.org/pkg-horde/nag2.git
 Vcs-Browser: http://git.debian.org/?p=pkg-horde/nag2.git
diff --git a/debian/rules b/debian/rules
index 9853a0c..25cb55c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ configure-stamp:
 	dh_testdir
 	touch configure-stamp
 
-build: build-stamp
+build: check-external-libs build-stamp
 
 build-stamp: configure-stamp
 	dh_testdir
@@ -95,8 +95,6 @@ binary-indep: build install
 	dh_installchangelogs docs/CHANGES
 	dh_installdocs -XINSTALL -Xdocs/CHANGES
 	dh_link
-	# clean '.arch-ids' directories to use with tla-buildpackage
-	-find debian/nag2 -depth -name ".arch-ids" -exec rm -Rf {} \;
 	dh_strip
 	dh_compress
 	dh_fixperms 
@@ -106,5 +104,17 @@ binary-indep: build install
 	dh_md5sums
 	dh_builddeb
 
+check-external-libs:
+	if [ -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 ]; then \
+               echo ""; \
+	      echo " **                                  **"; \
+	      echo " **  tar contains external files!    **"; \
+	      echo " **                                  **"; \
+	      echo ""; \
+	      exit 1; \
+        fi
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

-- 
Debian Horde Packages repository: nag2 package