Bug#783191: cdbs: allow reusing debian/copyright Files-Excluded for get-orig-source
Package: cdbs Severity: wishlist X-Debbugs-CC: pkg-multimedia-maintainers@lists.alioth.debian.org On 23 April 2015 at 11:03, Jonas Smedegaard d...@jones.dk wrote: Hi Adrian, Quoting Adrian Knoth (2015-04-23 15:46:55) On 04/23/15 15:03, mira-gu...@users.alioth.debian.org wrote: +# Path to the debian directory +DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname ) +UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*upstream-version\(.*\)\/upstream-version.*/\1/p') +DFSG = dfsg1 +PKG = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p') + [...] +get-orig-source: + uscan --noconf --force-download --rename --download-current-version --destdir=. + tar -xf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz + mv ardour-$(UPSTREAM_VERSION) $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/waf + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.git + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.gitignore + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCvst_scan + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCardour3 + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/resource + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/msvc_resources.rc.in + XZ_OPT=-9 tar cJf ../$(PKG)_$(UPSTREAM_VERSION)~$(DFSG).orig.tar.xz $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz This looks overly complicated. In jackd2, Jonas did: # Set tag to full 40 char git tag for git snapshot release tag = $(DEB_UPSTREAM_TARBALL_VERSION) DEB_UPSTREAM_URL = https://github.com/jackaudio/jack2/archive DEB_UPSTREAM_TARBALL_BASENAME = $(tag) DEB_UPSTREAM_TARBALL_SRCDIR = jack2-$(tag) # unneeded and possibly sourceless binaries DEB_UPSTREAM_REPACKAGE_EXCLUDES += *.a *.dll *.Lib # unneeded sources copyright-protected without licence DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./windows/**.rc # pure garbage in upstream tarball DEB_UPSTREAM_REPACKAGE_EXCLUDES += .DS_Store # sources not in prefered form of modification DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./waf Can't we do the same for ardour? Just declare some excludes and let CDBS do the work? Jonas, is this still state of the art? If so, I'd add it to ardour. Yes, seems up-to-date. I think specifying it only once in debian/copyright would be a good idea. Perhaps set a flag DEB_REPACKAGE_AUTOPOPULATE_EXCLUDES = 1 which causes cdbs to parse debian/copyright? -- Saludos, Felipe Sateler ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#781866: audacity: Audacity for Jessie builds with wxWidgets 3.0.2, which is not fully compatible with 2.8.x code
Package: audacity Version: 2.0.6-2 Followup-For: Bug #781866 Dear Maintainer, any news on this issue? Dave, a workaround for the device selection boxes is to reset the toolbars from the menus: View - Toolbars - Reset toolbars But this has to be done after each launch, and the result is not perfect either. I see that the debian package has several patches regarding wxWidgets3: http://anonscm.debian.org/cgit/pkg-multimedia/audacity.git/tree/debian/patches is upstream aware of them, and endorse them? Or should the package really just depend on libwxbase2.8-0 and libwxgtk2.8-0? This is the upstream bug about the issue: http://bugzilla.audacityteam.org/show_bug.cgi?id=902 Apparently there might be also some crashes with wx3: http://bugzilla.audacityteam.org/buglist.cgi?keywords=wx3resolution=--- Just my 2c. Ciao, Antonio -- System Information: Debian Release: 8.0 APT prefers unstable APT policy: (900, 'unstable'), (600, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.19.0-trunk-amd64 (SMP w/1 CPU core) Locale: LANG=it_IT.utf8, LC_CTYPE=it_IT.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Init: systemd (via /run/systemd/system) Versions of packages audacity depends on: ii audacity-data 2.0.6-2 ii libasound21.0.28-1 ii libavcodec56 6:11.3-1 ii libavformat56 6:11.3-1 ii libavutil54 6:11.3-1 ii libc6 2.19-18 ii libexpat1 2.1.0-6+b3 ii libflac++61.3.0-3 ii libflac8 1.3.0-3 ii libgcc1 1:4.9.2-10 ii libglib2.0-0 2.42.1-1 ii libid3tag00.15.1b-11 ii libmad0 0.15.1b-8 ii libmp3lame0 3.99.5+repack1-7 ii libogg0 1.3.2-1 ii libportaudio2 19+svn20140130-1 ii libportsmf0 0.1~svn20101010-4 ii libsbsms102.0.2-1 ii libsndfile1 1.0.25-9.1 ii libsoundtouch01.8.0-1 ii libsoxr0 0.1.1-1 ii libstdc++64.9.2-10 ii libtwolame0 0.3.13-1.1 ii libvamp-hostsdk3 2.5+repack0-2 ii libvorbis0a 1.3.4-2 ii libvorbisenc2 1.3.4-2 ii libvorbisfile31.3.4-2 ii libwxbase3.0-03.0.2-1+b1 ii libwxgtk3.0-0 3.0.2-1+b1 audacity recommends no packages. Versions of packages audacity suggests: ii caps [ladspa-plugin] 0.9.24-1 ii tap-plugins [ladspa-plugin] 0.7.3-1 -- no debconf information -- Antonio Ospite http://ao2.it A: Because it messes up the order in which people normally read text. See http://en.wikipedia.org/wiki/Posting_style Q: Why is top-posting such a bad thing? ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#783082: Aw: Re: linux-image-3.16.0-4-586: video players/browsers crash with 'illegal instruction' on i586
Also installing the -dbg packages for the shared objects shown in your backtraces would give even better results: libjavascriptcoregtk-1.0-0-dbg libqtwebkit4-dbg I installed these packages: libjavascriptcoregtk-1.0-0-dbg libqtwebkit4-dbg libc6-dbg:i386 libglib2.0-0-dbg:i386 libqt4-dbg:i386 and got this backtrace for midori: Program received signal SIGILL, Illegal instruction. 0xb4984144 in llint_op_jnless () from /usr/lib/i386-linux-gnu/libjavascriptcoregtk-1.0.so.0 (gdb) bt #0 0xb4984144 in llint_op_jnless () from /usr/lib/i386-linux-gnu/libjavascriptcoregtk-1.0.so.0 #1 0xae5dcf50 in ?? () Backtrace stopped: previous frame inner to this frame (corrupt stack?) (gdb) display/i $pc 1: x/i $pc = 0xb4984144 llint_op_jnless+153:fucomip %st(1),%st and qupzilla: Program received signal SIGILL, Illegal instruction. 0xb688b51a in llint_op_jnless () from /usr/lib/i386-linux-gnu/libQtWebKit.so.4 (gdb) bt #0 0xb688b51a in llint_op_jnless () from /usr/lib/i386-linux-gnu/libQtWebKit.so.4 #1 0xacc52070 in ?? () #2 0xb67fedb5 in JSC::Interpreter::executeCall (this=0xfffb, callFrame=0xbf8ab814, function=0x0, callType=CallTypeNone, callData=0x0, thisValue=..., args=0xbf8ab814) at /build/qtwebkit-bZFpMD/qtwebkit-2.3.4.dfsg/Source/JavaScriptCore/jit/JITCode.h:134 #3 0xb69180cf in JSC::call (exec=0xaca0d5c0, functionObject=..., callType=CallTypeNone, callData=0x0, thisValue=..., args=0xb739d000) at /build/qtwebkit-bZFpMD/qtwebkit-2.3.4.dfsg/Source/JavaScriptCore/runtime/CallData.cpp:39 #4 0xb69608fb in JSC::boundFunctionCall (exec=0x4274ce73) at /build/qtwebkit-bZFpMD/qtwebkit-2.3.4.dfsg/Source/JavaScriptCore/runtime/JSBoundFunction.cpp:53 #5 0xb67fee3f in JSC::Interpreter::executeCall (this=0xfffb, callFrame=0xbf8ab9c4, function=0x0, callType=3213539656, callData=0xb697bfa2 JSC::JSLockHolder::JSLockHolder(JSC::JSGlobalData*)+50, thisValue=..., args=0xb73ad280 WebCore::JSMainThreadExecState::s_mainThreadState) at /build/qtwebkit-bZFpMD/qtwebkit-2.3.4.dfsg/Source/JavaScriptCore/interpreter/Interpreter.cpp:1057 #6 0xb69180cf in JSC::call (exec=0xacb4ffe0, functionObject=..., callType=CallTypeNone, callData=0xbf8ab948, thisValue=..., args=0xb739d000) at /build/qtwebkit-bZFpMD/qtwebkit-2.3.4.dfsg/Source/JavaScriptCore/runtime/CallData.cpp:39 #7 0xb527edda in WebCore::ScheduledAction::executeFunctionInContext(JSC::JSGlobalObject*, JSC::JSValue, WebCore::ScriptExecutionContext*) () at /build/qtwebkit-bZFpMD/qtwebkit-2.3.4.dfsg/Source/WTF/wtf/HashTable.h:1107 #8 0xb527f3f8 in WebCore::ScheduledAction::execute(WebCore::Document*) () at /build/qtwebkit-bZFpMD/qtwebkit-2.3.4.dfsg/Source/WTF/wtf/HashTable.h:1107 #9 0xb5901db0 in WebCore::DOMTimer::fired() () at /build/qtwebkit-bZFpMD/qtwebkit-2.3.4.dfsg/Source/WebCore/platform/ScrollAnimator.h:73 #10 0xb5a44c07 in WebCore::ThreadTimers::sharedTimerFiredInternal() [clone .part.5] () at /build/qtwebkit-bZFpMD/qtwebkit-2.3.4.dfsg/Source/WTF/wtf/Functional.h:355 #11 0xb5d0a9f2 in WebCore::SharedTimerQt::timerEvent(QTimerEvent*) () at /build/qtwebkit-bZFpMD/qtwebkit-2.3.4.dfsg/Source/WTF/wtf/Vector.h:875 #12 0xb3e9effe in QObject::event (this=0x9693e18, e=0xbf8abdec) at kernel/qobject.cpp:1253 #13 0xb429850a in QApplicationPrivate::notify_helper (this=0x951b628, receiver=0x9693e18, e=0xbf8abdec) at kernel/qapplication.cpp:4570 #14 0xb429f420 in QApplication::notify (this=0xbf8ac0c4, receiver=0x9693e18, e=0xbf8abdec) at kernel/qapplication.cpp:4356 #15 0xb3e8442a in QCoreApplication::notifyInternal (this=0xbf8ac0c4, receiver=0x9693e18, event=0xbf8abdec) at kernel/qcoreapplication.cpp:955 #16 0xb3eb91ce in sendEvent (event=0xbf8abdec, receiver=optimized out) at ../../include/QtCore/../../src/corelib/kernel/qcoreapplication.h:231 #17 QTimerInfoList::activateTimers (this=0x951c1a4) at kernel/qeventdispatcher_unix.cpp:621 #18 0xb3eb5e49 in timerSourceDispatch (source=0x951c170) at kernel/qeventdispatcher_glib.cpp:186 #19 0xb3278da4 in g_main_dispatch (context=optimized out) at /build/glib2.0-EvFudu/glib2.0-2.42.1/./glib/gmain.c:3111 #20 g_main_context_dispatch (context=0x1) at /build/glib2.0-EvFudu/glib2.0-2.42.1/./glib/gmain.c:3710 #21 0xb32790c9 in g_main_context_iterate (context=0x951c090, block=2147115008, block@entry=1, dispatch=1, self=optimized out) at /build/glib2.0-EvFudu/glib2.0-2.42.1/./glib/gmain.c:3781 #22 0xb3279196 in g_main_context_iteration (context=0x951c090, may_block=1) at /build/glib2.0-EvFudu/glib2.0-2.42.1/./glib/gmain.c:3842 #23 0xb3eb6839 in QEventDispatcherGlib::processEvents (this=0x951c000, flags=...) at kernel/qeventdispatcher_glib.cpp:425 #24 0xb434c516 in QGuiEventDispatcherGlib::processEvents (this=0x951c000, flags=...) at kernel/qguieventdispatcher_glib.cpp:204 #25 0xb3e82d9f in QEventLoop::processEvents (this=0xbf8ac034, flags=...) at kernel/qeventloop.cpp:149 #26 0xb3e8312e in QEventLoop::exec (this=0xbf8ac034, flags=...) at kernel/qeventloop.cpp:204 #27 0xb3e892b6 in
Re: [SCM] ardour3/master-a4: Add get-orig-source.
2015-04-23 15:46 GMT+02:00 Adrian Knoth a...@drcomp.erfurt.thur.de: On 04/23/15 15:03, mira-gu...@users.alioth.debian.org wrote: The following commit has been merged in the master-a4 branch: commit a7335d52eb8f64a62932a599267330dbd4949abb Author: Jaromír Mikeš mira.mi...@seznam.cz Date: Thu Apr 23 15:04:57 2015 +0200 Add get-orig-source. diff --git a/debian/rules b/debian/rules index 69ed81a..1826796 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,12 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. +# Path to the debian directory +DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname ) +UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*upstream-version\(.*\)\/upstream-version.*/\1/p') +DFSG = dfsg1 +PKG = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p') + -include /usr/share/cdbs/1/rules/upstream-tarball.mk -include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk @@ -143,3 +149,19 @@ CDBS_PROVIDES_ardour-i686 = ardour ifeq (Ubuntu,$(shell dpkg-vendor --query Vendor)) CDBS_RECOMMENDS_ALL = firefox | www-browser endif + +get-orig-source: + uscan --noconf --force-download --rename --download-current-version --destdir=. + tar -xf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz + mv ardour-$(UPSTREAM_VERSION) $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/waf + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.git + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.gitignore + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCvst_scan + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCardour3 + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/resource + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/ msvc_resources.rc.in + XZ_OPT=-9 tar cJf ../$(PKG)_$(UPSTREAM_VERSION)~$(DFSG).orig.tar.xz $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz This looks overly complicated. In jackd2, Jonas did: # Set tag to full 40 char git tag for git snapshot release tag = $(DEB_UPSTREAM_TARBALL_VERSION) DEB_UPSTREAM_URL = https://github.com/jackaudio/jack2/archive DEB_UPSTREAM_TARBALL_BASENAME = $(tag) DEB_UPSTREAM_TARBALL_SRCDIR = jack2-$(tag) # unneeded and possibly sourceless binaries DEB_UPSTREAM_REPACKAGE_EXCLUDES += *.a *.dll *.Lib # unneeded sources copyright-protected without licence DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./windows/**.rc # pure garbage in upstream tarball DEB_UPSTREAM_REPACKAGE_EXCLUDES += .DS_Store # sources not in prefered form of modification DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./waf Can't we do the same for ardour? Just declare some excludes and let CDBS do the work? Change it to whatever you like better ... Use some CDBS style would be nicer as all package is managed by it. But I am not CDBS expert :( Or Files-Excluded from copyright file as suggested is also fine. regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#783217: [showq] Crash when saved
Package: showq Version: 0.4.1+git20090622+dfsg0-1+b1 Severity: normal --- Please enter the report below this line. --- ShowQ crashes in the following case: * Create a show and save it * Quit ShowQ * Delete the saved show * Start ShowQ - ShowQ wants to open the last session but it fails. For the user it looks like it's a new session * Press save - Crash! - ShowQ wants to save in the file which doesn't exist anymore Expected behaviour: When started the second time, ShowQ should pop up a message like Didn't found the last session. Started a new one. When pressing save, ShowQ should behave like pressing save as - the default behaviour on new sessions. --- System information. --- Architecture: amd64 Kernel: Linux 3.16.0-4-amd64 Debian Release: 8.0 500 testing-updates ftp.de.debian.org 500 testing www.deb-multimedia.org 500 testing security.debian.org 500 testing ftp.de.debian.org 100 jessie-backports ftp.de.debian.org --- Package information. --- Package's Depends field is empty. Package's Recommends field is empty. Package's Suggests field is empty. ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] ardour3/master-a4: Add get-orig-source.
Hi Adrian, Quoting Adrian Knoth (2015-04-23 15:46:55) On 04/23/15 15:03, mira-gu...@users.alioth.debian.org wrote: +# Path to the debian directory +DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname ) +UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*upstream-version\(.*\)\/upstream-version.*/\1/p') +DFSG = dfsg1 +PKG = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p') + [...] +get-orig-source: + uscan --noconf --force-download --rename --download-current-version --destdir=. + tar -xf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz + mv ardour-$(UPSTREAM_VERSION) $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/waf + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.git + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.gitignore + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCvst_scan + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCardour3 + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/resource + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/msvc_resources.rc.in + XZ_OPT=-9 tar cJf ../$(PKG)_$(UPSTREAM_VERSION)~$(DFSG).orig.tar.xz $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz This looks overly complicated. In jackd2, Jonas did: # Set tag to full 40 char git tag for git snapshot release tag = $(DEB_UPSTREAM_TARBALL_VERSION) DEB_UPSTREAM_URL = https://github.com/jackaudio/jack2/archive DEB_UPSTREAM_TARBALL_BASENAME = $(tag) DEB_UPSTREAM_TARBALL_SRCDIR = jack2-$(tag) # unneeded and possibly sourceless binaries DEB_UPSTREAM_REPACKAGE_EXCLUDES += *.a *.dll *.Lib # unneeded sources copyright-protected without licence DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./windows/**.rc # pure garbage in upstream tarball DEB_UPSTREAM_REPACKAGE_EXCLUDES += .DS_Store # sources not in prefered form of modification DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./waf Can't we do the same for ardour? Just declare some excludes and let CDBS do the work? Jonas, is this still state of the art? If so, I'd add it to ardour. Yes, seems up-to-date. Another not too big (fast to clone) inspirational package that I recently updated which involve both ~rc mangling and repackaging: debcheckout ruby-compass - Jonas -- * Jonas Smedegaard - idealist Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#783082: Aw: Re: linux-image-3.16.0-4-586: video players/browsers crash with 'illegal instruction' on i586
Hello hikaru, additional to the patch above it looks like there is also a flaw in debian/confflags: --- libav-11.3.orig/debian/confflags2015-01-17 18:25:07.0 + +++ libav-11.3/debian/confflags 2015-04-22 22:35:12.616951338 + @@ -180,7 +180,7 @@ shared_build_confflags += --enable-share shared_build_confflags += --disable-static # i386 shared builds must be optimized for 586, cf. #728928, #688384 ifeq ($(DEB_HOST_ARCH),i386) -shared_build_confflags += --cpu=586 +shared_build_confflags += --cpu='i586' endif ## specific to arm architectures But then build of libav fails for me: .../libav-11.3/libavcodec/h264_cabac.c: In function 'ff_h264_decode_mb_cabac': .../libav-11.3/libavcodec/x86/cabac.h:173:5: error: 'asm' operand has impossible constraints Also installing the -dbg packages for the shared objects shown in your backtraces would give even better results: libjavascriptcoregtk-1.0-0-dbg libqtwebkit4-dbg Kind regards, Bernhard ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: Packaging ardour 4.0
2015-04-23 10:47 GMT+02:00 Adrian Knoth a...@drcomp.erfurt.thur.de: http://git.ardour.org/ardour/ardour.git master For get-orig-source method (I want to use for repacking) is needed working watch file first. Is there any web interface to upstream git to we can monitor it with uscan? Yes, use https://github.com/Ardour/ardour Thanks for taking care of this. Hi Adrian, $ debian/rules get-orig-source This will give you repacked tarball dfsg1 now. Please test it ... if fine upload repacked orig to our repo. Sorry I would do it myself but busy at the moment :( regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: Packaging ardour 4.0
http://git.ardour.org/ardour/ardour.git master For get-orig-source method (I want to use for repacking) is needed working watch file first. Is there any web interface to upstream git to we can monitor it with uscan? Yes, use https://github.com/Ardour/ardour Thanks for taking care of this. Cheers ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] ardour3/master-a4: Add watch file.
2015-04-23 12:19 GMT+02:00 mira-gu...@users.alioth.debian.org: The following commit has been merged in the master-a4 branch: commit 2fc08ab5d244ca4c8a7d3ae3dac5c87846bbf4a5 Author: Jaromír Mikeš mira.mi...@seznam.cz Date: Thu Apr 23 12:21:09 2015 +0200 Add watch file. diff --git a/debian/watch b/debian/watch new file mode 100644 index 000..b44211b --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/ardour-$1\.tar\.gz/ \ + https://github.com/Ardour/ardour/tags .*/v?(\d\S*)\.tar\.gz -- ardour3 packagin Hi, my watch file recognize 4.0-rc4 as higher version then 4.0 :( Can someone help me to fix it? regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] ardour3/master-a4: Add watch file.
Quoting Jaromír Mikeš (2015-04-23 12:22:37) my watch file recognize 4.0-rc4 as higher version then 4.0 :( Can someone help me to fix it? Adding this to opts (multiple opts should be comma-separated) should work: uversionmangle=s/-rc/~rc/ - Jonas -- * Jonas Smedegaard - idealist Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] ardour3/master-a4: Add get-orig-source.
On 04/23/15 15:03, mira-gu...@users.alioth.debian.org wrote: The following commit has been merged in the master-a4 branch: commit a7335d52eb8f64a62932a599267330dbd4949abb Author: Jaromír Mikeš mira.mi...@seznam.cz Date: Thu Apr 23 15:04:57 2015 +0200 Add get-orig-source. diff --git a/debian/rules b/debian/rules index 69ed81a..1826796 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,12 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. +# Path to the debian directory +DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname ) +UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*upstream-version\(.*\)\/upstream-version.*/\1/p') +DFSG = dfsg1 +PKG = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p') + -include /usr/share/cdbs/1/rules/upstream-tarball.mk -include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk @@ -143,3 +149,19 @@ CDBS_PROVIDES_ardour-i686 = ardour ifeq (Ubuntu,$(shell dpkg-vendor --query Vendor)) CDBS_RECOMMENDS_ALL = firefox | www-browser endif + +get-orig-source: + uscan --noconf --force-download --rename --download-current-version --destdir=. + tar -xf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz + mv ardour-$(UPSTREAM_VERSION) $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/waf + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.git + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.gitignore + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCvst_scan + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCardour3 + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/resource + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/msvc_resources.rc.in + XZ_OPT=-9 tar cJf ../$(PKG)_$(UPSTREAM_VERSION)~$(DFSG).orig.tar.xz $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) + rm -rf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz This looks overly complicated. In jackd2, Jonas did: # Set tag to full 40 char git tag for git snapshot release tag = $(DEB_UPSTREAM_TARBALL_VERSION) DEB_UPSTREAM_URL = https://github.com/jackaudio/jack2/archive DEB_UPSTREAM_TARBALL_BASENAME = $(tag) DEB_UPSTREAM_TARBALL_SRCDIR = jack2-$(tag) # unneeded and possibly sourceless binaries DEB_UPSTREAM_REPACKAGE_EXCLUDES += *.a *.dll *.Lib # unneeded sources copyright-protected without licence DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./windows/**.rc # pure garbage in upstream tarball DEB_UPSTREAM_REPACKAGE_EXCLUDES += .DS_Store # sources not in prefered form of modification DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./waf Can't we do the same for ardour? Just declare some excludes and let CDBS do the work? Jonas, is this still state of the art? If so, I'd add it to ardour. Cheers ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] ardour3/master-a4: Add get-orig-source.
On 2015-04-23 15:46:55, Adrian Knoth wrote: On 04/23/15 15:03, mira-gu...@users.alioth.debian.org wrote: The following commit has been merged in the master-a4 branch: commit a7335d52eb8f64a62932a599267330dbd4949abb Author: Jaromír Mikeš mira.mi...@seznam.cz Date: Thu Apr 23 15:04:57 2015 +0200 Add get-orig-source. diff --git a/debian/rules b/debian/rules index 69ed81a..1826796 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,12 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. +# Path to the debian directory +DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname ) +UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*upstream-version\(.*\)\/upstream-version.*/\1/p') +DFSG = dfsg1 +PKG = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p') + -include /usr/share/cdbs/1/rules/upstream-tarball.mk -include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk @@ -143,3 +149,19 @@ CDBS_PROVIDES_ardour-i686 = ardour ifeq (Ubuntu,$(shell dpkg-vendor --query Vendor)) CDBS_RECOMMENDS_ALL = firefox | www-browser endif + +get-orig-source: +uscan --noconf --force-download --rename --download-current-version --destdir=. +tar -xf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz +mv ardour-$(UPSTREAM_VERSION) $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) +rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/waf +rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.git +rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/.gitignore +rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCvst_scan +rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/MSVCardour3 +rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/resource +rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG)/icons/win32/msvc_resources.rc.in +XZ_OPT=-9 tar cJf ../$(PKG)_$(UPSTREAM_VERSION)~$(DFSG).orig.tar.xz $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) +rm -rf $(PKG)-$(UPSTREAM_VERSION)~$(DFSG) +rm -rf $(PKG)_$(UPSTREAM_VERSION).orig.tar.gz This looks overly complicated. In jackd2, Jonas did: # Set tag to full 40 char git tag for git snapshot release tag = $(DEB_UPSTREAM_TARBALL_VERSION) DEB_UPSTREAM_URL = https://github.com/jackaudio/jack2/archive DEB_UPSTREAM_TARBALL_BASENAME = $(tag) DEB_UPSTREAM_TARBALL_SRCDIR = jack2-$(tag) # unneeded and possibly sourceless binaries DEB_UPSTREAM_REPACKAGE_EXCLUDES += *.a *.dll *.Lib # unneeded sources copyright-protected without licence DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./windows/**.rc # pure garbage in upstream tarball DEB_UPSTREAM_REPACKAGE_EXCLUDES += .DS_Store # sources not in prefered form of modification DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./waf uscan now supports this directly via the Files-Excluded field in debian/copyright. See handbrake in exerpimental for an example: https://anonscm.debian.org/cgit/pkg-multimedia/handbrake.git/tree/debian/copyright?h=experimental Cheers -- Sebastian Ramacher signature.asc Description: Digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] ardour3/master-a4: Add watch file.
2015-04-23 12:42 GMT+02:00 Jonas Smedegaard d...@jones.dk: Quoting Jaromír Mikeš (2015-04-23 12:22:37) my watch file recognize 4.0-rc4 as higher version then 4.0 :( Can someone help me to fix it? Adding this to opts (multiple opts should be comma-separated) should work: uversionmangle=s/-rc/~rc/ Thank you Jonas! Working indeed. ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#783082: Aw: Re: linux-image-3.16.0-4-586: video players/browsers crash with 'illegal instruction' on i586
Hi Bernhard On 2015-04-23 08:23:03, Bernhard Übelacker wrote: --- libav-11.3.orig/debian/confflags2015-01-17 18:25:07.0 + +++ libav-11.3/debian/confflags 2015-04-22 22:35:12.616951338 + @@ -180,7 +180,7 @@ shared_build_confflags += --enable-share shared_build_confflags += --disable-static # i386 shared builds must be optimized for 586, cf. #728928, #688384 ifeq ($(DEB_HOST_ARCH),i386) -shared_build_confflags += --cpu=586 +shared_build_confflags += --cpu='i586' endif ## specific to arm architectures Thanks for the patch. But then build of libav fails for me: .../libav-11.3/libavcodec/h264_cabac.c: In function 'ff_h264_decode_mb_cabac': .../libav-11.3/libavcodec/x86/cabac.h:173:5: error: 'asm' operand has impossible constraints https://bugzilla.libav.org/show_bug.cgi?id=850 Cheers -- Sebastian Ramacher signature.asc Description: Digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers