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
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
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