tags 538613 + pending thanks Hello Raphaël, On Sun, Jul 26, 2009 at 12:34:37AM +0200, hert...@debian.org wrote: > To prepare a possible switch to the new source package format "3.0 > (quilt)" [1], I converted all source packages and rebuilt the packages > afterwards to see what breaks, and goobox does break. To reproduce the
Do I understand correctly, that atm you are "only" getting all
packages ready for the switcht, but that the switch itself is still an
issue for the future and should not happen yet?
> In the case of goobox, it doesn't properly handle config.sub
> and config.guess. The .diff.gz contains changes to those files
> when it shouldn't (and this later leads to a quilt patch that can't be
> applied/unapplied).
Ok, I know this problem but was explicitly asked by my (previous)
mentors to do it this way (see below).
> If you auto-update those files, you should do it just before configure and you
> should remove them in the clean rules (or put back in place a copy of the
> original files that you replaced). See
> /usr/share/doc/autotools-dev/README.Debian.gz for some details.
Please note that even on stable the referenced file explicitly asks
for this behaviour. I attached my new debian/rules as reference. Could
you have a look if it indeed helps? With this debian/rules the package
builds as explained in your bug report.
Btw. is autoreconf really necessary?
Greetings
Helge
--
Dr. Helge Kreutzmann deb...@helgefjell.de
Dipl.-Phys. http://www.helgefjell.de/debian.php
64bit GNU powered gpg signed mail preferred
Help keep free software "libre": http://www.ffii.de/
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
include /usr/share/quilt/quilt.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
DATE=$(shell date +%Y%m%d)
TMPDIR=/tmp
MANDIR=debian/manpage
SVNNAME=goobox_svn$(DATE)
SVNBDIR=$(TMPDIR)/$(SVNNAME)
svnupstream-checkout:
# Needs: svn
# Getting sources
cd $(TMPDIR) && \
svn co svn://svn.gnome.org/svn/goobox/trunk goobox && \
mv goobox $(SVNBDIR)
# Mark it
touch $@
svnupstream: svnupstream-checkout
# Needs: autoconf automake libtool
# Bootstrapping
-cd $(SVNBDIR) && \
./autogen.sh && \
rm -f config.log config.status
#cd $(SVNBDIR) && \
#libtoolize -c -f && \
#aclocal && \
#autoconf
# Removing unused files
-find $(SVNBDIR) -name .svn -exec rm -rf "{}" ";"
-rm -r $(SVNBDIR)/autom4te.cache/
-rm -r $(SVNBDIR)/rm *_bak
# Creating tarball
cd $(SVNBDIR)/.. && \
tar cfz $(SVNNAME).orig.tar.gz $(SVNNAME)
mv -i $(SVNBDIR)/../$(SVNNAME).orig.tar.gz ..
# Remove mark
rm svnupstream-checkout
config.status: configure
dh_testdir
# Configuring package
#-./autogen.sh
$(MAKE) -f debian/rules patch
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
mv config.sub config.sub.upstream
cp -f /usr/share/misc/config.sub config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
mv config.guess config.guess.upstream
cp -f /usr/share/misc/config.guess config.guess
endif
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--sysconfdir=/etc --disable-scrollkeeper
build: build-stamp
build-stamp: config.status
dh_testdir
# Building package
$(MAKE)
touch $@
clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Cleaning package
cp -p gnome-doc-utils.make gnome-doc-utils.make.save
#-$(MAKE) clean
[ ! -f Makefile ] || $(MAKE) distclean
mv -f gnome-doc-utils.make.save gnome-doc-utils.make
[ ! -f config.guess.upstream ] || mv -f config.guess.upstream
config.guess
[ ! -f config.sub.upstream ] || mv -f config.sub.upstream config.sub
$(MAKE) -f debian/rules unpatch
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Installing package
$(MAKE) install DESTDIR=$(CURDIR)/debian/goobox
# Installing manpages
install -d -m 0755 debian/goobox/usr/share/man/man1
docbook-to-man $(MANDIR)/goobox.en.sgml >
debian/goobox/usr/share/man/man1/goobox.1
install -d -m 0755 debian/goobox/usr/share/man/de/man1
cd $(MANDIR) && po4a-updatepo -f sgml -m goobox.en.sgml -p goobox.de.po
cd $(MANDIR) && po4a-translate -k 20 -f sgml -m goobox.en.sgml -p
goobox.de.po -a goobox.de.add -l goobox.de.sgml
# po4a-translate is broken, c.f. #280882
# cd $(MANDIR) && patch -p0 < goobox.de.sgml.patch
perl -i -p -e 's# <refentrytitle>\&dhucpackage;#\&dhucpackage;#ms'
$(MANDIR)/goobox.de.sgml
perl -i -p -e 's#^\s*</refentrytitle>##' $(MANDIR)/goobox.de.sgml
docbook-to-man $(MANDIR)/goobox.de.sgml >
debian/goobox/usr/share/man/de/man1/goobox.1
# Installing pixmap
install -D -m 0644 debian/pixmap/goobox.xpm
debian/goobox/usr/share/pixmaps/goobox.xpm
# Moving icon
install -d -m 0755 debian/goobox/usr/share/icons
#mv debian/goobox/usr/share/pixmaps/goobox.png
debian/goobox/usr/share/icons
binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
dh_install
dh_installmenu
dh_gconf
dh_icons
dh_link
dh_strip
dh_compress
dh_fixperms
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
signature.asc
Description: Digital signature
