[SCM] lives packaging branch, master, updated. debian/1.1.8-1-4-gb8499db

[hrickards-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dc323d689ed9b00ddbbc4f2ebadf720cea5cb594
Author: Harry Rickards <harry at linux.com>
Date:   Mon Jan 11 21:18:47 2010 +0000

    Moved from dpatch to quilt

diff --git a/debian/changelog b/debian/changelog
index 37bdbd3..3acf905 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ lives (1.1.8-2) unstable; urgency=low
   * Changed maintainer to Debian Multimedia Maintainers
   * Started using git
   * Moved dirac_encoder to lives_dirac_encoder (Closes: #564665)
+  * Made removepy patch have DEP-3 compliant header
+  * Removed the old VCS tags for SVN
+  * Added myself to Uploaders:
+  * Moved from dpatch to quilt
 
  -- Harry Rickards <hrickards at l33tmyst.com>  Mon, 11 Jan 2010 18:55:23 +0000
 
diff --git a/debian/control b/debian/control
index a8ac9d1..453edf0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,11 @@ Source: lives
 Section: video
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Uploaders: Harry Rickards <hrickards at l33tmyst.com>
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7.0.50), libdirectfb-dev[!hurd-i386], libaa1-dev, libgtk2.0-dev (>= 2.14), bison, libjack0.100.0-dev, libsdl1.2-dev, python, xutils-dev, python-support, autoconf, automake, libtool, gettext, libtheora-dev, frei0r-plugins-dev[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !arm !powerpc], libogg-dev, libdv4-dev[!hurd-i386], libraw1394-dev[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libavc1394-dev[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], liboil0.3-dev, libasound2-dev[!arm !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libpulse-dev, libdirac-dev, dpatch
+Build-Depends: debhelper (>= 7.0.50), libdirectfb-dev[!hurd-i386], libaa1-dev, libgtk2.0-dev (>= 2.14), bison, libjack0.100.0-dev, libsdl1.2-dev, python, xutils-dev, python-support, autoconf, automake, libtool, gettext, libtheora-dev, frei0r-plugins-dev[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !arm !powerpc], libogg-dev, libdv4-dev[!hurd-i386], libraw1394-dev[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libavc1394-dev[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], liboil0.3-dev, libasound2-dev[!arm !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libpulse-dev, libdirac-dev, quilt
 DM-Upload-Allowed: yes
 Homepage: http://lives.sourceforge.net/
-VCS-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/lives/trunk
-VCS-SVN: svn://svn.debian.org/svn/collab-maint/deb-maint/lives/trunk
 
 Package: lives
 Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d0d7d30..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-removepy
diff --git a/debian/patches/removepy.dpatch b/debian/patches/removepy.diff
similarity index 99%
rename from debian/patches/removepy.dpatch
rename to debian/patches/removepy.diff
index 3d287be..f08d5f9 100755
--- a/debian/patches/removepy.dpatch
+++ b/debian/patches/removepy.diff
@@ -1,13 +1,12 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## removepy.dpatch by  <hrickards at l33tmyst.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch removes the py extensions from the marcos encoders
-## DP: updates all files that reference them to not use the .py extensions
-## DP: This is because the files need to be in /usr/bin and it is against
-## DP: Debian policy to have .py extensions there.
-## DP: Author: harry at linux.com | hrickards at l33tmyst.com
-## DP: First included with lives 1.1.8-1
+## Description: This patch removes the py extensions from the marcos
+##  encoders and updates all files that reference them to not use 
+##  the .py extensions. This is because the files need to be in
+##  /usr/bin and it is against Debian policy to have .py extensions
+##  there. dirac_encoder is also renamed to lives_dirac_encoder
+##  to avoid conflicts with dirac.
+## Author: Harry Rickards <hrickards at l33tmyst.com>
+## ---
 
 @DPATCH@
 diff -urNad lives~/lives-plugins/marcos-encoders/Makefile.am lives/lives-plugins/marcos-encoders/Makefile.am
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b6df7a9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+removepy.diff
diff --git a/debian/rules b/debian/rules
index 180c93d..d6353dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 LDFLAGS:=
 CFLAGS:=
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 build: patch-stamp
 	dh build

-- 
lives packaging