[SCM] arista packaging branch, master, updated. debian/0.9.3+repack-1-1-g582a793

quadrispro-guest at users.alioth.debian.org quadrispro-guest at users.alioth.debian.org
Thu Oct 8 17:11:32 UTC 2009


The following commit has been merged in the master branch:
commit 582a79306f69617fd2fc2690bf06ec1da9070564
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Thu Oct 8 19:08:15 2009 +0200

    Re-packaged

diff --git a/debian/README.source b/debian/README.source
index aea9b08..63c2d5e 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,3 +4,63 @@ arista for Debian
 I repacked this package to remove the debian directory provided by upstream.
 
  -- Alessio Treglia <quadrispro at ubuntu.com>  Mon, 24 Aug 2009 09:27:30 +0200
+
+-----------------
+
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
diff --git a/debian/arista.lintian-overrides b/debian/arista.lintian-overrides
new file mode 100644
index 0000000..ce51426
--- /dev/null
+++ b/debian/arista.lintian-overrides
@@ -0,0 +1 @@
+arista: no-upstream-changelog
diff --git a/debian/changelog b/debian/changelog
index f62f81e..3799141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-arista (0.9.3+repack-1) unstable; urgency=low
+arista (0.9.3-1) unstable; urgency=low
 
   * Initial release (Closes: #543316).
+  * debian/patches/01-patent_free_presets.diff: Add patent free profiles to
+    presets/computer.xml and set one of them as default choice;
+    already forwarded to upstream.
 
  -- Alessio Treglia <quadrispro at ubuntu.com>  Mon, 24 Aug 2009 09:27:30 +0200
diff --git a/debian/control b/debian/control
index cde4487..241b73a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
 Source: arista
 Section: video
 Priority: extra
-Maintainer: Alessio Treglia <quadrispro at ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50)
+Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Uploaders: Alessio Treglia <quadrispro at ubuntu.com>
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7)
 Build-Depends-Indep: python (>= 2.5), python-support (>= 0.5.3)
 Standards-Version: 3.8.3
 Homepage: http://programmer-art.org/projects/arista-transcoder
diff --git a/debian/patches/01-patent_free_presets.diff b/debian/patches/01-patent_free_presets.diff
new file mode 100644
index 0000000..9eba7a9
--- /dev/null
+++ b/debian/patches/01-patent_free_presets.diff
@@ -0,0 +1,113 @@
+Author: Alessio Treglia
+Description: Add patent-free profiles.
+Index: arista-0.9.3+repack/presets/computer.xml
+===================================================================
+--- arista-0.9.3+repack.orig/presets/computer.xml	2009-10-07 13:15:58.084684467 +0200
++++ arista-0.9.3+repack/presets/computer.xml	2009-10-07 13:18:52.872684247 +0200
+@@ -3,14 +3,14 @@
+ <device>
+     <make>Generic</make>
+     <model>Computer</model>
+-    <description>H.264/AAC for the computer</description>
++    <description>H.264/AAC or Theora/Vorbis for the computer</description>
+     <author>
+         <name>Daniel G. Taylor</name>
+         <email>dan at programmer-art.org</email>
+     </author>
+     <version>1.0</version>
+     <icon>file://computer.svg</icon>
+-    <default>Normal</default>
++    <default>Normal (patent-free)</default>
+     
+     <preset>
+         <name>Low</name>
+@@ -92,5 +92,89 @@
+             <rate>1, 60</rate>
+         </video>
+     </preset>
++    <preset>
++        <name>Low (patent-free)</name>
++        <container>matroskamux</container>
++        <extension>mkv</extension>
++        <audio>
++            <name>vorbisenc</name>
++            <passes>
++                <pass>quality=0.3</pass>
++            </passes>
++            <channels>1, 2</channels>
++         </audio>
++        <video>
++            <name>theoraenc</name>
++            <passes>
++                <pass>border=0 quality=15 keyframe-freq=27</pass>
++            </passes>
++            <width>320, 640</width>
++            <height>240, 480</height>
++            <rate>1, 25</rate>
++        </video>
++    </preset>
++    <preset>
++        <name>Normal (patent-free)</name>
++        <container>matroskamux</container>
++        <extension>mkv</extension>
++        <audio>
++            <name>vorbisenc</name>
++            <passes>
++                <pass>quality=0.5</pass>
++            </passes>
++            <channels>1, 2</channels>
++        </audio>
++        <video>
++            <name>theoraenc</name>
++            <passes>
++                <pass>border=0 quality=40 keyframe-freq=30</pass>
++            </passes>
++            <width>320, 1920</width>
++            <height>240, 1080</height>
++            <rate>1, 30</rate>
++        </video>
++    </preset>
++    <preset>
++        <name>Live Input (patent-free)</name>
++        <container>matroskamux</container>
++        <extension>mkv</extension>
++        <audio>
++            <name>vorbisenc</name>
++            <passes>
++                <pass>quality=0.5</pass>
++            </passes>
++            <channels>1, 2</channels>
++        </audio>
++        <video>
++            <name>theoraenc</name>
++            <passes>
++                <pass>border=0 quality=16 keyframe-freq=25</pass>
++            </passes>
++            <width>320, 1920</width>
++            <height>240, 1080</height>
++            <rate>1, 30</rate>
++        </video>
++    </preset>
++    <preset>
++        <name>High (patent-free)</name>
++        <container>matroskamux</container>
++        <extension>mkv</extension>
++        <audio>
++            <name>vorbisenc</name>
++            <passes>
++                <pass>quality=0.8</pass>
++            </passes>
++            <channels>1, 2</channels>
++        </audio>
++        <video>
++            <name>theoraenc</name>
++            <passes>
++                <pass>border=0 quality=58 keyframe-freq=30</pass>
++            </passes>
++            <width>320, 1920</width>
++            <height>240, 1080</height>
++            <rate>1, 60</rate>
++        </video>
++    </preset>
+ </device>
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..af7c27c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-patent_free_presets.diff
diff --git a/debian/rules b/debian/rules
index 83a4294..aa94486 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\
 PACKAGE = arista
 
 %:
-	dh $@
+	dh --with quilt $@
 
 override_dh_auto_install:
 	dh_auto_install -- --install-scripts=/usr/share/arista \
@@ -16,8 +16,8 @@ get-orig-source:
 	cd $(DEBIAN_DIR)/.. && uscan --force-download
 	tar xf ../$(PACKAGE)-$(UPSTREAM_VERSION).tar.gz
 	rm ../$(PACKAGE)-$(UPSTREAM_VERSION).tar.gz
-	mv $(PACKAGE)-$(UPSTREAM_VERSION) $(PACKAGE)-$(UPSTREAM_VERSION)+repack
-	tar cf ../$(PACKAGE)_$(UPSTREAM_VERSION)+repack.orig.tar \
-	--exclude=debian $(PACKAGE)-$(UPSTREAM_VERSION)+repack
-	gzip -9fn ../$(PACKAGE)_$(UPSTREAM_VERSION)+repack.orig.tar
-	rm -r $(PACKAGE)-$(UPSTREAM_VERSION)+repack
+	tar cf ../$(PACKAGE)_$(UPSTREAM_VERSION).orig.tar \
+	--exclude=debian $(PACKAGE)-$(UPSTREAM_VERSION)
+	gzip -9fn ../$(PACKAGE)_$(UPSTREAM_VERSION).orig.tar
+	rm -r $(PACKAGE)-$(UPSTREAM_VERSION)
+

-- 
arista packaging



More information about the pkg-multimedia-commits mailing list