Here is a debdiff of a debhelper version of xdelta if you are interested. It also fixes a few other linda/lintian issues and updates standards to 3.7.3.

Thank you,

Barry deFreese


diff -u xdelta-1.1.3/debian/changelog xdelta-1.1.3/debian/changelog
--- xdelta-1.1.3/debian/changelog
+++ xdelta-1.1.3/debian/changelog
@@ -1,3 +1,11 @@
+xdelta (1.1.3-8) unstable; urgency=low
+
+  * Move build system to debhelper
+  * Bump standards version to 3.7.3
+  * Fix lintian errors/warnings
+
+ -- Barry deFreese <[EMAIL PROTECTED]>  Mon, 17 Dec 2007 16:07:17 -0500
+
 xdelta (1.1.3-7) unstable; urgency=low
 
   * Acknowledge NMU.  Closes: #297844
@@ -187,7 +195,7 @@
 
  -- Frederic Lepied <[EMAIL PROTECTED]>  Wed, 28 Jan 1998 05:16:19 +0100
 
-xdelta (0.14-2) unstable; urgency=low, closes=16566
+xdelta (0.14-2) unstable; urgency=low
 
   * link the library with the c and gdbm libraries. closes:Bug#16566
 
diff -u xdelta-1.1.3/debian/control xdelta-1.1.3/debian/control
--- xdelta-1.1.3/debian/control
+++ xdelta-1.1.3/debian/control
@@ -2,8 +2,8 @@
 Section: utils
 Priority: optional
 Maintainer: LaMont Jones <[EMAIL PROTECTED]>
-Build-Depends: debhelper, libglib1.2-dev, zlib1g-dev, debmake
-Standards-Version: 3.7.2.0
+Build-Depends: debhelper (>> 5.0.0), libtool, autoconf, automake, 
libglib1.2-dev, zlib1g-dev
+Standards-Version: 3.7.3
 
 Package: xdelta
 Architecture: any
@@ -36,7 +36,7 @@
 Architecture: any
 Section: libdevel
 Priority: extra
-Depends: libxdelta2 (= ${Source-Version})
+Depends: libxdelta2 (= ${binary:Version})
 Replaces: xdelta-dev
 Conflicts: libxdelta0-dev, libxdelta1-dev
 Description: Xdelta development files
reverted:
--- xdelta-1.1.3/debian/libxdelta2.postinst
+++ xdelta-1.1.3.orig/debian/libxdelta2.postinst
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
reverted:
--- xdelta-1.1.3/debian/libxdelta2.substvars
+++ xdelta-1.1.3.orig/debian/libxdelta2.substvars
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.1-1), libglib1.2 (>= 1.2.0)
diff -u xdelta-1.1.3/debian/rules xdelta-1.1.3/debian/rules
--- xdelta-1.1.3/debian/rules
+++ xdelta-1.1.3/debian/rules
@@ -5,78 +5,80 @@
-CFLAGS=-O2 -Wall -g
+CFLAGS=-Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS=-O0 -Wall -g
+       CFLAGS += -O0
+else
+       CFLAGS += -O2
 endif
 
 ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 STRIP=y
 endif
 
-package=xdelta
+config.status: configure
+       dh_testdir
 
-build:
-       $(checkdir)
-       CPPFLAGS=`glib-config --cflags` CFLAGS="${CFLAGS}" ./configure 
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-       make
-       touch build
-
-autofiles:
        libtoolize --automake --copy --force
        aclocal
-       automake
        autoheader
+       automake --add-missing
        autoconf
        rm -rf autom4te.cache
 
+       CPPFLAGS=`glib-config --cflags` CFLAGS="${CFLAGS}" \
+       ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
+       --infodir=\$${prefix}/share/info
+
+build: build-stamp
+
+build-stamp: config.status
+       dh_testdir
+
+       $(MAKE)
+
+       touch $@
+
 clean:
-       $(checkdir)
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp
+
        -rm -f build
-       -make distclean
+       [ ! -f Makefile ] || $(MAKE) distclean
        -rm -f `find . -name "*~"`
-       -rm -rf debian/tmp debian/files* core debian/substvars 
debian/libxdelta2 debian/libxdelta2-dev
+       -rm -rf debian/tmp debian/files* core debian/substvars 
debian/libxdelta2 debian/libxdelta2-dev debian/xdelta
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+       dh_install --sourcedir=debian/tmp --list-missing
 
