Merge lp:~pkgcrosswire/sword/get-orig-source into lp:sword/debian

Proposed by Jonathan Marsden
Status: Merged
Merged at revision: not available
Proposed branch: lp:~pkgcrosswire/sword/get-orig-source
Merge into: lp:sword/debian
Diff against target: None lines
To merge this branch: bzr merge lp:~pkgcrosswire/sword/get-orig-source
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Pending
Review via email: mp+5703@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Marsden (jmarsden) wrote :

Per Roberto's suggestion, this
adds a get-orig-source rule so
we can automatically repack the
SWORD source tarball, removing
the zlib and regex files.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

2009/4/20 Jonathan Marsden <email address hidden>:
> Jonathan Marsden has proposed merging lp:~pkgcrosswire/libsword/get-orig-source into lp:libsword.
>
> Requested reviews:
>    Дмитрий Ледков (dmitrij.ledkov)
>
> Per Roberto's suggestion, this
> adds a get-orig-source rule so
> we can automatically repack the
> SWORD source tarball, removing
> the zlib and regex files.

I'm against this. Both zlib and regex are DFSG-free and are included
in Debian main, hence there are no restrictions from legal point of
view for debian. Yes, we don't need them (debian policy) but removal
of just zlib and regex do not outweigh the ability to check checksums
of the upstream tarball.

A patch will do it just fine to remove these files before we do
anything giving the same result, but the checksums can be still
checked.

And the preferred solution IMHO is to work with upstream on this issue.

--
With best regards

Dmitrijs Ledkovs (for short Dima),
Ледков Дмитрий Юрьевич

Revision history for this message
Jonathan Marsden (jmarsden) wrote :

>> Per Roberto's suggestion, this adds a get-orig-source rule so
>> we can automatically repack the SWORD source tarball, removing
>> the zlib and regex files.

> I'm against this. ...

OK. There are likely to be other files we will need to remove too, if we can't get solid copyright and licence info for them. For these particular files (zlib and regex) you are right that there is no legal necessity for omitting them in this way.

> And the preferred solution IMHO is to work with upstream on this issue.

Theoretically, yes, of course. That is why I raised the issue on the mailing list.

In practice, we already know that upstream (CrossWire) wants these files left in the tarball for Windows use; that's not entirely unreasonable, IMO (as long as they are appropriately acknowledged, and kept somewhat up to date). If you feel there is a strong case you can make for removing them from the upstream tarball, feel free to work with the CrossWire SWORD developers to persuade them to remove these files from their release tarballs; if you succeed, that would be a good solution from our perspective. I suspect you'd upset SWORD Windows devels in the process, though (especially if you are consistent and carry this approach through to things like the untgz and Sapphire II files as well).

Personally, I think this is a Debian/Ubuntu packaging issue. I don't feel I can make a strong case for the upstream removal of the zlib and regex files, but if you can, cool -- make it :)

Meanwhile, I'm just coding and testing exactly what our one and only active upload sponsor has suggested we do in this situation -- work that seems appropriate, so that we can continue to get our uploads sponsored :) If you want to propose an alternate patch that removes these files, that's fine too, go ahead and create and test a branch with such a patch (or rm commands in debian/rules that act before ./configure is run, or whatever approach you prefer) in it, and then we can ask Roberto which approach he prefers, merge that to main, and upload his chosen variant.

Jonathan

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

LinkedIn
------------

I'd like to add you to my professional network on LinkedIn.

- Dmitrijs Ledkovs

Confirm that you know Dmitrijs Ledkovs
https://www.linkedin.com/e/isd/1067432964/7_eG1Jl_/

------
(c) 2010, LinkedIn Corporation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2009-04-11 21:57:36 +0000
3+++ debian/rules 2009-04-20 04:28:28 +0000
4@@ -34,3 +34,36 @@
5
6 clean/::
7 rm -f *.1
8+
9+# Makefile arcanery warning:
10+# $(dir $(_)) gives us the path containing this rules file.
11+# This magic care of Emmet Hickory:
12+# (http://lists.debian.org/debian-devel-games/2008/02/msg00135.html)
13+
14+TEMP_DIR := $(shell mktemp -d)
15+SOURCE_DIR = $(shell ls $(TEMP_DIR) | grep sword- | grep .tar.gz | sed s/.tar.gz//)
16+SOURCE_VER = $(shell echo $(notdir $(SOURCE_DIR)) | sed s/sword-//)
17+
18+download-tarball:
19+ uscan --download --package sword --destdir=$(TEMP_DIR) \
20+ --no-symlink --upstream-version 0 --watchfile=$(dir $(_))/watch
21+ cd $(TEMP_DIR) && tar zxf sword-*.tar.gz
22+
23+remove-unwanted-files: download-tarball
24+ # zlib is (mostly) an old copy of the zlib library
25+ # Leave only untgz.c which is needed and not part of zlib
26+ rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/zlib/[a-tv-z]*
27+ rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/zlib/uncompr.c
28+ rm $(TEMP_DIR)/$(SOURCE_DIR)/include/zlib.h
29+ # regex.c and regex.h are GNU C library files
30+ rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/regex.c
31+ rm $(TEMP_DIR)/$(SOURCE_DIR)/include/regex.h
32+
33+repack-source: remove-unwanted-files
34+ cd $(TEMP_DIR) && mv $(SOURCE_DIR) $(SOURCE_DIR)+dfsg && \
35+ tar zcf sword_$(SOURCE_VER)+dfsg.orig.tar.gz \
36+ $(notdir $(SOURCE_DIR)+dfsg)
37+
38+get-orig-source: repack-source
39+ mv $(TEMP_DIR)/sword_$(SOURCE_VER)+dfsg.orig.tar.gz $(CURDIR)
40+ rm -r $(TEMP_DIR)

Subscribers

People subscribed via source and target branches