On Tuesday, August 14, 2012 11:36:33, Ian Jackson wrote:
[…]
> 13. The mumble maintainers, with appropriate help from other
> interested parties, should prepare an upload of mumble for wheezy
> with
> - embedded celt 0.7.1 enabled
> - no other version of celt enabled
> - whatever other release-critical bugfixes they consider
> relevant (subject to any appropriate discussion with the
> release team as necessary)
> - closing #675971.
Option 1:
I've prepared another version of Mumble based on the mumble-1.2.3-412-g6c9694d
release snapshot on August 3rd. This pacakge is built as described above, and
also supports Opus via the Debian opus system library which uses Opus version
0.9.14. I've tested:
- communication via Opus with the "349"-2 version in Sid
- communication via Opus with another version of the "412" pacakge
that uses the embedded 0.9.8 version of Opus that ships with the
Mumble upstream source
- communication via Celt 0.7.1 with several other clients
Option 2:
Using the mumble-348-fixes-embedded patch I sent on Aug 1st, and upload a new
version of "348" that's in Wheezy. [Needs modification to add a Closes:
#675971 in the changelog.] I haven't yet gotten any feedback on the patch.
Related question: Can a DD upload a package to Sid with a lower version number
than what is currently in the archive?
Option 3:
Manipulate the "349"-2 source in Sid, fix it, and upload a "349"-3. I was
investigating this in order to minimize the diff necessary, but I'm not sure
what all of the implications are of the modifications done to the
"orig.tar.gz" tarball compared to the upstream repo it's based on. Some of
the changes simply look like they might be innocuous autoconf stuff added, but
there are also some scripts and build files removed. File containing the list
of differences attached. This option would inolve reverting one Git commit in
order to remove debian/patches/10-use-celt-guard.
-- Chris
--
Chris Knadle
Chris.Knadle@coredump.us
# Steps to repeat results above: # From local clone of upstream Mumble git repo, make tarball of the "315b5f5" commit from 2012-05-31 06:46:56 git archive --prefix=mumble-1.2.3-349-g315b5f5/ -o mumble-1.2.3-349-g315b5f5-upstream.tar 315b5f587910983d764955f456fe64e696a786cc # make a new directory somewhere, untar 'upstream' tarball and rename # directory with a "-upstream" added, untar "orig" mumble tarball and rename # with a "-sid" added, do a recursive diff on the two directories diff -u -r ./mumble-1.2.3-349-g315b5f5-upstream ./mumble-1.2.3-349-g315b5f5-sid $ colordiff -u -r ./mumble-1.2.3-349-g315b5f5-upstream ./mumble-1.2.3-349-g315b5f5-sid # Note: "Only in .. upstream" means the file is missing in the Sid version # and "Only in .. sid" means the file doesn't exist in the upstream version # Not in the Sid source tarball: Only in ./mumble-1.2.3-349-g315b5f5-upstream: 3rdPartyLicenses Only in ./mumble-1.2.3-349-g315b5f5-upstream/celt-0.11.0-build: win32 Only in ./mumble-1.2.3-349-g315b5f5-upstream/celt-0.7.0-build: win32 Only in ./mumble-1.2.3-349-g315b5f5-upstream: doc Only in ./mumble-1.2.3-349-g315b5f5-upstream: Doxyfile Only in ./mumble-1.2.3-349-g315b5f5-upstream: .gitignore Only in ./mumble-1.2.3-349-g315b5f5-upstream: .gitmodules Only in ./mumble-1.2.3-349-g315b5f5-upstream/icons/flags: readme.txt Only in ./mumble-1.2.3-349-g315b5f5-upstream/icons: g15helper.ico Only in ./mumble-1.2.3-349-g315b5f5-upstream/icons: mumble.osx.installer.png Only in ./mumble-1.2.3-349-g315b5f5-upstream/icons/publicdomain: readme.txt Only in ./mumble-1.2.3-349-g315b5f5-upstream/icons/tango: README Only in ./mumble-1.2.3-349-g315b5f5-upstream: installer Only in ./mumble-1.2.3-349-g315b5f5-upstream/macx/overlay: avail.h Only in ./mumble-1.2.3-349-g315b5f5-upstream/macx/overlay: avail.pl Only in ./mumble-1.2.3-349-g315b5f5-upstream/macx: scripts Only in ./mumble-1.2.3-349-g315b5f5-upstream/opus-build: Win32 Only in ./mumble-1.2.3-349-g315b5f5-upstream/plugins: mumble_plugin_win32.h Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: addban.php Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: binserver.pl Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: ermine.conf Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: git2cl.pl Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: glacier Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: idle.php Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: ListUsers.cs Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: mkflags.pl Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: mkini.sh Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: mklic.pl Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: mkwrapper.pl Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: mumble-auth.py Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: php.ini Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: qt.conf Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: release.pl Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: rubytest.rb Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: simpleregister.php Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: svn2cl.pl Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: svn2cl.sh Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: testauth.py Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: testcallback.py Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: testdynamic.py Only in ./mumble-1.2.3-349-g315b5f5-upstream/scripts: ts2html.pl Only in ./mumble-1.2.3-349-g315b5f5-upstream/speexbuild: AGC.cpp Only in ./mumble-1.2.3-349-g315b5f5-upstream/speexbuild: AGC.pro Only in ./mumble-1.2.3-349-g315b5f5-upstream/speexbuild: ResampMark.cpp Only in ./mumble-1.2.3-349-g315b5f5-upstream/speexbuild: ResampMark.pro Only in ./mumble-1.2.3-349-g315b5f5-upstream/speexbuild: SpeexMark.cpp Only in ./mumble-1.2.3-349-g315b5f5-upstream/speexbuild: SpeexMark.pro Only in ./mumble-1.2.3-349-g315b5f5-upstream/speexbuild: win32 Only in ./mumble-1.2.3-349-g315b5f5-upstream/src/mumble: G15LCDEngine_lglcd.cpp Only in ./mumble-1.2.3-349-g315b5f5-upstream/src/mumble: G15LCDEngine_lglcd.h Only in ./mumble-1.2.3-349-g315b5f5-upstream/src/mumble: mumble_hu.ts Only in ./mumble-1.2.3-349-g315b5f5-upstream/src/mumble: PAAudioConfig.cpp Only in ./mumble-1.2.3-349-g315b5f5-upstream/src/mumble: PAAudioConfig.h Only in ./mumble-1.2.3-349-g315b5f5-upstream/src/mumble: PAAudioConfig.ui Only in ./mumble-1.2.3-349-g315b5f5-upstream/src/mumble: PositionalSound.cpp Only in ./mumble-1.2.3-349-g315b5f5-upstream/src/mumble: PositionalSound.h Only in ./mumble-1.2.3-349-g315b5f5-upstream/src: tests # Not in upstream: Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: AUTHORS Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: autogen.sh Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: celt.kdevelop Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: celt.pc.in Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: ChangeLog Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: configure.ac Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: COPYING Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: Doxyfile Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: Doxyfile.devel Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: INSTALL Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: libcelt Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: libcelt.spec.in Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: Makefile.am Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: NEWS Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: README Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: README.Win32 Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.11.0-src: TODO Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: acinclude.m4 Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: AUTHORS Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: autogen.sh Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: celt.kdevelop Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: celt.pc.in Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: ChangeLog Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: configure.ac Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: COPYING Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: Doxyfile Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: Doxyfile.devel Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: INSTALL Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: libcelt Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: libcelt.spec.in Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: Makefile.am Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: NEWS Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: README Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: README.Win32 Only in ./mumble-1.2.3-349-g315b5f5-sid/celt-0.7.0-src: TODO Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: AUTHORS Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: autogen.sh Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: celt Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: celt_headers.txt Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: celt_sources.mk Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: ChangeLog Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: configure.ac Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: COPYING Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: include Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: INSTALL Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: LICENSE_PLEASE_READ.txt Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: Makefile.am Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: Makefile.draft Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: NEWS Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: opus_headers.txt Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: opus.pc.in Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: opus.sln Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: opus_sources.mk Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: opus-uninstalled.pc.in Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: README Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: README.draft Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: silk Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: silk_headers.txt Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: silk_sources.mk Only in ./mumble-1.2.3-349-g315b5f5-sid/opus-src: src Only in ./mumble-1.2.3-349-g315b5f5-sid/scripts: murmur.ini.system Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: acinclude.m4 Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: AUTHORS Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: autogen.sh Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: ChangeLog Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: configure.ac Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: COPYING Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: Doxyfile Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: IDEAS Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: include Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: INSTALL Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: libspeex Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: Makefile.am Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: NEWS Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: OPTIMIZE Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: README Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: README.blackfin Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: README.symbian Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: README.TI-DSP Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: README.Trimedia Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: README.win32 Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: regressions Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: speexdsp.pc.in Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: Speex.kdevelop Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: speex.m4 Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: speex.pc.in Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: Speex.spec.in Only in ./mumble-1.2.3-349-g315b5f5-sid/speex: TODO diff -u -r ./mumble-1.2.3-349-g315b5f5-upstream/src/Version.h ./mumble-1.2.3-349-g315b5f5-sid/src/Version.h --- ./mumble-1.2.3-349-g315b5f5-upstream/src/Version.h 2012-05-31 06:46:56.000000000 -0400 +++ ./mumble-1.2.3-349-g315b5f5-sid/src/Version.h 2012-06-03 14:12:20.000000000 -0400 @@ -36,6 +36,9 @@ #define MUMTEXT(X) MUMXTEXT(X) #ifndef MUMBLE_VERSION +#define MUMBLE_VERSION 1.2.3-348-g317f5a0 +#endif +#ifndef MUMBLE_VERSION #define MUMBLE_RELEASE "Compiled " __DATE__ " " __TIME__ #else #define MUMBLE_RELEASE MUMTEXT(MUMBLE_VERSION) Only in ./mumble-1.2.3-349-g315b5f5-upstream: winpaths_default.pri
Attachment:
signature.asc
Description: This is a digitally signed message part.