On Sat May 10 2008 7:31:37 am Bernhard R. Link wrote:
> Package: libarchive-dev
> Severity: wishlist
> Tags: patch
> Version: 2.4.17-1
Hi Bernhard,
Thank you for this patch, and for the symbols file patch.
I have applied most of this. The part I reverted is the .save changes.
Removing that causes git to think that I have uncomitted changes after
building all the time, which is annoying to my build workflow.
I'm attaching the diff as committed, and a diff from your diff.
-- John
diff --git a/debian/rules b/debian/rules
index ffe7869..2548466 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,10 +44,11 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.aux/config.guess
endif
# Add here commands to configure the package.
- $(SHELL) ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS=" -Wl,-z,defs" --enable-bsdcpio
+ $(SHELL) ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS=" -Wl,-z,defs" --enable-bsdcpio=shared --enable-bsdtar=shared
-build: build-stamp
+build-indep:
+build-arch: build-stamp
build-stamp: config.status
dh_testdir
@@ -65,7 +66,7 @@ clean:
rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ if test -f config.status ; then $(MAKE) distclean ; fi
-mv config.aux/config.guess.save config.aux/config.guess
-mv config.aux/config.sub.save config.aux/config.sub
@@ -73,7 +74,7 @@ clean:
dh_clean
-install: build
+install: build-arch
dh_testdir
dh_testroot
dh_clean -k
@@ -84,12 +85,11 @@ install: build
ln -s -T libarchive.so.2 debian/tmp/usr/lib/libarchive.so.1
install -d debian/tmp/usr/share/lintian/overrides/
install -m 0644 debian/lintian-override debian/tmp/usr/share/lintian/overrides/libarchive1
- ${RM} -r debian/libarchive2/usr/share/
binary-indep:
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
dh_testdir
dh_testroot
dh_installchangelogs -a NEWS
@@ -123,4 +123,5 @@ binary-arch: build install
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+build: build-indep build-arch
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
diff --git a/debian/rules b/debian/rules
index 3ff37d0..2548466 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,11 @@ major=`ls src/.libs/lib*.so.* | \
config.status: configure
dh_testdir
+ -cp config.aux/config.sub config.aux/config.sub.save
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.aux/config.sub
endif
+ -cp config.aux/config.guess config.aux/config.guess.save
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.aux/config.guess
endif
@@ -51,6 +53,7 @@ build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
+ -mv tar/getdate.c tar/getdate.c.save
$(MAKE)
$(MAKE) check
@@ -65,7 +68,9 @@ clean:
# Add here commands to clean up after the build process.
if test -f config.status ; then $(MAKE) distclean ; fi
- rm -f config.aux/config.guess config.aux/config.sub tar/getdate.c
+ -mv config.aux/config.guess.save config.aux/config.guess
+ -mv config.aux/config.sub.save config.aux/config.sub
+ -mv tar/getdate.c.save tar/getdate.c
dh_clean