-binary-indep:  checkroot build
-       $(checkdir)
+binary-indep: build install
 # There are no architecture-independent files to be uploaded
 # generated by this package.  If there were any they would be
 # made here.
 
-binary-arch:   checkroot build
-       $(checkdir)
-       -rm -rf debian/tmp
-       install -d debian/tmp
-       cd debian/tmp && install -d `cat ../dirs`
-       cd debian && install -d libxdelta2-dev/usr/share/doc/libxdelta2-dev
-       cd debian && install -d libxdelta2/usr/share/doc/libxdelta2
-       install -m 644 debian/copyright 
debian/libxdelta2-dev/usr/share/doc/libxdelta2-dev/
-       install -m 644 debian/copyright 
debian/libxdelta2/usr/share/doc/libxdelta2/
-       install -m 644 debian/changelog 
debian/libxdelta2-dev/usr/share/doc/libxdelta2-dev/changelog.Debian
-       install -m 644 debian/changelog 
debian/libxdelta2/usr/share/doc/libxdelta2/changelog.Debian
-       make install prefix=`pwd`/debian/tmp/usr
-       strip --remove-section=.comment --remove-section=.note --strip-unneeded 
debian/tmp/usr/lib/libxdelta.so.2.0.0
-       strip --remove-section=.comment --remove-section=.note --strip-unneeded 
debian/tmp/usr/lib/libedsio.so.0.0.0
-       # install -m 644 doc/xdelta.info debian/tmp/usr/info
-       chmod a-x debian/tmp/usr/lib/*
-       rm -f debian/tmp/usr/bin/edsio-comp
-       install -m 644 debian/xdelta-config.man 
debian/tmp/usr/share/man/man1/xdelta-config.1
-       debstd ChangeLog NEWS README AUTHORS
-       rmdir debian/tmp/usr/include
-       [ -n "$(STRIP)" ] || dh_strip
-       dpkg-gencontrol -isp -pxdelta
-       chown -R root.root debian/tmp
-       chmod -R go=rX debian/tmp
-       dpkg --build debian/tmp ..
-
-define checkdir
-       test -f debian/rules
-endef
-
-# Below here is fairly generic really
-
-binary:                binary-indep binary-arch
-
-checkroot:
-       $(checkdir)
-       test root = "`whoami`"
+binary-arch: build install
+       dh_testdir -a
+       dh_testroot -a
+       dh_installchangelogs -a
+       dh_installdocs -a
+       dh_installmenu -a
+       dh_installman -a
+       dh_link -a
+       dh_makeshlibs -a -V
+       dh_strip -a
+       dh_compress -a
+       dh_fixperms -a
+       dh_installdeb -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a
 
-.PHONY: binary binary-arch binary-indep clean checkroot
+binary:        binary-indep binary-arch
+.PHONY: build clean binary-arch binary-indep binary install
reverted:
--- xdelta-1.1.3/debian/shlibs.local
+++ xdelta-1.1.3.orig/debian/shlibs.local
@@ -1,2 +0,0 @@
-libxdelta 2 libxdelta2 (>= 1.1.3)
-libedsio 0 libxdelta2 (>= 1.1.3)
only in patch2:
unchanged:
--- xdelta-1.1.3.orig/debian/docs
+++ xdelta-1.1.3/debian/docs
@@ -0,0 +1,4 @@
+ChangeLog
+NEWS
+README
+AUTHORS
only in patch2:
unchanged:
--- xdelta-1.1.3.orig/debian/libxdelta2.install
+++ xdelta-1.1.3/debian/libxdelta2.install
@@ -0,0 +1 @@
+usr/lib/*.so.*
only in patch2:
unchanged:
--- xdelta-1.1.3.orig/debian/libxdelta2-dev.install
+++ xdelta-1.1.3/debian/libxdelta2-dev.install
@@ -0,0 +1,3 @@
+usr/lib/*.so
+usr/lib/*a
+usr/include/*.h
only in patch2:
unchanged:
--- xdelta-1.1.3.orig/debian/xdelta.install
+++ xdelta-1.1.3/debian/xdelta.install
@@ -0,0 +1 @@
+usr/bin/xdelta*
only in patch2:
unchanged:
--- xdelta-1.1.3.orig/debian/compat
+++ xdelta-1.1.3/debian/compat
@@ -0,0 +1 @@
+5
only in patch2:
unchanged:
--- xdelta-1.1.3.orig/debian/xdelta.manpages
+++ xdelta-1.1.3/debian/xdelta.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/xdelta.1
+debian/xdelta-config.man

Reply via email to