I have made progress toward updating the package to 1.3. Attached is a diff of
the changes made to files in the debian directory, which are documented in the
changelog.
I can now build the package based on the upstream Git repository. (Note that
there is no upstream tar file, but gbp buildpackage can be used to perform the
build).
I have also attempted to address warnings identified by Lintian. The only
significant warning that I haven't resolved is:
libdotconf1.3: package-name-doesnt-match-sonames libdotconf0
I've tried to follow the Debian policy manual in renaming the library package
(made necessary in any case by the version number in the original name).
I'm sure I have made mistakes along the way, thus I would appreciate review of
these changes, so the maintainer can consider them and decide which to
incorporate in the next release.
diff --git a/debian/changelog b/debian/changelog
index c2312a4..76194e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+dotconf (1.3~git651d87f-1) UNRELEASED; urgency=low
+
+ * New upstream release. (Closes: #637652)
+ * Add multi-arch support.
+ * Create a package for debugging symbols.
+ * Convert the character encoding of the copyright file to UTF8.
+ * Add copyright notice (in required form) to copyright file
+ and identify the current upstream source.
+ * Update dependencies.
+ * Remove dotconf-config(1) manual page as dotconf-config no longer
+ exists.
+ * Specify source format as 3.0 (quilt).
+ * Update standards-version to 3.9.4.
+
+ -- Jason White <ja...@jasonjgw.net> Tue, 30 Jul 2013 10:49:17 +1000
+
dotconf (1.0.13-3) unstable; urgency=low
* Correctly make use of realloc, to prevent applications using dotconf from
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 3611593..4c1b1e4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: dotconf
Section: libs
Priority: optional
Maintainer: Shane Wegner <sh...@debian.org>
-Build-Depends: debhelper (>> 4.0.0)
-Standards-Version: 3.5.8
+Build-Depends: debhelper (>= 9), dh-autoreconf
+Standards-Version: 3.9.4
Package: libdotconf-dev
Architecture: any
Section: libdevel
Priority: extra
-Depends: libdotconf1.0 (= ${Source-Version}), libc6-dev
+Depends: ${misc:Depends}, libdotconf1.3-0 (= ${binary:Version}), libc6-dev
Description: Configuration file parser library - development files
dot.conf is a simple-to-use and powerful configuration-file parser
library written in C. The configuration files created for dot.conf
@@ -24,11 +24,13 @@ Description: Configuration file parser library - development files
This package contains the development files necessary to build
programs using the dotconf library.
-Package: libdotconf1.0
+Package: libdotconf1.3-0
Architecture: any
+Multi-arch: same
Section: libs
Priority: optional
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: multiarch-support
Description: Configuration file parser library - runtime files
dot.conf is a simple-to-use and powerful configuration-file parser
library written in C. The configuration files created for dot.conf
@@ -39,3 +41,24 @@ Description: Configuration file parser library - runtime files
configuration options on-the-fly, a here-documents feature to pass
very long ARG_STR data to your app, and on-the-fly inclusion of
additional config files.
+
+Package: libdotconf1.3-dbg
+Architecture: any
+Multi-arch: same
+Section: debug
+Priority: extra
+Depends: ${misc:Depends}, ${shlibs:Depends}, libdotconf1.3-0 (= ${binary:Version})
+Pre-Depends: multiarch-support
+Description: Configuration file parser library - runtime files
+ dot.conf is a simple-to-use and powerful configuration-file parser
+ library written in C. The configuration files created for dot.conf
+ look very similar to those used by the Apache Webserver. Even
+ Container-Directives known from httpd.conf can easily be used in the
+ exact same manner as for Apache-Modules. It supports various types of
+ arguments, dynamically loadable modules that create their own
+ configuration options on-the-fly, a here-documents feature to pass
+ very long ARG_STR data to your app, and on-the-fly inclusion of
+ additional config files.
+ .
+ This package contains the debugging symbols for libdotconf.
+
diff --git a/debian/copyright b/debian/copyright
index 4f367ab..f99e50e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,12 +2,14 @@ This package was debianized by Shane Wegner <sh...@cm.nu> on
Thu, 20 Jan 2000 23:50:36 -0800.
It was downloaded from http://www.azzit.de/dotconf/
+version 1.3 was obtained at git://github.com/williamh/dotconf.git
-Upstream Author: lukas schröder <lu...@azzit.de>
+Original Upstream Author: lukas schröder <lu...@azzit.de>
+Current Upstream Maintainer: William Hubbs <w.d.hu...@gmail.com>
-Copyright:
+Copyright 1999,2000,2001,2002 Lukas Schroeder <lu...@azzit.de>, and others.
-You are free to distribute this software under the terms of the GNU Lesser
-General Public License. On Debian systems, the complete text of the GNU
-Lesser General Public License can be found in
-/usr/share/common-licenses/LGPL file.
+You are free to distribute this software under the terms of the GNU
+Lesser General Public License, version 2.1. On Debian systems, the
+complete text of the GNU Lesser General Public License can be found in
+the /usr/share/common-licenses/LGPL-2.1 file.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index cc20e65..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,4 +0,0 @@
-NEWS
-README
-doc/dotconf-api.txt
-doc/dotconf-features.txt
diff --git a/debian/dotconf-config.1 b/debian/dotconf-config.1
deleted file mode 100644
index 9867e8f..0000000
--- a/debian/dotconf-config.1
+++ /dev/null
@@ -1,26 +0,0 @@
-.TH DOTCONF-CONFIG "1" "February 2003" "dotconf-config" "User Commands"
-.SH NAME
-dotconf-config \- manual page for dotconf-config
-.SH SYNOPSIS
-.B dotconf-config
-[\fIOPTION\fR]
-.SH DESCRIPTION
-Known values for OPTION are:
-.TP
-\fB\-\-prefix\fR=\fIDIR\fR
-change dotconf prefix [default /usr]
-.TP
-\fB\-\-libs\fR
-print library linking information
-.TP
-\fB\-\-cflags\fR
-print pre-processor and compiler flags
-.TP
-\fB\-\-pool\fR
-Print library link information for libpool.
-.TP
-\fB\-\-help\fR
-display this help and exit
-.TP
-\fB\-\-version\fR
-output version information
diff --git a/debian/libdotconf-dev.docs b/debian/libdotconf-dev.docs
new file mode 100644
index 0000000..3e0d3e3
--- /dev/null
+++ b/debian/libdotconf-dev.docs
@@ -0,0 +1,3 @@
+README
+doc/dotconf-api.txt
+doc/dotconf-features.txt
diff --git a/debian/libdotconf-dev.install b/debian/libdotconf-dev.install
new file mode 100644
index 0000000..356bca8
--- /dev/null
+++ b/debian/libdotconf-dev.install
@@ -0,0 +1,5 @@
+usr/lib/*/libdotconf.so
+usr/lib/*/libdotconf.a
+usr/lib/*/pkgconfig
+usr/include
+
diff --git a/debian/libdotconf-dev.manpages b/debian/libdotconf-dev.manpages
deleted file mode 100644
index 00f165a..0000000
--- a/debian/libdotconf-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/dotconf-config.1
diff --git a/debian/libdotconf1.0.files b/debian/libdotconf1.0.files
deleted file mode 100644
index 3518c4b..0000000
--- a/debian/libdotconf1.0.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libdotconf-1.0.so.0
-usr/lib/libdotconf-1.0.so.0.10.4
diff --git a/debian/libdotconf1.0.postinst b/debian/libdotconf1.0.postinst
deleted file mode 100644
index e62dc75..0000000
--- a/debian/libdotconf1.0.postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-test configure = "$1" && ldconfig
-
-#DEBHELPER#
diff --git a/debian/libdotconf1.3-0.install b/debian/libdotconf1.3-0.install
new file mode 100644
index 0000000..00f9b92
--- /dev/null
+++ b/debian/libdotconf1.3-0.install
@@ -0,0 +1,2 @@
+usr/lib/*/libdotconf.so.*
+
diff --git a/debian/libdotconf1.3.postinst b/debian/libdotconf1.3.postinst
new file mode 100644
index 0000000..e62dc75
--- /dev/null
+++ b/debian/libdotconf1.3.postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+test configure = "$1" && ldconfig
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index bfa870d..94f79e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,94 +4,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-# 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)
+%:
+ dh $@ --with autoreconf
+override_dh_strip:
+ dh_strip --dbg-package=libdotconf1.3-dbg
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-config.status: configure
- dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
-# for f in $(CURDIR)/examples/*; do \
-# if [ -d $$f ]; then \
-# (cd $$f && make clean); fi; done
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install prefix=$(CURDIR)/debian/libdotconf-dev/usr
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- #
- # build libdotconf1.0 package by moving files from libdotconf-dev
- #
- dh_movefiles -plibdotconf1.0 \
- --sourcedir debian/libdotconf-dev
-
- dh_installdocs
- dh_installexamples examples/*
- dh_installman
- dh_undocumented dotconf-config.1
-# dh_installinfo
- dh_installchangelogs ChangeLog
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
