[Pkg-voip-commits] r7797 - in /mumble-django/trunk/debian: ./ patches/ source/

Fri Nov 13 12:45:45 UTC 2009

Author: pmatthaei
Date: Fri Nov 13 12:45:45 2009
New Revision: 7797

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7797
Log:
* Convert package to the 3.0 (quilt) format and replace dpatch with quilt.

Added:
    mumble-django/trunk/debian/patches/01-settings.diff
      - copied, changed from r7796, mumble-django/trunk/debian/patches/01-settings.dpatch
    mumble-django/trunk/debian/patches/02-munin.diff
      - copied, changed from r7796, mumble-django/trunk/debian/patches/02-munin.dpatch
    mumble-django/trunk/debian/patches/03-genkey-follow-symlink.diff
      - copied unchanged from r7796, mumble-django/trunk/debian/patches/03-genkey-follow-symlink.dpatch
    mumble-django/trunk/debian/patches/series
      - copied, changed from r7796, mumble-django/trunk/debian/patches/00list
    mumble-django/trunk/debian/source/
    mumble-django/trunk/debian/source/format
Removed:
    mumble-django/trunk/debian/patches/00list
    mumble-django/trunk/debian/patches/01-settings.dpatch
    mumble-django/trunk/debian/patches/02-munin.dpatch
    mumble-django/trunk/debian/patches/03-genkey-follow-symlink.dpatch
Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/control
    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=7797&op=diff
==============================================================================

--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Fri Nov 13 12:45:45 2009
@@ -1,3 +1,9 @@
+mumble-django (0.11-3) UNRELEASED; urgency=low
+
+  * Convert package to the 3.0 (quilt) format and replace dpatch with quilt.
+
+ -- Patrick MatthÃ¤i <pmatthaei at debian.org>  Fri, 13 Nov 2009 13:45:04 +0100
+
 mumble-django (0.11-2) unstable; urgency=low
 
   * Update settings and m-d-configure script to work with Murmur 1.2.0.

Modified: mumble-django/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/control?rev=7797&op=diff
==============================================================================
--- mumble-django/trunk/debian/control (original)
+++ mumble-django/trunk/debian/control Fri Nov 13 12:45:45 2009
@@ -5,7 +5,7 @@
 Uploaders: Patrick MatthÃ¤i <pmatthaei at debian.org>, Kilian Krause <kilian at debian.org>,
  Michael Ziegler <diese-addy at funzt-halt.net>
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7), quilt
 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/

Copied: mumble-django/trunk/debian/patches/01-settings.diff (from r7796, mumble-django/trunk/debian/patches/01-settings.dpatch)
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/01-settings.diff?rev=7797&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.dpatch (original)
+++ mumble-django/trunk/debian/patches/01-settings.diff Fri Nov 13 12:45:45 2009
@@ -1,9 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-settings.dpatch by Michael Ziegler <diese-addy at funzt-halt.net>
-##
-## DP: Configured paths for the templates and the database file.
+# Configured paths for the templates and the database file.
 
- at DPATCH@
 diff -urNad mumble-django-0.11~/pyweb/settings.py mumble-django-0.11/pyweb/settings.py
 --- mumble-django-0.11~/pyweb/settings.py	2009-09-25 22:44:58.000000000 +0200
 +++ mumble-django-0.11/pyweb/settings.py	2009-11-12 19:52:49.703050889 +0100

Copied: mumble-django/trunk/debian/patches/02-munin.diff (from r7796, mumble-django/trunk/debian/patches/02-munin.dpatch)
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/02-munin.diff?rev=7797&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/02-munin.dpatch (original)
+++ mumble-django/trunk/debian/patches/02-munin.diff Fri Nov 13 12:45:45 2009
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-munin.dpatch by  <mistagee at cYrano>
-##
-## DP: Sets /usr/share/mumble-django as MUMBLE_DJANGO_ROOT path in munin.py.
-## DP: This is merely a precaution...
+# Sets /usr/share/mumble-django as MUMBLE_DJANGO_ROOT path in munin.py.
+# This is merely a precaution...
 
- at DPATCH@
 diff -urNad mumble-django-0.8~/munin.py mumble-django-0.8/munin.py
 --- mumble-django-0.8~/munin.py	2009-07-11 14:51:15.000000000 +0200
 +++ mumble-django-0.8/munin.py	2009-07-11 16:15:25.113522493 +0200

Copied: mumble-django/trunk/debian/patches/series (from r7796, mumble-django/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/series?rev=7797&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/00list (original)
+++ mumble-django/trunk/debian/patches/series Fri Nov 13 12:45:45 2009
@@ -1,3 +1,3 @@
-01-settings.dpatch
-02-munin.dpatch
-03-genkey-follow-symlink.dpatch
+01-settings.diff
+02-munin.diff
+03-genkey-follow-symlink.diff

Modified: mumble-django/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/rules?rev=7797&op=diff
==============================================================================
--- mumble-django/trunk/debian/rules (original)
+++ mumble-django/trunk/debian/rules Fri Nov 13 12:45:45 2009
@@ -2,8 +2,6 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
 
 configure: configure-stamp
 configure-stamp:
@@ -12,11 +10,11 @@
 
 build: build-stamp
 
-build-stamp: configure-stamp patch-stamp
+build-stamp: configure-stamp
 	dh_testdir
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp

Added: mumble-django/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/source/format?rev=7797&op=file
==============================================================================
--- mumble-django/trunk/debian/source/format (added)
+++ mumble-django/trunk/debian/source/format Fri Nov 13 12:45:45 2009
@@ -1,0 +1,1 @@
+3.0 (quilt)


