[patch, iceape] remove README.build, add README.source

Andreas Metzler ametzler at downhill.at.eu.org
Mon Jan 1 14:00:04 CET 2007


On 2007-01-01 Mike Hommey <mh at glandium.org> wrote:
[...]
> Why ? #1 is about getting the source tarball from upstream. Actually,
> there needs to be some step between #2 and #3 to generate the
> .orig.tar.gz.

Okay:
---------------------
Index: debian/README.source
===================================================================
--- debian/README.source	(Revision 39735)
+++ debian/README.source	(Arbeitskopie)
@@ -14,5 +14,8 @@
 SVN:
 svn export svn://svn.debian.org/pkg-mozilla/iceape/trunk/debian debian
 chmod +x debian/rules
-#3 Build
-dpkg-buildpackage -uc -us -rfakeroot -b
+#3 Run
+fakeroot debian/rules source
+to generate a new tarball containing only dfsg free content.
+#4 Build
+dpkg-buildpackage -uc -us -rfakeroot
---------------------

debian/rules source won't wor correctly if a epoch is introduced - the
epoch should not be part of the orig.tar.gz filename afaiui. - This
ugly patch would fix it:
------------------
Index: debian/rules
===================================================================
--- debian/rules	(Revision 39735)
+++ debian/rules	(Arbeitskopie)
@@ -260,7 +260,7 @@
 
 source: clean
 	sh $(CURDIR)/debian/remove.nonfree
-	tar -C .. -zcf ../`dpkg-parsechangelog | sed -n '/Source:/ N; s/Source: \(.*\)\nVersion: \(.*\)-[0-9][0-9]*$$/\1_\2/ p'`.orig.tar.gz --exclude=`basename $(CURDIR)`/debian `basename $(CURDIR)`
+	tar -C .. -zcf ../`dpkg-parsechangelog | sed -n '/Source:/ N; s/Source: \(.*\)\nVersion: \(.*:\|\)\(.*\)-[0-9][0-9]*$$/\1_\3/ p'`.orig.tar.gz --exclude=`basename $(CURDIR)`/debian `basename $(CURDIR)`
 
 binary: binary-indep binary-arch
 	find debian/tmp -printf %P\\n | sort -u > debian/tmp.list
------------------

> Also note that the upstream source tarball can be get with uscan. That
> may be good to add that to the source target...

The current watchfile does not match, BTW - it is built for
1.0.7+dfsg-1, but debian/changelog uses 1.0.7.dfsg-1 (plus versus
dot). Either changelog or watchfile need to change.
cu andreas
-- 
The 'Galactic Cleaning' policy undertaken by Emperor Zhark is a personal
vision of the emperor's, and its inclusion in this work does not constitute
tacit approval by the author or the publisher for any such projects,
howsoever undertaken.                                (c) Jasper Ffforde



More information about the pkg-mozilla-maintainers mailing list