Hello Daniel,
On Mon, Feb 20, 2006 at 08:18:33PM +0100, Daniel Baumann wrote:
> ..then I suggest you send me your package, I look over it, add myself as
> Maintainer, you as Co-Maintainer and we are all happy :)
Agreed. The latest version is now in the archive (0.9.93-1). The
following open issues remain:
*Everything as Patches: The build is not idempotent, i.e. upstream
ships autogenerated files (and partially not even the proper
ones, i.e. regenerating during build gives a slightly different
result). This is the only reason the version in the archives touches
files outside of debian/. I tried to include those changes as patches
(which you'll find attached), but somehow cdbs mixed up the make
clean phase and the unapplying state (there I had troubles, and since
I have not much prior cdbs experience, I could not continue atm).
*README.Debian below 76 Zeichen/Zeile: My sponsor Martin Michlmayr
noticed that this file had lines longer than 80 characters (I did
not touch it because I did not notice and neither linda nor lintian
informed me of them).
*linda says "W: goobox; Long descriptions contains short description"
I think the long description is fine, but maybe we can address this
issue as well.
*I think #319712 is addressed by my upload as well, but I haven't
checked (ripping in the changeroot does not really work and in
testing goobox no longer builds ....)
If you like I can contact upstream regarding the idempotency.
Greetings
Helge
--
Dr. Helge Kreutzmann, Dipl.-Phys. Helge.Kreutzmann@itp.uni-hannover.de
gpg signed mail preferred
64bit GNU powered http://www.itp.uni-hannover.de/~kreutzm
Help keep free software "libre": http://www.ffii.de/
--- goobox-0.9.93.orig/data/Makefile.am 2005-11-18 21:20:07.000000000 +0100 +++ goobox-0.9.93-1r1b/data/Makefile.am 2006-02-19 17:04:11.569827216 +0100 @@ -42,8 +42,6 @@ DISTCLEANFILES = \ - $(schema_DATA) \ - $(desktop_DATA) \ $(server_DATA) \ GNOME_Goobox.server.in \ GNOME_Goobox.server --- goobox-0.9.93.orig/data/Makefile.in 2005-11-18 21:20:21.000000000 +0100 +++ goobox-0.9.93-1r1b/data/Makefile.in 2006-02-19 17:04:11.571826912 +0100 @@ -242,8 +242,6 @@ DISTCLEANFILES = \ - $(schema_DATA) \ - $(desktop_DATA) \ $(server_DATA) \ GNOME_Goobox.server.in \ GNOME_Goobox.server
--- goobox-0.9.93.orig/gnome-doc-utils.make 2005-11-18 21:20:09.000000000 +0100
+++ goobox-0.9.93-1r1b/gnome-doc-utils.make 2006-02-19 17:04:11.593823568 +0100
@@ -34,7 +34,7 @@
$(DOC_H_FILE): $(DOC_H_DOCS);
@rm -f $@.tmp; touch $@.tmp;
echo 'const gchar* documentation_credits[] = {' >> $@.tmp
- for doc in $(DOC_H_DOCS); do \
+ list='$(DOC_H_DOCS)'; for doc in $$list; do \
xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
xsltproc --path "$$xmlpath" $(_credits) $$doc; \
@@ -44,7 +44,7 @@
echo ' NULL' >> $@.tmp
echo '};' >> $@.tmp
echo >> $@.tmp
- for doc in $(DOC_H_DOCS); do \
+ list='$(DOC_H_DOCS)'; for doc in $$list; do \
xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
@@ -306,7 +306,7 @@
$(_CVSIGNORE_TOP) : $(_CVSIGNORE_TOP_FILES)
if ! test -f $@; then touch $@; fi
cat $@ > $@.tmp
- for file in $^; do \
+ list='$^'; for file in $$list; do \
echo $$file >> $@.tmp; \
done
cat $@.tmp | sort | uniq > $@
@@ -315,7 +315,7 @@
$(_CVSIGNORE_C) : $(_CVSIGNORE_C_FILES)
if ! test -f $@; then touch $@; fi
cat $@ > $@.tmp
- for file in $^; do \
+ list='$^'; for file in $$list; do \
echo $$file | sed -e 's/.*\///' >> $@.tmp; \
done
cat $@.tmp | sort | uniq > $@
@@ -324,7 +324,8 @@
$(_CVSIGNORE_LC) : $(_CVSIGNORE_LC_FILES)
if ! test -f $@; then touch $@; fi
cat $@ > $@.tmp
- for file in $(wildcard $(_CVSIGNORE_LC_FILES),$(dir $@)/*); do \
+ list='$(wildcard $(_CVSIGNORE_LC_FILES),$(dir $@)/*)'; \
+ for file in $$list; do \
echo $$file | sed -e 's/.*\///' >> $@.tmp; \
done
cat $@.tmp | sort | uniq > $@
@@ -443,7 +444,7 @@
cp "$(srcdir)/$@" "$@"; \
fi;
@docs=; \
- for doc in $(_DOC_C_DOCS_NOENT) ; do \
+ list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
if test -f $$doc; then \
docs="$$docs ../$$doc"; \
else \
@@ -469,11 +470,12 @@
$(_DOC_LC_DOCS) : $(_DOC_POFILES)
$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
if ! test -d $(dir $@); then mkdir $(dir $@); fi
- if test -f "C/$(notdir $@)"; then d="../"; else d="../$(srcdir)/"; fi; \
+ case "$(srcdir)" in /*) sd="$(srcdir)";; *) sd="../$(srcdir)";; esac; \
+ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$$sd/"; fi; \
(cd $(dir $@) && \
$(_xml2po) -e -p \
- $${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po \
- $${d}C/$(notdir $@) > $(notdir $@).tmp && \
+ "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
## @ _DOC_POT
@@ -521,7 +523,7 @@
clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
clean-doc-lc:
rm -f $(_DOC_LC_DOCS)
- @for po in $(_DOC_POFILES); do \
+ @list='$(_DOC_POFILES)'; for po in $$list; do \
if ! test "$$po" -ef "$(srcdir)/$$po"; then \
echo "rm -f $$po"; \
rm -f "$$po"; \
@@ -580,14 +582,16 @@
echo " $(mkinstalldirs) $(distdir)/$$lc"; \
$(mkinstalldirs) "$(distdir)/$$lc"; \
done
- @for doc in $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES); do \
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
+ for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
$(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
done
dist-doc-figs: $(_DOC_SRC_FIGURES)
- @for fig in $(_DOC_C_FIGURES) $(_DOC_LC_FIGURES); do \
+ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \
+ for fig in $$list; do \
if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
if test -f "$$d$$fig"; then \
figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
@@ -630,7 +634,7 @@
done
check-doc-omf: $(_DOC_OMF_ALL)
- @for omf in $(_DOC_OMF_ALL); do \
+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
done
@@ -649,14 +653,14 @@
echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
done
- @for doc in $(_DOC_C_DOCS) $(_DOC_LC_DOCS); do \
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
done
install-doc-figs:
- @for fig in $(patsubst C/%,%,$(_DOC_C_FIGURES)); do \
+ @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
for lc in C $(DOC_LINGUAS); do \
if test -f "$$lc/$$fig"; then \
figfile="$$lc/$$fig"; \
@@ -684,13 +688,13 @@
install-doc-omf:
$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
- @for omf in $(_DOC_OMF_ALL); do \
+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
done
@if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-update -p $(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
- scrollkeeper-update -p "$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
fi;
install-doc-dsk:
@@ -706,19 +710,19 @@
# $(if $(_DOC_DSK_IN),uninstall-doc-dsk)
uninstall-doc-docs:
- @for doc in $(_DOC_C_DOCS) $(_DOC_LC_DOCS); do \
+ @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
done
uninstall-doc-figs:
- @for fig in $(_DOC_C_FIGURES) $(_DOC_LC_FIGURES); do \
+ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
done;
uninstall-doc-omf:
- @for omf in $(_DOC_OMF_ALL); do \
+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
if test "x$(_ENABLE_SK)" == "xtrue"; then \
echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
--- goobox-0.9.93.orig/Makefile.am 2005-11-18 21:20:07.000000000 +0100
+++ goobox-0.9.93-1r1b/Makefile.am 2006-02-19 17:04:11.600822504 +0100
@@ -24,7 +24,6 @@
DISTCLEANFILES = \
- gnome-doc-utils.make \
po/.intltool-merge-cache \
intltool-extract \
intltool-merge \
--- goobox-0.9.93.orig/Makefile.in 2005-11-18 21:20:09.000000000 +0100
+++ goobox-0.9.93-1r1b/Makefile.in 2006-02-19 17:04:11.602822200 +0100
@@ -234,7 +234,6 @@
DISTCLEANFILES = \
- gnome-doc-utils.make \
po/.intltool-merge-cache \
intltool-extract \
intltool-merge \
--- goobox-0.9.93.orig/src/icons/Makefile.in 2005-11-18 21:20:28.000000000 +0100 +++ goobox-0.9.93-1r1b/src/icons/Makefile.in 2006-02-19 17:04:11.606821592 +0100 @@ -233,7 +233,7 @@ noinst_DATA = pixbufs.h -CLEANFILES = $(noinst_DATA) +#CLEANFILES = $(noinst_DATA) EXTRA_DIST = $(IMAGES) pixbufs.h subdir = src/icons
--- goobox-0.9.93.orig/data/goobox.desktop 2005-11-18 21:20:23.000000000 +0100 +++ goobox-0.9.93-1r1b/data/goobox.desktop 2006-02-19 17:04:11.565827824 +0100 @@ -28,7 +28,6 @@ Name[ru]=Ð?Ñ?оигÑ?Ñ?ваÑ?елÑ? CD Name[sq]=Lexues CD-je Name[sv]=Cd-spelare -Name[vi]=Bá»? phát Ä?Ä©a CD Name[zh_CN]=CD æ?æ?¾å?¨ Name[zh_TW]=å??ç¢?æ?æ?¾ç¨?å¼? Comment=Play and extract CDs @@ -60,7 +59,6 @@ Comment[ru]=Ð?оÑ?пÑ?оизвеÑ?Ñ?и и извлеÑ?Ñ? CD Comment[sq]=Luaj dhe nxirr këngët e CD-ve Comment[sv]=Spela och extrahera cd-skivor -Comment[vi]=Phát và trÃch Ä?ĩã CD Comment[zh_TW]=æ?æ?¾å??æ?·å??å??ç¢? Categories=GNOME;Application;AudioVideo; Encoding=UTF-8 --- goobox-0.9.93.orig/data/goobox.schemas 2005-11-18 21:20:24.000000000 +0100 +++ goobox-0.9.93-1r1b/data/goobox.schemas 2006-02-19 17:04:11.568827368 +0100 @@ -189,16 +189,6 @@ <long>Möjliga värden är: system, text_below, text_beside, text_only, icons_only.</long> </locale> - <locale name="vi"> - - <long>Giá trá»? có thá»? là : - â?¢ system â?? há»? thá»?ng - â?¢ text_below â?? chữ dưá»?i - â?¢ text_beside â?? chữ á»? cạnh - â?¢ text_only â?? chá»? chữ - â?¢ icons_only â?? chá»? hình.</long> - </locale> - <locale name="zh_TW"> <long>å?¯ç?¨ç??æ?¸å?¼ç?ºï¼?system, text_below, text_beside, text_only, icons_only.</long> @@ -499,11 +489,6 @@ <long>Möjliga värden är: ogg, flac, mp3, wave.</long> </locale> - <locale name="vi"> - - <long>Giá trá»? có thá»? là : ogg, flac, mp3, wave.</long> - </locale> - <locale name="zh_TW"> <long>å?¯ç?¨ç??æ?¸å?¼ç?ºï¼?ogg, flac, mp3, wave.</long>
--- goobox-0.9.93.orig/src/Makefile.am 2005-11-18 21:20:07.000000000 +0100 +++ goobox-0.9.93-1r1b/src/Makefile.am 2006-02-19 17:04:11.607821440 +0100 @@ -198,9 +198,5 @@ GNOME_Goobox.idl CLEANFILES = \ - $(BUILT_SOURCES) \ - $(GTH_MARSHALLERS) \ - $(gnome_media_cddbslave2_idl_sources) \ - $(gnome_goobox_idl_sources) \ gnome_media_cddbslave2_idl_stamp \ gnome_goobox_idl_stamp --- goobox-0.9.93.orig/src/Makefile.in 2005-11-18 21:20:27.000000000 +0100 +++ goobox-0.9.93-1r1b/src/Makefile.in 2006-02-19 17:04:11.609821136 +0100 @@ -374,10 +374,6 @@ CLEANFILES = \ - $(BUILT_SOURCES) \ - $(GTH_MARSHALLERS) \ - $(gnome_media_cddbslave2_idl_sources) \ - $(gnome_goobox_idl_sources) \ gnome_media_cddbslave2_idl_stamp \ gnome_goobox_idl_stamp
Attachment:
pgpQZSR3aHqZ9.pgp
Description: PGP signature