Re: [Stormpkg-devel] debian/rules + misc

[Christian K. <sh...@de...>]

On 00-07-17 Marcelo E. Magallon wrote:
>  In order to figure out some context for the Spanish translation I had
>  to build stormpkg.  There's a bug (#108784) stating that it won't
>  build.  It's fixed now (hint, close the bug) but it still won't build,
>  in debian/rules one has to change:

>         install -d debian/tmp/usr/share/icons/
>         install -d debian/tmp/usr/share/applnk
>         cp -r debian/gnome/* debian/tmp/usr/share/gnome/apps
> -       cp -r pixmaps/stormpkg_box*.xpm debian/tmp/usr/share/icons
> +       cp -r pixmaps/*.xpm debian/tmp/usr/share/icons
>         cp -r debian/kde/* debian/tmp/usr/share/applnk
>  
>  I didn't change this because this is not the reason I was granted write
>  access to the CVS tree.  Would anyone mind if I change such things
>  directly (with a proper log) or do you guys prefer to have a bug
>  submitted?

No, I think as you got the same cvs-access and one is able to trace the
changes of somebody, you should fold in the changes in the cvs-tree.

>  Along the same lines, in po/Makefile.in.in there's a problem which will
>  prevent the package from building, namely:

> @@ -111,16 +111,16 @@
>  install-data-no: all
>  install-data-yes: all
>         if test -r "$(MKINSTALLDIRS)"; then \
> -         $(MKINSTALLDIRS) $(datadir); \
> +         $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
>         else \
> -         $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
> +         $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
>         fi
>         @catalogs='$(CATALOGS)'; \
>         for cat in $$catalogs; do \
>           cat=`basename $$cat`; \
>           case "$$cat" in \
> -           *.gmo) destdir=$(gnulocaledir);; \
> -           *)     destdir=$(localedir);; \
> +           *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
> +           *)     destdir=$(DESTDIR)$(localedir);; \
>           esac; \
>           lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
>           dir=$$destdir/$$lang/LC_MESSAGES; \

>  i.e., stuff is getting installed on $(prefix)/blah/$(datadir), and
>  prefix is set to /usr.  One option is to install the files with prefix
>  set to $PWD/debian/tmp/usr and the other one is applying this patch.

If the prefix is currently set to point to /usr, I think we should
change the default so, that it points to /usr/local instead. Anyway I
think the current behaviour is the same as for other software which
comes out of cvs or a tar.gz. So I don't see the need for changing it,
but if the others think it's good, then let's fold it in.

>  Also, I noticed some stuff like configure is on the CVS tree.  It
>  shouldn't.  config.h, log, po/stamp-cat-id, po/cat-id-tbl.c,
>  po/Makefile, po/Makefile.in shouldn't be there, too.  (and I guess
>  stamp-h neither)

Well, I noticed some other stuff and so I cleaned the cvs-tree a bit
more up and now it's hopefully clean enough. I only failed to remove the
directory .xvpics under pixmaps. Could somebody with more knowledge
about cvs do this please, I tried but somehow failed.

>  And lastly, for some reason my Makefile.in.in got changed/updated
>  (sorry, I'm not at home to check the version the gettext -- it's
>  whatever is on woody atm)

Which Makefile.in.in do you exactly mean, the one in po? Could you
please look what the changes are and tell us?

Ciao
     Christian
-- 
          Debian Developer and Quality Assurance Team Member
    1024/26CC7853 31E6 A8CA 68FC 284F 7D16  63EC A9E6 67FF 26CC 7853