r124 - trunk/debian

[rousseau at alioth.debian.org]

Author: rousseau
Date: 2008-03-21 13:21:39 +0000 (Fri, 21 Mar 2008)
New Revision: 124

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/copyright
   trunk/debian/manpages
   trunk/debian/rules
Log:
do not package bins-edit-gui since it depends on Gtk+ 1.x and this is no
more available in Debian. Closes: #471949: "bins-edit-gui asks to
install non-existing package"


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-21 12:59:47 UTC (rev 123)
+++ trunk/debian/changelog	2008-03-21 13:21:39 UTC (rev 124)
@@ -3,8 +3,11 @@
   * debian/control:
    - use the Homepage: field
    - add Vcs-Svn: and Vcs-Browser: fields
+  * do not package bins-edit-gui since it depends on Gtk+ 1.x and this is no
+    more available in Debian. Closes: #471949: "bins-edit-gui asks to install
+    non-existing package"
 
- -- Ludovic Rousseau <rousseau at debian.org>  Fri, 21 Mar 2008 13:59:08 +0100
+ -- Ludovic Rousseau <rousseau at debian.org>  Fri, 21 Mar 2008 14:10:51 +0100
 
 bins (1.1.29-9) unstable; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-03-21 12:59:47 UTC (rev 123)
+++ trunk/debian/control	2008-03-21 13:21:39 UTC (rev 124)
@@ -17,7 +17,7 @@
 Description: Generate static HTML photo albums using XML and EXIF tags
  BINS generates a complete static gallery (images and HTML) with
  thumbnails and image lists, using XML files to hold information about
- each image.  Includes bins_edit and bins-edit-gui tools for adding
+ each image.  Includes bins_edit tool for adding
  information to the XML files.  Interprets EXIF and JFIF tags (and
  Canon extensions) in the jpeg directly.  Gallery appearance
  customizable through HTML templates; gallery can be generated in

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2008-03-21 12:59:47 UTC (rev 123)
+++ trunk/debian/copyright	2008-03-21 13:21:39 UTC (rev 124)
@@ -6,7 +6,6 @@
 It was downloaded from http://bins.sautret.org/
 
 Upstream Authors: Jérôme Sautret <Jerome at Sautret.org>
-  bins-edit-gui by Mark Eichin <eichin at thok.org>
 
 Copyright:
 
@@ -17,11 +16,6 @@
 Initial code based on IDS 0.21:
 Copyright (C)  John Moose <moosejc at muohio.edu>
 
-bins-edit-gui is released under the terms of the GPL and is
-Copyright 2002  Mark W. Eichin <eichin at thok.org>
-bins-edit-gui is available separately from
-http://www.thok.org/intranet/sfdf/
-
 BINS is released under the terms of the GNU General Public Licence
 (GPL), version 2:
 
@@ -48,5 +42,5 @@
 
 Copyright (C) 2002-2003  Mark W. Eichin <eichin at thok.org>
 Copyright (C) 2004-2005  Ludovic Rousseau <rousseau at debian.org>
-Copyright (C) 2005-2006  Martin Michlmayr <tbm at cyrius.com>
+Copyright (C) 2005-2008  Martin Michlmayr <tbm at cyrius.com>
 

Modified: trunk/debian/manpages
===================================================================
--- trunk/debian/manpages	2008-03-21 12:59:47 UTC (rev 123)
+++ trunk/debian/manpages	2008-03-21 13:21:39 UTC (rev 124)
@@ -1,4 +1,3 @@
 doc/bins.1
 doc/bins_edit.1
-doc/bins-edit-gui.1
 debian/bins_cleanupgallery.1

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-03-21 12:59:47 UTC (rev 123)
+++ trunk/debian/rules	2008-03-21 13:21:39 UTC (rev 124)
@@ -52,8 +52,6 @@
 
 	if [ -f doc/bins.1.bak ]; then \
 		mv doc/bins.1.bak doc/bins.1; fi
-	if [ -f doc/bins-edit-gui.1.bak ]; then \
-		mv doc/bins-edit-gui.1.bak doc/bins-edit-gui.1; fi
 	dh_clean
 
 install: build
@@ -64,10 +62,8 @@
 
 	# backup original manpages
 	mv doc/bins.1 doc/bins.1.bak
-	mv doc/bins-edit-gui.1 doc/bins-edit-gui.1.bak
 
 	# regeneate modified manpages
-	docbook-to-man doc/bins-edit-gui.sgml > doc/bins-edit-gui.1
 	docbook-to-man doc/bins.sgml > doc/bins.1
 
 	# Add here commands to install the package into debian/bins.
@@ -83,6 +79,9 @@
 	# install HTML documentation
 	cp doc/*html debian/bins/usr/share/doc/bins/
 
+	# remove bins-edit-gui since it depends on Gtk+ 1.x
+	find debian -name "bins-edit-gui*" -exec rm {} \;
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.