Hi Patrick, I made a diff for pathfinder (only debian directory). Could you review it, please?
If both of you would find no problem with it, please upload to repository. http://mentors.debian.net/debian/pool/main/p/pathfinder/pathfinder_1.1.3-0.1.dsc > Steffen diff -urN pathfinder-0.2.4/debian/changelog pathfinder-1.1.3/debian/changelog --- pathfinder-0.2.4/debian/changelog 2010-01-21 07:36:04.000000000 +0900 +++ pathfinder-1.1.3/debian/changelog 2010-01-21 11:34:25.000000000 +0900 @@ -1,3 +1,32 @@ +pathfinder (1.1.3-0.1) unstable; urgency=low + + * NMU with maintainer's ACK. + * New upstream release + - fix "FTBFS: iwvdbuslistener.h:13:24: error: wvcallback.h: No such file or + directory" to use the new WvDBus in WvStreams (Closes: #542975) + - Include stdint.h for GCC 4.4 compatibility. (Closes: #505053) + - Remove the send-interface lines from the DBUS configuration. + (Closes: #510696) + * debian/control: + - Standards-Version: 3.8.3 + - libpathfinder-dev: add Depends: ${misc:Depends} + - Build-Depends: "libldap2-dev", deal with cmake complains about + "LDAP Development packages" + - set "Build-Depends: libwvstreams-dev (>= 4.6.1)", to use package + that enabled --with-dbus option + - add Homepage: field + * debian/rules: + - properly remove CMake"F"iles in clean target and fix clean lines order. + * debian/pathfinderd.prerm: + - add "set -e" + * debian/copyright + - add my name and specify GPL version 2 + * debian/watch: add it. + * debian/pathfinderd.{default,dirs,init,postrm} + - merge from SVN r200:r203, remove unnecessary "--test" argument and more. + + -- Hideki Yamane (Debian-JP) <henr...@debian.or.jp> Thu, 21 Jan 2010 11:34:05 +0900 + pathfinder (0.2.4-4) unstable; urgency=low * Fix the diff, so that it doesn't include all of the CMake garbage. diff -urN pathfinder-0.2.4/debian/control pathfinder-1.1.3/debian/control --- pathfinder-0.2.4/debian/control 2010-01-21 07:36:04.000000000 +0900 +++ pathfinder-1.1.3/debian/control 2010-01-21 11:34:01.000000000 +0900 @@ -2,8 +2,9 @@ Section: utils Priority: optional Maintainer: Patrick Patterson <ppatt...@debian.org> -Build-Depends: cmake, debhelper (>= 5), libdbus-1-dev, libnss3-dev, libwvstreams-dev (>=4.4.1), pkg-config, libboost-dev, libssl-dev -Standards-Version: 3.7.3 +Build-Depends: cmake, debhelper (>= 5), libdbus-1-dev, libnss3-dev, libwvstreams-dev (>=4.6.1), pkg-config, libboost-dev, libssl-dev, libldap2-dev +Standards-Version: 3.8.3 +Homepage: http://code.google.com/p/pathfinder-pki/ Package: pathfinderd Architecture: any @@ -67,6 +68,7 @@ Package: libpathfinder-dev Architecture: any Section: libdevel +Depends: ${misc:Depends} Provides: libpathfinder-1-dev Description: Development files for pathfinder Pathfinder is designed to provide a mechanism for any program to perform diff -urN pathfinder-0.2.4/debian/copyright pathfinder-1.1.3/debian/copyright --- pathfinder-0.2.4/debian/copyright 2010-01-21 07:36:04.000000000 +0900 +++ pathfinder-1.1.3/debian/copyright 2010-01-21 07:06:22.000000000 +0900 @@ -36,5 +36,6 @@ The Debian packaging is (C) 2007, Patrick Patterson <ppatt...@debian.org> and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +(C) 2010 Hideki Yamane <henr...@debian.or.jp>, is licensed under the GPL +Version2, see `/usr/share/common-licenses/GPL-2'. diff -urN pathfinder-0.2.4/debian/pathfinderd.default pathfinder-1.1.3/debian/pathfinderd.default --- pathfinder-0.2.4/debian/pathfinderd.default 2010-01-21 07:36:04.000000000 +0900 +++ pathfinder-1.1.3/debian/pathfinderd.default 2010-01-21 07:06:22.000000000 +0900 @@ -1,5 +1,5 @@ # Defaults for pathfinder initscript -# sourced by /etc/init.d/pathfinder +# sourced by /etc/init.d/pathfinderd # installed at /etc/default/pathfinder by the maintainer scripts # diff -urN pathfinder-0.2.4/debian/pathfinderd.dirs pathfinder-1.1.3/debian/pathfinderd.dirs --- pathfinder-0.2.4/debian/pathfinderd.dirs 1970-01-01 09:00:00.000000000 +0900 +++ pathfinder-1.1.3/debian/pathfinderd.dirs 2010-01-21 07:06:22.000000000 +0900 @@ -0,0 +1 @@ +var/cache/pathfinder/crls diff -urN pathfinder-0.2.4/debian/pathfinderd.init pathfinder-1.1.3/debian/pathfinderd.init --- pathfinder-0.2.4/debian/pathfinderd.init 2010-01-21 07:36:04.000000000 +0900 +++ pathfinder-1.1.3/debian/pathfinderd.init 2010-01-21 07:06:22.000000000 +0900 @@ -80,18 +80,18 @@ # just the same as "restart" except that it does nothing if the # daemon isn't already running. # check wether $DAEMON is running. If so, restart - start-stop-daemon --stop --test --quiet --pidfile \ + start-stop-daemon --stop --quiet --pidfile \ /var/run/$NAME.pid --exec $DAEMON \ && $0 restart \ || exit 0 ;; restart) log_begin_msg "Restarting $DESC: " - start-stop-daemon --stop --test--quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON + start-stop-daemon --stop --quiet --pidfile $PIDFILE\ + --exec $DAEMON [ -n "$DODTIME" ] && sleep $DODTIME - start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS + start-stop-daemon --start --quiet --pidfile $PIDFILE\ + --exec $DAEMON -- $DAEMON_OPTS log_end_msg $? ;; status) diff -urN pathfinder-0.2.4/debian/pathfinderd.postrm pathfinder-1.1.3/debian/pathfinderd.postrm --- pathfinder-0.2.4/debian/pathfinderd.postrm 2010-01-21 07:36:04.000000000 +0900 +++ pathfinder-1.1.3/debian/pathfinderd.postrm 2010-01-21 07:06:22.000000000 +0900 @@ -32,9 +32,7 @@ /etc/init.d/pathfinderd stop fi - rm -f /etc/init.d/pathfinderd - update-rc.d pathfinderd remove - rm -f /etc/pathfinderd.conf /etc/dbus-1/system/pathfinderd.conf + update-rc.d -f pathfinderd remove fi ;; diff -urN pathfinder-0.2.4/debian/pathfinderd.prerm pathfinder-1.1.3/debian/pathfinderd.prerm --- pathfinder-0.2.4/debian/pathfinderd.prerm 2010-01-21 07:36:04.000000000 +0900 +++ pathfinder-1.1.3/debian/pathfinderd.prerm 2010-01-21 07:06:22.000000000 +0900 @@ -1,5 +1,7 @@ #!/bin/sh +set -e + if [ -x "/etc/init.d/pathfinderd" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then invoke-rc.d pathfinderd stop || exit $? diff -urN pathfinder-0.2.4/debian/rules pathfinder-1.1.3/debian/rules --- pathfinder-0.2.4/debian/rules 2010-01-21 07:36:04.000000000 +0900 +++ pathfinder-1.1.3/debian/rules 2010-01-21 11:38:20.000000000 +0900 @@ -1,15 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -43,11 +32,11 @@ clean: dh_testdir dh_testroot - rm -rf build-arch-stamp build-indep-stamp configure-stamp CMakefiles - rm -rf *.cmake DartTestfile.txt CMakeCache.txt # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) clean - + rm -rf build-arch-stamp build-indep-stamp configure-stamp CMakeFiles + rm -rf *.cmake DartTestfile.txt CMakeCache.txt + -rm Makefile dh_clean install: install-indep install-arch @@ -56,11 +45,6 @@ dh_testroot dh_clean -k -i dh_installdirs -i - - # Add here commands to install the indep part of the package into - # debian/<package>-doc. - #INSTALLDOC# - dh_install -i install-arch: @@ -87,9 +71,7 @@ dh_installchangelogs dh_installdocs dh_installexamples -# dh_installmenu # dh_installdebconf -# dh_python dh_installinit -n -a dh_installman dh_link diff -urN pathfinder-0.2.4/debian/watch pathfinder-1.1.3/debian/watch --- pathfinder-0.2.4/debian/watch 1970-01-01 09:00:00.000000000 +0900 +++ pathfinder-1.1.3/debian/watch 2010-01-21 07:06:22.000000000 +0900 @@ -0,0 +1,6 @@ +# Compulsory line, this is a version 3 file +version=3 + +http://code.google.com/p/pathfinder-pki/downloads/list \ + http://pathfinder-pki.googlecode.com/files/pathfinder-(.*)-Source.tar.gz +
pgpCB2TskUu8R.pgp
Description: PGP signature
