Message sent some time ago:
Hi Ralph
You can't use git in the launchpad build environment
So the reslease version is placed in the gitdescrib file
To solve the build problem
I propose you a fix via a patch modification :
debian/patches/0720-sane-git-snapshot-enable-aclocal.patch
and a modification of :
debian/rules
You do not need to modify the dource file
sane-backends_1.1.1.orig.tar.xz
I put you as the only recipient for fear of being rejected because of
the attachments!
Thierry
Le 2023-02-07 06:42, Ralph Little a écrit :
Hi,
Further to my previous comment about the releases page fluff, that
seems to have gone now.
Please disregard my comment! :D
Cheers,
Ralph
On 2023-02-06 20:04, m. allan noah wrote:
Hmm, looks like AC_INIT calls `./tools/git-version-gen --prefix ''
.tarball-version`, which returns UNKNOWN. Seems like our release
process might be leaving out some steps. I guess I'll dig more
tomorrow.
allan
On Mon, Feb 6, 2023 at 10:44 PM m. allan noah <kitno...@gmail.com>
wrote:
So, I was able to do the release on time (after filling in a few
blanks in our documentation). But I only did the website updates
tonight. I seem to have run into a small problem there- when I
download the release tarball, and run ./autogen.sh, i get a
./configure file which has 'UNKNOWN' as the package version number.
This also happens with 1.1.1 as well. Is this happening for anyone
else?
allan
On Sat, Feb 4, 2023 at 10:05 PM Ralph Little <skelb...@gmail.com>
wrote:
Hi,
OK, I think I have done that.
Because we are short on time I cut and pasted the release note
fragments from my spreadsheet into the NEWS file with Apostrophe MD
file editor and whipped them into shape manually.
First time using it and it is pretty good. Obviously, this was a
manual process, but it wasn't too onerous.
I couldn't get the towncrier thingy to work anyway. I don't really
have much experience with python and pip. Python seems an awful lot
more complicated since the last time I used it :(
I have pushed the release notes in NEWS to your branch.
Cheers,
Ralph
On 2023-02-04 18:18, m. allan noah wrote:
Awesome, thanks! I'm working on updating doc/releases.md, which I
find to be hard to use. Maybe if you keep some notes on what you
did, I can incorporate your method instead of towncrier.
allan
On Sat, Feb 4, 2023 at 9:12 PM Ralph Little <skelb...@gmail.com>
wrote:
Hi,
In this case I didn't generate the towncrier files. It's a lot of
faff if you don't do it as you go along.
I just put them into a spreadsheet.
I will try to generate the release notes from that.
Cheers,
Ralph
On 2023-02-04 17:57, m. allan noah wrote:
I have pushed a branch called 'release-1.2.x'. I don't have this
'towncrier' thing, so maybe you can run that and merge the release
notes?
allan
On Wed, Feb 1, 2023 at 11:39 AM m. allan noah <kitno...@gmail.com>
wrote:
Awesome, thanks! I'll probably take a first stab at it on the 4th,
and see if I can follow our current instructions.
allan
On Sat, Jan 28, 2023 at 8:43 PM Ralph Little <skelb...@gmail.com>
wrote:
Hi,
I have prepared the release notes whenever you are ready!
Cheers,
Ralph
On 2023-01-24 08:33, m. allan noah wrote:
Sounds good to me, thanks for your help. I'm traveling this week,
and won't be able to work on this until the weekend.
On Tue, Jan 24, 2023, 10:47 AM Ralph Little <skelb...@gmail.com>
wrote:
Hi,
On 2023-01-01 15:54, m. allan noah wrote:
It has been nearly a year since our last release, and there have
been
many changes and bug fixes. I'd like to get 1.2.1 released in
early
February. I've not done it in a few years, but I am certainly
willing
to make the release package.
Any objections to a code freeze on Jan 22, and a release on Feb 5?
allan
I think if we are going for your proposed plan, then we are official
in
code freeze for 1.2.1.
If you want to proceed, I can prepare release notes.
Cheers,
Ralph
--
"well, I stand up next to a mountain- and I chop it down with the edge
of my hand"
--
"well, I stand up next to a mountain- and I chop it down with the edge
of my hand"
--
"well, I stand up next to a mountain- and I chop it down with the edge
of my hand"
--
"well, I stand up next to a mountain- and I chop it down with the edge
of my hand"
--
"well, I stand up next to a mountain- and I chop it down with the edge
of my hand"
#!/usr/bin/make -f
#export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
include /usr/share/dpkg/default.mk
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
INSTALL_STRIP_FLAG = ""
STRIP = ""
endif
ifeq (,$(filter hurd-i386,$(DEB_HOST_ARCH)))
INS_CONF = --enable-parport-directio
else
INS_CONF = ""
endif
%:
dh $@
ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
SANE_DESC = $(CURDIR)/tools/sane-desc
else
SANE_DESC = $(CURDIR)/debian/sane-desc
endif
override_dh_auto_configure:
autoconf
ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
dpkg-architecture -f "-a$(DEB_BUILD_ARCH)" -c dh_auto_configure
$(MAKE) -C $(CURDIR)/lib liblib.la
$(MAKE) -C $(CURDIR)/sanei libsanei.la
$(MAKE) -C $(CURDIR)/tools sane-desc
mv $(CURDIR)/tools/sane-desc $(CURDIR)/debian/sane-desc
$(RM) include/byteorder.h include/_stdint.h
dh_auto_clean
endif
dh_auto_configure -- \
--prefix=/usr \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--sysconfdir=/etc \
--localstatedir=/var \
--datadir=\$${prefix}/share \
--mandir=\$${prefix}/share/man \
--docdir=\$${prefix}/share/doc/libsane \
--enable-static \
--enable-pthread \
--with-gphoto2 \
--with-avahi \
--enable-pnm-backend \
--with-usb \
--without-v4l \
--disable-locking \
$(INS_CONF)
override_dh_autoreconf:
sh tools/generate-gitdescribe.sh
dh_autoreconf -Xlibtool.m4
rm -f gitdescribe
override_dh_auto_build-indep:
# generate POT file for translators
$(MAKE)
(cd po && make sane-backends.pot)
override_dh_auto_clean:
# Autoconf-generated files
$(RM) include/byteorder.h include/_stdint.h
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
$(RM) debian/libsane1.udev
dh_auto_clean
$(RM) $(SANE_DESC)
override_dh_auto_install-arch:
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# remove /usr/lib/sane/libsane.so.1 (libtool side-effect ?)
$(RM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane.so.1
# remove libsane-dll, same as regular libsane
$(RM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane-dll.*
override_dh_auto_install-indep:
dh_auto_install
override_dh_install-arch:
dh_install
# Install the pkg-config file
mkdir -p debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
cp tools/sane-backends.pc
debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
cp debian/sane-utils.logrotate
debian/sane-utils/etc/logrotate.d/sane-utils
override_dh_install-indep:
dh_install
override_dh_installman-indep:
dh_installman
# remove man files from package sane-utils
$(RM)
$(CURDIR)/debian/libsane-common/usr/share/man/man1/gamma4scanimage.1
$(RM)
$(CURDIR)/debian/libsane-common/usr/share/man/man1/sane-find-scanner.1
$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/scanimage.1
$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/sane-config.1
$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-umax_pp.5
$(RM) -r $(CURDIR)/debian/libsane-common/usr/share/man/man8/
$(RM) -r $(CURDIR)/debian/libsane-common/usr/share/man/man1/
# remove manpages for not build libs
$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-v4l.5
override_dh_installman-arch:
dh_installman
$(RM) $(CURDIR)/debian/sane-utils/usr/share/man/man1/sane-config.1
override_dh_installdocs-arch:
dh_installdocs
# move files that belong to libsane-dev
mv debian/tmp/usr/share/doc/libsane/backend-writing.txt
debian/libsane-dev/usr/share/doc/libsane-dev/
override_dh_installdocs-indep:
dh_installdocs
# Platform-specific documentation
$(RM) debian/libsane-common/etc/sane.d/saned.conf
ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
cp README.freebsd debian/libsane-common/usr/share/doc/libsane-common/
endif
ifeq (linux,$(DEB_HOST_ARCH_OS))
cp README.linux debian/libsane-common/usr/share/doc/libsane-common/
endif
override_dh_installudev-arch:
ifeq (linux,$(DEB_HOST_ARCH_OS))
# udev support
# Generate the udev rules file
$(SANE_DESC) -s $(CURDIR)/doc/descriptions -m udev+hwdb >
$(CURDIR)/debian/libsane1.udev
$(SANE_DESC) -s $(CURDIR)/doc/descriptions -m hwdb >
$(CURDIR)/debian/20-sane.hwdb
cp $(CURDIR)/debian/20-sane.hwdb
$(CURDIR)/debian/libsane1/lib/udev/hwdb.d/
dh_installudev
endif
# remove rpath from the binaries (wonderful tool !)
chrpath -d debian/sane-utils/usr/sbin/saned
chrpath -d debian/sane-utils/usr/bin/scanimage
chrpath -d debian/sane-utils/usr/bin/sane-find-scanner
override_dh_installinit-arch:
dh_installinit -psane-utils --name=saned
override_dh_installsystemd-arch:
dh_installsystemd -psane-utils --no-enable --name=saned
dh_installsystemd -psane-utils --no-enable --name=saned@
override_dh_makeshlibs-arch:
dh_makeshlibs --exclude=/sane/ -- -v$(DEB_VERSION_UPSTREAM)
-Pdebian/libsane1 -plibsane1
Description: SANE git snapshot - Enablement of aclocal
SANE's daily git snapshot doesn't contain a copy of the git repository.
Author: Rolf Bensch <rolf at bensch hyphen online dot de>
Last-Update: 2021-02-15
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: sane-backends-1.1.1/configure.ac
===================================================================
--- sane-backends-1.1.1.orig/configure.ac
+++ sane-backends-1.1.1/configure.ac
@@ -4,7 +4,7 @@ dnl ************************************
dnl Set up autoconf and automake
dnl ******************************************************************
AC_INIT([sane-backends],
- m4_esyscmd_s([tools/git-version-gen --prefix '' .tarball-version]),
+ m4_esyscmd_s([cat gitdescribe]),
[sane-devel@alioth-lists.debian.net])
AC_PREREQ([2.69]) dnl minimum autoconf version required
AC_CONFIG_MACRO_DIR([m4])
Index: sane-backends-1.1.1/tools/get-reslease-version.sh
===================================================================
--- /dev/null
+++ sane-backends-1.1.1/tools/generate-gitdescribe.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+VERSION_RELEASE=$(dpkg-parsechangelog -S Version | cut -d'-' -f1)
+echo $VERSION_RELEASE > gitdescribe
