[Pkg-voip-commits] r7082 - in /mumble-django/trunk/debian: ./ patches/
svedrin-guest at alioth.debian.org
svedrin-guest at alioth.debian.org
Wed Apr 29 14:18:52 UTC 2009
Author: svedrin-guest
Date: Wed Apr 29 14:18:51 2009
New Revision: 7082
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7082
Log:
- created dpatches for settings.py and apache virtualhost config
- completed Copyright information
- changed installation paths for the Apache2 virtualhost config
- created debian/watch file
- various other changes
Added:
mumble-django/trunk/debian/patches/
mumble-django/trunk/debian/patches/00list
mumble-django/trunk/debian/patches/apache2_conf.dpatch (with props)
mumble-django/trunk/debian/patches/settings.dpatch (with props)
mumble-django/trunk/debian/watch
Removed:
mumble-django/trunk/debian/python-django-mumble.postinst
mumble-django/trunk/debian/python-django-mumble.prerm
Modified:
mumble-django/trunk/debian/changelog
mumble-django/trunk/debian/control
mumble-django/trunk/debian/copyright
mumble-django/trunk/debian/mumble-django.install
mumble-django/trunk/debian/mumble-django.links
mumble-django/trunk/debian/mumble-django.postinst
mumble-django/trunk/debian/rules
Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=7082&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Wed Apr 29 14:18:51 2009
@@ -1,5 +1,5 @@
-mumble-django (0.5-1) experimental; urgency=low
+mumble-django (0.5-1) unstable; urgency=low
* Initial release as a debian package (Closes: #524660)
- -- Michael Ziegler <diese-addy at funzt-halt.net> Thu, 19 Feb 2009 15:06:14 +0100
+ -- Michael Ziegler <diese-addy at funzt-halt.net> Thu, 18 Apr 2009 15:06:14 +0100
Modified: mumble-django/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/control?rev=7082&op=diff
==============================================================================
--- mumble-django/trunk/debian/control (original)
+++ mumble-django/trunk/debian/control Wed Apr 29 14:18:51 2009
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Michael Ziegler <diese-addy at funzt-halt.net>
Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), dpatch
Build-Depends-Indep: python-support (>= 0.3)
Homepage: http://www.bitbucket.org/Svedrin/mumble-django/
Vcs-Svn: svn://svn.debian.org/pkg-voip/mumble-django/trunk/
@@ -12,7 +12,7 @@
Package: python-django-mumble
Architecture: all
Depends: ${python:Depends}, python-dbus (>= 0.82.4), python-django (>= 1.0), mumble-server (>=1.1.4), ${misc:Depends}
-Description: A Murmur config application for Django
+Description: A Mumble-Server config application for Django
mumble-django is a Django web interface application that configures a
Murmur server. It is able to create and remove vservers, start/stop them,
and configure them.
@@ -28,7 +28,7 @@
Package: mumble-django
Architecture: all
Depends: ${python:Depends}, python-django (>= 1.0), libapache2-mod-wsgi (>= 2.3), python-django-registration (>= 0.7), python-django-mumble (>= 0.5), ${misc:Depends}
-Description: A Murmur config application for Django
+Description: A Mumble-Server web interface
mumble-django is a Django web interface application that configures a
Murmur server. It is able to create and remove vservers, start/stop them,
and configure them.
Modified: mumble-django/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/copyright?rev=7082&op=diff
==============================================================================
--- mumble-django/trunk/debian/copyright (original)
+++ mumble-django/trunk/debian/copyright Wed Apr 29 14:18:51 2009
@@ -31,10 +31,90 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
The Debian packaging is:
Copyright © 2009, Michael Ziegler <diese-addy at funzt-halt.net>
and is licensed under the GPL, see above.
+
+
+===============================================================================
+
+
+The directory "htdocs/ext-2.2" provides the ExtJS JavaScript library.
+
+Ext JS - JavaScript Library
+Copyright © 2006-2008, Ext JS, LLC
+All rights reserved.
+licensing at extjs.com
+
+http://extjs.com/license
+
+Open Source License
+-------------------------------------------------------------------
+Ext is licensed under the terms of the Open Source GPL 3.0 license.
+
+http://www.gnu.org/licenses/gpl.html
+
+There are several FLOSS exceptions available for use with this
+release for open source applications that are distributed under a
+license other than the GPL.
+
+* Open Source License Exception for Applications
+
+ http://extjs.com/products/floss-exception.php
+
+* Open Source License Exception for Development
+
+ http://extjs.com/products/ux-exception.php
+
+
+Commercial License
+-------------------------------------------------------------------
+This is the appropriate option if you are creating proprietary
+applications and you are not prepared to distribute and share the
+source code of your application under the GPL v3 license. Please
+visit http://extjs.com/license for more details.
+
+
+OEM / Reseller License
+-------------------------------------------------------------------
+For more details, please visit: http://extjs.com/license.
+
+--
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
+
+
+===============================================================================
+
+The directory "htdocs/yaml" provides the base files needed for YAML, yet
+another multicolumn layout, on which the layout of Mumble-Django is based.
+
+It was downloaded from:
+ http://www.yaml.de
+
+Upstream Author:
+ Dirk Jesse
+
+Copyright:
+ <Copyright 2005-2009, Dirk Jesse>
+
+License:
+ YAML has been licensed under a Creative Commons Attribution 2.0 License
+ (CC-A 2.0) since version 2.2.
+ The YAML framework is published under the Creative Commons Attribution
+ 2.0 License, which permits both private and commercial use.
+
+ Condition: For the free use of the YAML framework, a backlink to the YAML
+ homepage (http://www.yaml.de) in a suitable place (e.g.: footer of the
+ website or in the imprint) is required.
+
Modified: mumble-django/trunk/debian/mumble-django.install
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.install?rev=7082&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.install (original)
+++ mumble-django/trunk/debian/mumble-django.install Wed Apr 29 14:18:51 2009
@@ -12,7 +12,7 @@
template/index.htm /usr/share/mumble-django/template
# Apache2 VHost config
-mumble-django /etc/apache2/sites-available/
+apache2.conf /etc/mumble-django/
# WSGI conf
mumble-django.wsgi /usr/share/mumble-django/
Modified: mumble-django/trunk/debian/mumble-django.links
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.links?rev=7082&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.links (original)
+++ mumble-django/trunk/debian/mumble-django.links Wed Apr 29 14:18:51 2009
@@ -1,2 +1,3 @@
/usr/share/pyshared-data/python-django-mumble/htdocs/mumble /usr/share/mumble-django/htdocs/mumble
/usr/share/mumble-django/pyweb/settings.py /etc/mumble-django/settings.py
+/etc/mumble-django/apache2.conf /etc/apache2/conf.d/mumble-django
Modified: mumble-django/trunk/debian/mumble-django.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.postinst?rev=7082&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.postinst (original)
+++ mumble-django/trunk/debian/mumble-django.postinst Wed Apr 29 14:18:51 2009
@@ -3,11 +3,12 @@
if [ "$1" = "configure" ]
then
+ invoke-rc.d --quiet mumble-server start
+
chown -R www-data:www-data /var/lib/mumble-django
cd /usr/share/mumble-django/pyweb && su www-data -c 'python manage.py syncdb'
- a2ensite mumble-django
- apache2ctl graceful
+ invoke-rc.d --quiet apache2 reload
echo "******************************************************"
echo "*** ***"
@@ -15,10 +16,9 @@
echo "*** You can login with your superuser at: ***"
echo "*** http://localhost:8002/admin/ ***"
echo "*** ***"
- echo "*** Remember to configure and start Murmur! ***"
- echo "*** ***"
echo "******************************************************"
-
- #DEBHELPER#
fi
+
+#DEBHELPER#
+
Added: mumble-django/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/00list?rev=7082&op=file
==============================================================================
--- mumble-django/trunk/debian/patches/00list (added)
+++ mumble-django/trunk/debian/patches/00list Wed Apr 29 14:18:51 2009
@@ -1,0 +1,2 @@
+settings.dpatch
+apache2_conf.dpatch
Added: mumble-django/trunk/debian/patches/apache2_conf.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/apache2_conf.dpatch?rev=7082&op=file
==============================================================================
--- mumble-django/trunk/debian/patches/apache2_conf.dpatch (added)
+++ mumble-django/trunk/debian/patches/apache2_conf.dpatch Wed Apr 29 14:18:51 2009
@@ -1,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## apache2_conf.dpatch by Michael Ziegler <diese-addy at funzt-halt.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Creates an Apache2 config
+
+ at DPATCH@
+diff -urNad mumble-django-0.5~/apache2.conf mumble-django-0.5/apache2.conf
+--- mumble-django-0.5~/apache2.conf 1970-01-01 01:00:00.000000000 +0100
++++ mumble-django-0.5/apache2.conf 2009-04-19 00:53:27.000000000 +0200
+@@ -0,0 +1,13 @@
++Listen 8002
++<VirtualHost *:8002>
++ AddDefaultCharset UTF-8
++
++ Alias /static/ /usr/share/mumble-django/htdocs/
++ Alias /media/ /usr/share/python-support/python-django/django/contrib/admin/media/
++
++ WSGIScriptAlias / /usr/share/mumble-django/mumble-django.wsgi
++ WSGIDaemonProcess mumble-django threads=25
++ WSGIProcessGroup mumble-django
++ WSGIScriptReloading Off
++</VirtualHost>
++
Propchange: mumble-django/trunk/debian/patches/apache2_conf.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: mumble-django/trunk/debian/patches/settings.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/settings.dpatch?rev=7082&op=file
==============================================================================
--- mumble-django/trunk/debian/patches/settings.dpatch (added)
+++ mumble-django/trunk/debian/patches/settings.dpatch Wed Apr 29 14:18:51 2009
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## settings.dpatch by Michael Ziegler <diese-addy at funzt-halt.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Configured paths for the templates and the database file.
+
+ at DPATCH@
+diff -urNad mumble-django-0.5~/pyweb/settings.py mumble-django-0.5/pyweb/settings.py
+--- mumble-django-0.5~/pyweb/settings.py 2009-04-29 14:23:27.000000000 +0200
++++ mumble-django-0.5/pyweb/settings.py 2009-04-29 14:34:37.994704608 +0200
+@@ -1,3 +1,4 @@
++# -*- coding: utf-8 -*-
+ # Django settings for mumble_django project.
+
+ #################################################################
+@@ -48,7 +49,7 @@
+ MANAGERS = ADMINS
+
+ DATABASE_ENGINE = 'sqlite3'
+-DATABASE_NAME = join( MUMBLE_DJANGO_ROOT, 'mumble-django.db3' )
++DATABASE_NAME = '/var/lib/mumble-django/mumble-django.db3'
+ DATABASE_USER = ''
+ DATABASE_PASSWORD = ''
+ DATABASE_HOST = ''
+@@ -108,6 +109,7 @@
+ # Always use forward slashes, even on Windows.
+ # Don't forget to use absolute paths, not relative paths.
+ join( MUMBLE_DJANGO_ROOT, 'template' ),
++ '/usr/share/pyshared-data/python-django-mumble/template',
+ )
+
+ INSTALLED_APPS = (
Propchange: mumble-django/trunk/debian/patches/settings.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: mumble-django/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/rules?rev=7082&op=diff
==============================================================================
--- mumble-django/trunk/debian/rules (original)
+++ mumble-django/trunk/debian/rules Wed Apr 29 14:18:51 2009
@@ -9,6 +9,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -19,11 +21,11 @@
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: configure-stamp patch-stamp
dh_testdir
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -32,7 +34,7 @@
install: build
dh_testdir
dh_testroot
- dh_prep
+ dh_prep
dh_installdirs
@@ -45,28 +47,17 @@
binary-indep: install
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs
dh_installdocs
dh_installexamples
dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
# dh_python
dh_pysupport
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
Added: mumble-django/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/watch?rev=7082&op=file
==============================================================================
--- mumble-django/trunk/debian/watch (added)
+++ mumble-django/trunk/debian/watch Wed Apr 29 14:18:51 2009
@@ -1,0 +1,2 @@
+version=3
+http://bitbucket.org/Svedrin/mumble-django/get/v(.*)\.gz
More information about the Pkg-voip-commits
mailing list