[SCM] bristol/master.stable: Merge branch 'master' into master.stable

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu May 9 10:24:05 UTC 2013


New entry.
Extend 02-disable_sse.patch to disable -march=core2 -msse -msse -mfpmath=sse when compiling libbristol.
New entry
Disable -msse -mfpmath (Closes: #674229)
Finalize changelog.
Use dh-autoreconf.
Refresh 01-export_statements.patch.
Update Vcs tags.
Bump Standards.
wrap-and-sort -a -s
Refresh debian/copyright.
Merge tag 'upstream/0.60.10'
Imported Upstream version 0.60.10
Don't sign tags.
Finalize changelog.
refresh
Depends on libjack-dev only.
Merge commit 'upstream/0.60.9'
Imported Upstream version 0.60.9
Finalize changelog.
Rewrite debian/copyright as per DEP-5 rev.174.
Enable parallel builds.
Suggests jackd.
Bump Standards.
Get rid of unneeded *.la files (Closes: #621266).
Update changelog.
Relax JACK's build-deps to let this build in sid.
Upload to unstable.
Update changelog.
Refresh patches.
Finalize changelog.
Merge commit 'upstream/0.60.8'
Imported Upstream version 0.60.8
Update debian/gbp.conf.
Finalize changelog.
Don't force jackd2, jackd1 >= 1:0.118+svn4089-1~ is enough to provide jack-session support.
Finalize changelog.
First build with JACK session support.
Patch forwarded.
rename debian/NEWS.Debian -> debian/bristol.NEWS
Finalize changelog.
Add tags as per dep-3
Add NEWS.Debian to notify users about the default size of the voice table and document how to increase the VOICECOUNT limit.
Drop 90-CVE_insecure_library_loading.patch patch, applied upstream. 01-export_statements.patch is used to drop all export statements.
Merge commit 'upstream/0.60.7'
Imported Upstream version 0.60.7
Update changelog.
Drop all unnecessary 'export' statements.
Finalize changelog.
Exporting unmodified PATH is unnecessary. Drop /usr/share/bristol/lib from the LD_LIBRARY_PATH.
Finalize changelog.
Add local-options file.
Add patch to prevent insecure library loading (Closes: #598285, CVE-2010-3351).
Finalize changelog.
Merge commit 'upstream/0.60.6'
Imported Upstream version 0.60.6
Cleanup
Bump Standards.
Update Standards-Version to 3.9.0.
Remove empty debian/patches dir.
Add .gitignore file.
Switch to 3.0 (quilt) format.
Add debian/gbp.conf.
Remove DMUA field.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.stable
X-Git-Reftype: branch
X-Git-Oldrev: 292b05cdf865052a3e2a5884ee18d926c7449853
X-Git-Newrev: 2bb284f6d7752eada88c473467e99c4742bede5f

The following commit has been merged in the master.stable branch:
commit 2bb284f6d7752eada88c473467e99c4742bede5f
Merge: 292b05cdf865052a3e2a5884ee18d926c7449853 b677a22a7243809a64e8b3b670204514bb6bd5e5
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 9 12:23:52 2013 +0200

    Merge branch 'master' into master.stable

diff --combined debian/gbp.conf
index 9e6398f,cec628c..d3b51b4
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,5 -1,2 +1,4 @@@
  [DEFAULT]
 +debian-branch = master.stable
 +upstream-branch = upstream.stable
  pristine-tar = True
- sign-tags = True

-- 
bristol packaging



More information about the pkg-multimedia-commits mailing list