[pkg-wpa-devel] r1005 - in /wpasupplicant/trunk: debian/ wpa_supplicant/doc/docbook/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sun Jan 6 12:14:25 UTC 2008
Author: kelmo-guest
Date: Sun Jan 6 12:14:25 2008
New Revision: 1005
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1005
Log:
* Add debian/README.Debian-source to document handling of upstream manual
pages.
* Build upstream manual pages from sgml source. Build-Depend on docbook and
docbook-utils.
Added:
wpasupplicant/trunk/debian/README.Debian-source
Removed:
wpasupplicant/trunk/wpa_supplicant/doc/docbook/wpa_background.8
wpasupplicant/trunk/wpa_supplicant/doc/docbook/wpa_cli.8
wpasupplicant/trunk/wpa_supplicant/doc/docbook/wpa_gui.8
wpasupplicant/trunk/wpa_supplicant/doc/docbook/wpa_passphrase.8
wpasupplicant/trunk/wpa_supplicant/doc/docbook/wpa_priv.8
wpasupplicant/trunk/wpa_supplicant/doc/docbook/wpa_supplicant.8
wpasupplicant/trunk/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/control
wpasupplicant/trunk/debian/rules
Added: wpasupplicant/trunk/debian/README.Debian-source
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/README.Debian-source?rev=1005&op=file
==============================================================================
--- wpasupplicant/trunk/debian/README.Debian-source (added)
+++ wpasupplicant/trunk/debian/README.Debian-source Sun Jan 6 12:14:25 2008
@@ -1,0 +1,32 @@
+In order to have the manual pages recreated at build time, they must be removed
+from our package tree. We do this simply by omitting the prebuilt manual pages
+from our SVN. When using svn-upgrade, this must be done manually post-upgrade
+to avoid confusing subversion, or else if the debian/rules clean target is used
+in the package svn working copy (default svn-buildpackage behaviour) the
+prebuilt manual pages would be removed without subversion knowing about it.
+
+svn revert wpa_supplicant/doc/docbook/*.5 wpa_supplicant/doc/docbook/*.8
+svn delete wpa_supplicant/doc/docbook/*.5 wpa_supplicant/doc/docbook/*.8
+
+
+Prebuilt manual pages are supplied upstream releases, but are not present in
+git snapshots. Rebuilding the manual pages at build time yields two advantages:
+
+1. No need to modify build rules when packaging git snapshots
+
+2. Allows opportunity to patch in debian specific documentation to enhance user
+ experience
+
+
+It is expected that dpkg-source will warn about their removal:
+
+dpkg-source: building wpasupplicant using existing wpasupplicant_0.6.2.orig.tar.gz
+dpkg-source: building wpasupplicant in wpasupplicant_0.6.2-1.diff.gz
+dpkg-source: warning: ignoring deletion of file wpa_supplicant/doc/docbook/wpa_supplicant.8
+dpkg-source: warning: ignoring deletion of file wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
+dpkg-source: warning: ignoring deletion of file wpa_supplicant/doc/docbook/wpa_priv.8
+dpkg-source: warning: ignoring deletion of file wpa_supplicant/doc/docbook/wpa_passphrase.8
+dpkg-source: warning: ignoring deletion of file wpa_supplicant/doc/docbook/wpa_gui.8
+dpkg-source: warning: ignoring deletion of file wpa_supplicant/doc/docbook/wpa_cli.8
+dpkg-source: warning: ignoring deletion of file wpa_supplicant/doc/docbook/wpa_background.8
+dpkg-source: building wpasupplicant in wpasupplicant_0.6.2-1.dsc
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1005&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Jan 6 12:14:25 2008
@@ -82,8 +82,12 @@
the text of the given GPL-2 license.
* No license had been chosen for the debian packaging information, so GPL-2+
has been chosen and recorded in debian/copyright.
-
- -- Kel Modderman <kel at otaku42.de> Sun, 06 Jan 2008 19:31:44 +1000
+ * Add debian/README.Debian-source to document handling of upstream manual
+ pages.
+ * Build upstream manual pages from sgml source. Build-Depend on docbook and
+ docbook-utils.
+
+ -- Kel Modderman <kel at otaku42.de> Sun, 06 Jan 2008 22:04:14 +1000
wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=1005&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Sun Jan 6 12:14:25 2008
@@ -4,7 +4,7 @@
Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
Uploaders: Kyle McMartin <kyle at debian.org>, Reinhard Tartler <siretart at tauware.de>, Kel Modderman <kel at otaku42.de>
Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5), quilt, libssl-dev, libpcsclite-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev
+Build-Depends: debhelper (>= 5), quilt, libssl-dev, libpcsclite-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev, docbook, docbook-utils
Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/
Homepage: http://w1.fi/wpa_supplicant/
Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1005&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Sun Jan 6 12:14:25 2008
@@ -23,8 +23,8 @@
# wpa_supplicant
CFLAGS="$(CFLAGS)" $(MAKE) -C wpa_supplicant all
- # manpages - requires docbook, docbook-utils
- #$(MAKE) -C wpa_supplicant/doc/docbook man
+ # manpages
+ $(MAKE) -C wpa_supplicant/doc/docbook man
# sanitise the example configuration
sed 's/^\([^#]\+=.*\|}\)/#\1/' < wpa_supplicant/wpa_supplicant.conf \
@@ -42,7 +42,7 @@
$(MAKE) -C wpa_supplicant clean
- #$(MAKE) -C wpa_supplicant/doc/docbook clean
+ $(MAKE) -C wpa_supplicant/doc/docbook clean
if [ -f wpa_supplicant/$(WPAGUI)/Makefile ]; then \
$(MAKE) -C wpa_supplicant/$(WPAGUI) distclean ; \
More information about the Pkg-wpa-devel
mailing list