diff options
| author | Marcelo Jorge Vieira (metal) <metal@debian.org> | 2010-09-27 14:47:35 -0300 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2010-09-29 03:21:01 +0000 |
| commit | ae396d64e9fc238d7c72a8ff9359536cd75e5e01 (patch) | |
| tree | fd4b2b5172f0d44901f57af9bec575a46dd6f5f5 | |
| parent | 11c6b7fefbcd0b0960ffd3279a97bfa6e15a1c5c (diff) | |
| parent | 210ade844bb87977a84ac8aca349dbcfd436cdd6 (diff) | |
8 (patches applied)applied/8applied/ubuntu/raring-develapplied/ubuntu/raringapplied/ubuntu/quantal-develapplied/ubuntu/quantalapplied/ubuntu/precise-develapplied/ubuntu/preciseapplied/ubuntu/oneiric-develapplied/ubuntu/oneiricapplied/ubuntu/natty-develapplied/ubuntu/natty
Imported using git-ubuntu import.
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/control | 9 | ||||
| -rw-r--r-- | debian/javascript-common.install | 2 | ||||
| -rw-r--r-- | debian/javascript-common.postinst | 9 | ||||
| -rw-r--r-- | debian/javascript-common.postrm | 8 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | lighttpd.conf | 1 |
7 files changed, 35 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 3b01596..2a9e00f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +javascript-common (8) unstable; urgency=low + + * Upgranding Standards-Version to 3.9.1 (no changes); + * Changing my email for Debian address; + * Changed "javascript" from lowercase to CamelCase + in short description (Closes: #570675); + * Removed DM-Upload-Allowed field; + * Adding configuration for lighttpd (Closes: #594953) + Thanks Rogério Brito <rbrito@ime.usp.br>; + * Switch to dpkg-source 3.0 (quilt) format. + + -- Marcelo Jorge Vieira (metal) <metal@debian.org> Mon, 27 Sep 2010 14:47:35 -0300 + javascript-common (7) unstable; urgency=low * Removing myself from uploaders. diff --git a/debian/control b/debian/control index 44fd684..6848157 100644 --- a/debian/control +++ b/debian/control @@ -3,22 +3,21 @@ Section: web Priority: optional Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org> Uploaders: - Marcelo Jorge Vieira (metal) <metal@alucinados.com>, + Marcelo Jorge Vieira (metal) <metal@debian.org>, Steve Kemp <skx@debian.org> Build-Depends: debhelper (>= 7.0.50~) -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Vcs-Browser: http://git.debian.org/?p=pkg-javascript/javascript-common.git Vcs-Git: git://git.debian.org/git/pkg-javascript/javascript-common.git -DM-Upload-Allowed: yes Package: javascript-common Architecture: all Depends: ${misc:Depends}, wwwconfig-common Suggests: apache2 | httpd -Description: Base support for javascript library packages +Description: Base support for JavaScript library packages Web applications that use JavaScript need to distribute it through HTTP. Using a common path for every script avoids the need to enable this path in the HTTP server for every package. . This is a helper package that creates /usr/share/javascript and enables it in - the Apache webserver. + the Apache and Lighttpd webserver. diff --git a/debian/javascript-common.install b/debian/javascript-common.install index 1dcb36f..3ed419c 100644 --- a/debian/javascript-common.install +++ b/debian/javascript-common.install @@ -1 +1 @@ -javascript-common.conf /etc/javascript-common +*.conf /etc/javascript-common diff --git a/debian/javascript-common.postinst b/debian/javascript-common.postinst index 1775e8a..3b57ada 100644 --- a/debian/javascript-common.postinst +++ b/debian/javascript-common.postinst @@ -12,7 +12,14 @@ case "${1}" in restart="apache2" fi - servers="apache2" + mkdir -p /etc/lighttpd/conf-enabled + if [ ! -e /etc/lighttpd/conf-available/90-javascript-alias.conf ] + then + ln -s /etc/javascript-common/lighttpd.conf /etc/lighttpd/conf-enabled/90-javascript-alias.conf + restart="lighttpd" + fi + + servers="apache2 lighttpd" . /usr/share/wwwconfig-common/restart.sh ;; diff --git a/debian/javascript-common.postrm b/debian/javascript-common.postrm index 521bb70..60da95a 100644 --- a/debian/javascript-common.postrm +++ b/debian/javascript-common.postrm @@ -8,9 +8,15 @@ then restart="apache2" fi +if [ -L /etc/lighttpd/conf-enabled/90-javascript-alias.conf ] +then + rm -f /etc/lighttpd/conf-enabled/90-javascript-alias.conf + restart="lighttpd" +fi + if [ -e /usr/share/wwwconfig-common/restart.sh ] then - servers="apache2" + servers="apache2 lighttpd" . /usr/share/wwwconfig-common/restart.sh fi diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/lighttpd.conf b/lighttpd.conf new file mode 100644 index 0000000..a8b442f --- /dev/null +++ b/lighttpd.conf @@ -0,0 +1 @@ +alias.url += ("/javascript" => "/usr/share/javascript") |