Re: qmapshack for debian
On 08/05/2014 07:42 PM, Jaromír Mikeš wrote:
> 2014-08-05 18:16 GMT+02:00 Sebastiaan Couwenberg <sebastic@xs4all.nl>:
>> For starters I recommend the usage of Config::Model, specifically it's
>> dpkg support for a consistently formatted d/control.
>>
>> Its usage is documented in the Debian GIS Policy:
>>
>> http://pkg-grass.alioth.debian.org/policy/policy.html#cme
>>
>> This would fix the reported lintian errors:
>>
>> E: qmapshack source: multiline-field maintainer
>> E: qmapshack: multiline-field maintainer
>>
>
> Fixed.
Thanks.
>> Secondly I'm not sure about some of the build dependencies.
>>
>> You're currently using:
>>
>> debhelper (>= 9.20120417~),
>>
>
> You need this version of debhelper to get proper hardening with cmake
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668813
I see, that's a good reason for an explicit version requirement.
Do you intent to support backports?
Because the debhelper version in testing and unstable already includes
this support.
>> With the recent enhancements in uscan it can strip files listed in the
>> Files-Excluded section of the debian/copyright file, you could use this
>> instead of the tar dance in debian/rules.
>>
>> The current get-orig-source target can also be simplified by using `tar
>> --delete`. For an example see its usage in postgis:
>>
>>
>> http://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/get-orig-source
>>
>>
> This way of getting orig source repacked is becoming standard in
> pkg-multimedia team where I co-maintain some packages.
> Some I am used to it moreover uscan currently doesn't work with bitbucket :(
>
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749225
>
> So this solution allows me get orig source via wget.
The wget route seems to be a good enough workaround for the uscan issue.
I would still use `tar --delete` to remove the .hg directory, e.g. with
something like the following patch (note: untested):
diff --git a/debian/rules b/debian/rules
index ec21e31..1dd2bd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,11 +15,4 @@ get-orig-source:
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749225
# uscan --noconf --force-download --rename --debug --destdir=.
wget
https://bitbucket.org/maproom/qmapshack/downloads/$(pkg)-$(upstream_version).tar.gz
- mv $(pkg)-$(upstream_version).tar.gz
$(pkg)_$(upstream_version).orig.tar.gz
- tar -xf $(pkg)_$(upstream_version).orig.tar.gz
- mv $(pkg)-$(upstream_version) $(pkg)-$(dfsg_version)
-# find $(pkg)-$(dfsg_version)/ -name '.hg' -delete
- rm -R $(pkg)-$(dfsg_version)/.hg
- tar cf $(pkg)_$(dfsg_version).orig.tar $(pkg)-$(dfsg_version)
- gzip $(pkg)_$(dfsg_version).orig.tar
- rm -rf $(pkg)-$(dfsg_version)
+ gunzip -c ../$(pkg)-$(upstream_version).tar.gz | tar --delete
--wildcards -vf - $(pkg)-$(upstream_version)/.hg\* | GZIP="--best
--no-name" gzip -c > ../$(pkg)_$(upstream_version)+ds.orig.tar.gz
>> Finally the package contains the qlandkartegt.menu file, which doesn't
>> seem appropriately named for qmapshack. And appears unused in the package.
>>
>
> Yes starting point were debian/* files from qlandkartegt ;) as probably
> guessed.
> Fixed.
That's what I thought indeed. :)
> qmapshack now installing png icon instead of xpm.
> What is your prefered way for fixing?
What do you mean by this exactly?
Just commit your changes in git and prepare a new release, upload it to
mentors and request sponsorship. Add an entry to the SoB wiki page to
notify our awesome sponsor.
> regards
>
> mira
Kind Regards,
Bas
--
GPG Key ID: 4096R/E88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
Reply to: