[Pkg-ocaml-maint-commits] [dose3] 03/04: install coinstall manpage

Tue May 6 18:16:32 UTC 2014

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch experimental/master
in repository dose3.

commit aa940be9e3117809d36cd2a2f949251a51ae0bac
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue May 6 19:39:04 2014 +0200

    install coinstall manpage
---
 debian/TODO                         |  1 -
 debian/changelog                    |  7 ++++
 debian/control                      |  2 +-
 debian/dose-extra.manpages          |  2 +-
 debian/patches/binaries-prefix-edos | 72 +++++++++++++++++++++++++++++++------
 debian/rules                        |  4 +--
 6 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index ad687d2..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1 +0,0 @@
-install manpage of deb-coinstall
diff --git a/debian/changelog b/debian/changelog
index 48990d1..02f4c68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dose3 (3.2~rc3-1) experimental; urgency=low
+
+  * New upstream release candidate
+  * Install dose-deb-coinstall manpage
+
+ -- Ralf Treinen <treinen at debian.org>  Tue, 06 May 2014 19:37:57 +0200
+
 dose3 (3.2~rc2-1) experimental; urgency=medium
 
   * New upstream release candidate.
diff --git a/debian/control b/debian/control
index b3dcd2d..35f0cf4 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,7 @@ Description: Extra QA tools from the Dose3-library
   - dose-challenged, a debian-specific tool for checking which packages
     will certainly become uninstallable when some existing package is upgraded
     to a newer version.
-  - dose-deb-coinstall, a debian-specific tool for checking whether a set of
+  - dose-coinstall, a debian-specific tool for checking whether a set of
     packages can be installed all together.
  The tools dose-distcheck and dose-builddebcheck are packaged in their
  own resepective packages.
diff --git a/debian/dose-extra.manpages b/debian/dose-extra.manpages
index 4a32698..fbf1201 100644
--- a/debian/dose-extra.manpages
+++ b/debian/dose-extra.manpages
@@ -1,4 +1,4 @@
 doc/manpages/ceve.1
 doc/manpages/outdated.1
 doc/manpages/challenged.1
-# doc/manpages/deb-coinstall.1
\ No newline at end of file
+doc/manpages/coinstall.1
\ No newline at end of file
diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos
index 11dc28f..6e61cfc 100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@ -3,8 +3,8 @@ Description: all binaries have prefix dose-
 
 Index: dose3/doc/manpages/distcheck.pod
 ===================================================================
---- dose3.orig/doc/manpages/distcheck.pod	2014-04-27 17:37:27.812132813 +0200
-+++ dose3/doc/manpages/distcheck.pod	2014-04-27 17:37:27.812132813 +0200
+--- dose3.orig/doc/manpages/distcheck.pod	2014-05-06 19:52:40.105958614 +0200
++++ dose3/doc/manpages/distcheck.pod	2014-05-06 19:52:40.105958614 +0200
 @@ -1,25 +1,25 @@
  =head1 NAME
  
@@ -96,8 +96,8 @@ Index: dose3/doc/manpages/distcheck.pod
  =cut
 Index: dose3/doc/manpages/buildcheck.pod
 ===================================================================
---- dose3.orig/doc/manpages/buildcheck.pod	2014-04-27 17:37:27.812132813 +0200
-+++ dose3/doc/manpages/buildcheck.pod	2014-04-27 17:37:27.812132813 +0200
+--- dose3.orig/doc/manpages/buildcheck.pod	2014-05-06 19:52:40.105958614 +0200
++++ dose3/doc/manpages/buildcheck.pod	2014-05-06 19:52:40.105958614 +0200
 @@ -127,7 +127,7 @@
  =head1 SEE ALSO
  
@@ -109,8 +109,8 @@ Index: dose3/doc/manpages/buildcheck.pod
  <http://www.mancoosi.org> is the home page of the Mancoosi project. 
 Index: dose3/doc/manpages/outdated.pod
 ===================================================================
---- dose3.orig/doc/manpages/outdated.pod	2014-04-27 17:37:27.812132813 +0200
-+++ dose3/doc/manpages/outdated.pod	2014-04-27 17:37:27.812132813 +0200
+--- dose3.orig/doc/manpages/outdated.pod	2014-05-06 19:52:40.105958614 +0200
++++ dose3/doc/manpages/outdated.pod	2014-05-06 19:52:40.105958614 +0200
 @@ -1,16 +1,16 @@
  =head1 NAME
  
@@ -162,8 +162,8 @@ Index: dose3/doc/manpages/outdated.pod
   
 Index: dose3/doc/manpages/challenged.pod
 ===================================================================
---- dose3.orig/doc/manpages/challenged.pod	2014-04-27 17:37:27.812132813 +0200
-+++ dose3/doc/manpages/challenged.pod	2014-04-27 17:37:27.812132813 +0200
+--- dose3.orig/doc/manpages/challenged.pod	2014-05-06 19:52:40.105958614 +0200
++++ dose3/doc/manpages/challenged.pod	2014-05-06 19:52:40.105958614 +0200
 @@ -1,19 +1,19 @@
  =head1 NAME
  
@@ -225,8 +225,8 @@ Index: dose3/doc/manpages/challenged.pod
  
 Index: dose3/doc/manpages/ceve.pod
 ===================================================================
---- dose3.orig/doc/manpages/ceve.pod	2014-04-27 17:37:27.812132813 +0200
-+++ dose3/doc/manpages/ceve.pod	2014-04-27 17:40:06.076641425 +0200
+--- dose3.orig/doc/manpages/ceve.pod	2014-05-06 19:52:40.105958614 +0200
++++ dose3/doc/manpages/ceve.pod	2014-05-06 19:52:40.105958614 +0200
 @@ -1,18 +1,18 @@
  =head1 NAME
  
@@ -249,3 +249,55 @@ Index: dose3/doc/manpages/ceve.pod
  extracts package metadata from them, performs some manipulations, and outputs
  the package metadata in one of several formats. 
  
+Index: dose3/doc/manpages/coinstall.pod
+===================================================================
+--- dose3.orig/doc/manpages/coinstall.pod	2014-05-06 19:52:40.105958614 +0200
++++ dose3/doc/manpages/coinstall.pod	2014-05-06 19:53:37.118162721 +0200
+@@ -1,19 +1,19 @@
+ =head1 NAME
+ 
+-dose-debcoinstall - calculate a coinstallation set of a given set of Debian binary packages
++dose-deb-coinstall - calculate a coinstallation set of a given set of Debian binary packages
+ 
+ =head1 SYNOPSIS
+ 
+ =over
+ 
+-=item B<dose-debcoinstall> [options] I<binary-repositories>
++=item B<dose-deb-coinstall> [options] I<binary-repositories>
+ 
+ =back
+ =cut
+ 
+ =head1 DESCRIPTION
+ 
+-dose-debcoinstall determines whether a set of foreground Debian binary packages
++dose-deb-coinstall determines whether a set of foreground Debian binary packages
+ can be installed together given a set of background Debian binary packages. If
+ yes, then a valid coinstallation set is printed on standard output. If the
+ B<--src> option is given, then the associated source packages are printed on
+@@ -118,13 +118,13 @@
+  /var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages \
+  > essential
+ 
+- dose-debcoinstall --deb-native-arch=amd64 \
++ dose-deb-coinstall --deb-native-arch=amd64 \
+  --bg /var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages \
+  --fg essential > essential_coinstall
+ 
+ Compute the list of source packages needed to build these packages:
+ 
+- dose-debcoinstall --deb-native-arch=amd64 \
++ dose-deb-coinstall --deb-native-arch=amd64 \
+  --src /var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_source_Sources \
+  --bg /var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages \
+  --fg essential > essential_coinstall_src
+@@ -139,7 +139,7 @@
+ =head1 SEE ALSO
+ 
+ L<B<deb-control>(5)>,
+-L<B<dose3-distcheck>(1)>
++L<B<dose-debcheck>(1)>
+ 
+ <http://www.edos-project.org> is the home page of the EDOS project.
+ <http://www.mancoosi.org> is the home page of the Mancoosi project.
diff --git a/debian/rules b/debian/rules
index 6200875..411bcc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,8 +27,8 @@ override_dh_installman:
 	cd debian/dose-extra/usr/share/man/man1 \
 		&& mv outdated.1 dose-outdated.1 \
 		&& mv challenged.1 dose-challenged.1 \
-		&& mv ceve.1 dose-ceve.1 
-#		&& mv deb-coinstall.1 dose-deb-coinstall.1
+		&& mv ceve.1 dose-ceve.1 \
+		&& mv coinstall.1 dose-deb-coinstall.1
 	cd debian/dose-builddebcheck/usr/share/man/man1 \
 		&& mv buildcheck.1 dose-builddebcheck.1
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git

