From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id n8MBtpU8188578 for ; Tue, 22 Sep 2009 06:55:54 -0500 Received: from bombadil.infradead.org (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id 6651B1A755DB for ; Tue, 22 Sep 2009 04:57:08 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) by cuda.sgi.com with ESMTP id 9GECJacynq5Wmg6C for ; Tue, 22 Sep 2009 04:57:08 -0700 (PDT) Date: Tue, 22 Sep 2009 07:57:07 -0400 From: Christoph Hellwig Subject: Re: [patch] xfsprogs build tweaks for Debian Message-ID: <20090922115707.GA8143@infradead.org> References: <777659823.265181253164106522.JavaMail.root@mail-au.aconex.com> <1527800797.273701253228929936.JavaMail.root@mail-au.aconex.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1527800797.273701253228929936.JavaMail.root@mail-au.aconex.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: Nathan Scott Cc: xfs@oss.sgi.com On Fri, Sep 18, 2009 at 09:08:49AM +1000, Nathan Scott wrote: > Hi all, > > This patch allows deb packages to be generated more cleanly by Makepkgs > than it currently allows. In particular, it handles the issue of having > .git files in the generated tarball, and also puts the debs in build/deb > when they're built, which is a bit more convenient and consistent. The tarball generated by Makepks does not contain .git. Do you create a tarball in a different way for debian? > +++ b/Makefile > @@ -9,9 +9,7 @@ ifeq ($(HAVE_BUILDDEFS), yes) > include $(TOPDIR)/include/builddefs > endif > > -CONFIGURE = aclocal.m4 configure config.guess config.sub configure install-sh \ > - ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ > - m4/ltversion.m4 m4/lt~obsolete.m4 > +CONFIGURE = aclocal.m4 configure config.guess config.sub install-sh ltmain.sh So configure was mentioned twice which is an obvious bug. But why do we want to remove the m4/* files from the list of files to package? [Ah, they're added inside the m4 directory, ok] > type=rpm > +[ -f /etc/debian_version ] && type=debian would be cleaner as # # If we're on a Debian or Debian-derived system generate deb packages by # default, else RPM packages. # if [ -f /etc/debian_version ] type=debian else type=rpm fi > diff --git a/VERSION b/VERSION > index b3a880e..6018818 100644 > --- a/VERSION > +++ b/VERSION > @@ -3,5 +3,5 @@ > # > PKG_MAJOR=3 > PKG_MINOR=0 > -PKG_REVISION=3 > +PKG_REVISION=4 > PKG_BUILD=1 Note that when you bump package version please always also tag the result in git. > + - Debian packaging updates, esp. readline6 dependency. Btw, didn't readline move to GPLv3 while we have GPLv2 code in libxfs? _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs