Re: trivial patch for debian/control typo

[Thomas Viehmann <tv beamnet de>]

Philip Van Hoof wrote:
> Committed, thanks
> 
> On Tue, 2006-11-21 at 23:43 +0100, Thomas Viehmann wrote:
>> Hi,
>>
>> attached is a trivial patch for the debian/control (>= >= instead of >=
>> in a build-dependency).
>> Maybe it would be worthwile to include in debian/rules a target
>> get-orig-source (or generate-orig-source) that generates an orig.tar.gz
>> tarball from the svn checkout, ideally checking the dependencies for this.
> 
> go ahead
So this is what I had in mind. It suffers from me not knowing a good way
to do cleanup in a make-target (removing the temp-dir), though.
I'm decreasing the version number compared to the /debian/changelog in
svn, maybe it would be a good idea not to have 1.0.0 in there (the
current version will be greater than all 0.x releases)...
So "debian/rules make-orig-source" called from the svn checkout's root
directory will give a source package (*.{dsc,diff.gz,orig.tar.gz}) that
builds e.g. with pbuilder.
I've not changed the packaging itself, I think some more stuff needs to
be moved to the -dev package, and then there's your comments about
splitting the packages.

Oh, and I've added the mozilla build-dependencies (checked against
Debian/unstable, but should be OK for testing as well).

Kind regards

T.
-- 
Thomas Viehmann, http://thomas.viehmann.net/

Index: debian/control
===================================================================
--- debian/control	(revision 1209)
+++ debian/control	(working copy)
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Oystein Gisnas <oystein gisnas net>
-Build-Depends: debhelper (>= 5), cdbs, dpkg-dev (>= 1.13.19), gtk-doc-tools (>= 1.0), libglib2.0-dev (>= 2.6), libgtk2.0-dev, libgnomevfs2-dev, libgnomeui-dev, libgnome-keyring-dev, libgconf2-dev, libnm-glib-dev
+Build-Depends: debhelper (>= 5), cdbs, dpkg-dev (>= 1.13.19), gtk-doc-tools (>= 1.0), libglib2.0-dev (>= 2.6), libgtk2.0-dev, libgnomevfs2-dev, libgnomeui-dev, libgnome-keyring-dev, libgconf2-dev, libnm-glib-dev, libnss3-dev, libnspr4-dev, libxul-dev
 Standards-Version: 3.7.2
 
 Package: tinymail-gtk
Index: debian/rules
===================================================================
--- debian/rules	(revision 1209)
+++ debian/rules	(working copy)
@@ -2,3 +2,25 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+
+make-orig-source: TMPNAME:=$(shell mktemp -d)
+make-orig-source: DATE:=$(shell date --iso)
+make-orig-source: UPSTREAMVER:=0~svn-$(DATE)
+make-orig-source:
+	-make -f debian/rules make-orig-source-internal TMPNAME=$(TMPNAME) DATE=$(DATE) UPSTREAMVER=$(UPSTREAMVER)
+	-rm -rf $(TMPNAME)
+	rm $(CURDIR)/debian/make-orig-source-internal-temp.stamp \
+	  || (echo "Making the Debian source package failed, see above" ; \
+	      false)
+
+make-orig-source-internal:
+	echo -e "Source: tinymail\nBuild-Depends: subversion, autoconf, automake1.9, autotools-dev, libtool, gtk-doc-tools (>= 1.0), libglib2.0-dev (>= 2.6), gnome-common, devscripts, fakeroot\n\nPackage: tinymail\n" | dpkg-checkbuilddeps -
+	svn export . $(TMPNAME)/tinymail-$(UPSTREAMVER)
+	cd $(TMPNAME)/tinymail-$(UPSTREAMVER) && NOCONFIGURE=1 ./autogen.sh
+	cd $(TMPNAME) && tar czf tinymail_$(UPSTREAMVER).orig.tar.gz --exclude tinymail-$(UPSTREAMVER)/debian tinymail-$(UPSTREAMVER)
+	cd $(TMPNAME)/tinymail-$(UPSTREAMVER) && dch -bv $(UPSTREAMVER)-1 "Exported from SVN on $(DATE)"
+	cd $(TMPNAME)/tinymail-$(UPSTREAMVER) && dpkg-buildpackage -rfakeroot -S -uc -us && \
+	cd $(TMPNAME) && mv *.diff.gz *.dsc *.orig.tar.gz $(CURDIR)/
+	touch $(CURDIR)/debian/make-orig-source-internal-temp.stamp
+
+.PHONY: make-orig-source make-orig-source-internal