[DRE-commits] r6042 - in trunk/webgen0.4/debian: . source

Vincent Fourmond fourmond at alioth.debian.org
Sun Feb 13 01:14:19 UTC 2011


Author: fourmond
Date: 2011-02-13 01:14:13 +0000 (Sun, 13 Feb 2011)
New Revision: 6042

Added:
   trunk/webgen0.4/debian/source/
   trunk/webgen0.4/debian/source/format
   trunk/webgen0.4/debian/webgen0.4.postinst
   trunk/webgen0.4/debian/webgen0.4.prerm
Removed:
   trunk/webgen0.4/debian/webgen0.4.manpages
Modified:
   trunk/webgen0.4/debian/changelog
   trunk/webgen0.4/debian/control
   trunk/webgen0.4/debian/rules
Log:
[webgen0.4] Move the webgen binary to allow the use of alternatives to provide the webgen command + switch to format 3.0 + various other fixes

Modified: trunk/webgen0.4/debian/changelog
===================================================================
--- trunk/webgen0.4/debian/changelog	2011-02-09 19:43:15 UTC (rev 6041)
+++ trunk/webgen0.4/debian/changelog	2011-02-13 01:14:13 UTC (rev 6042)
@@ -1,11 +1,6 @@
-webgen0.4 (0.4.7-5) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Paul van Tilburg <paulvt at debian.org>  Sun, 14 Feb 2010 16:17:51 +0100
-
 webgen0.4 (0.4.7-4) unstable; urgency=low
 
+  [ Paul van Tilburg ]
   * debian/control:
     - Added myself to the uploaders.
     - Bumped standards version to 3.8.4.
@@ -13,8 +8,18 @@
   * debian/watch:
     - Adapted the watch file to only consider 0.4.x releases.
 
- -- Paul van Tilburg <paulvt at debian.org>  Sun, 14 Feb 2010 16:02:03 +0100
+  [ Vincent Fourmond ]
+  * Switched to format 3.0 (quilt)
+  * Dropped all references to quilt
+  * Conforms to standards 3.9.1
+  * Install the executable as webgen0.4
+  * Added versioned conflicts to other packages installing the webgen
+    binary.
+  * Setup alternatives for providing the webgen binary and the
+    corresponding manual page (closes: #613126).
 
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 13 Feb 2011 02:06:59 +0100
+
 webgen0.4 (0.4.7-3) unstable; urgency=low
 
   * Added myself and the Debian Ruby team to uploaders

Modified: trunk/webgen0.4/debian/control
===================================================================
--- trunk/webgen0.4/debian/control	2011-02-09 19:43:15 UTC (rev 6041)
+++ trunk/webgen0.4/debian/control	2011-02-13 01:14:13 UTC (rev 6042)
@@ -3,16 +3,17 @@
 Priority: optional
 Maintainer: Arnaud Cornet <acornet at debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>, Paul van Tilburg <paulvt at debian.org>, Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, ruby, ruby-pkg-tools (>= 0.14), libcmdparse2-ruby, libbluecloth-ruby, libredcloth-ruby, libbuilder-ruby, librmagick-ruby, libmaruku-ruby, graphviz
+Build-Depends: cdbs, debhelper (>= 5.0.0), ruby, ruby-pkg-tools (>= 0.14), libcmdparse2-ruby, libbluecloth-ruby, libredcloth-ruby, libbuilder-ruby, librmagick-ruby, libmaruku-ruby, graphviz
 Build-Conflicts: libxml2-utils, webgen (<< 0.4)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://webgen.rubyforge.org/
 
 Package: webgen0.4
 Architecture: all
 Depends: ruby, libcmdparse2-ruby, rdoc, ${misc:Depends}
 Recommends: libredcloth-ruby, librmagick-ruby, libexif-ruby, libbluecloth-ruby, libbuilder-ruby, webgen0.4-doc
-Conflicts: webgen
+Conflicts: webgen (<= 0.3.8-3), webgen0.5 (<= 0.5.13+dfsg-1)
+Breaks: webgen (<= 0.3.8-3), webgen0.5 (<= 0.5.13+dfsg-1)
 Description: A template based static website generator
  Webgen is used to generate web pages from page description and template files.
  You create one template file in which you define the layout of your page and

Modified: trunk/webgen0.4/debian/rules
===================================================================
--- trunk/webgen0.4/debian/rules	2011-02-09 19:43:15 UTC (rev 6041)
+++ trunk/webgen0.4/debian/rules	2011-02-13 01:14:13 UTC (rev 6042)
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
 DEB_RUBY_SIMPLE_PACKAGES=webgen0.4
@@ -12,6 +11,8 @@
 
 install/webgen0.4::
 	rm -rf debian/webgen0.4/usr/lib/ruby/1.8/webgen/gui
+	mv debian/webgen0.4/usr/bin/webgen debian/webgen0.4/usr/bin/webgen0.4
+	mv debian/webgen0.4/usr/share/man/man1/webgen.1 debian/webgen0.4/usr/share/man/man1/webgen0.4.1
 
 build/webgen0.4-doc::
 	(cd doc ; ruby -I ../lib ../bin/webgen)

Added: trunk/webgen0.4/debian/source/format
===================================================================
--- trunk/webgen0.4/debian/source/format	                        (rev 0)
+++ trunk/webgen0.4/debian/source/format	2011-02-13 01:14:13 UTC (rev 6042)
@@ -0,0 +1 @@
+3.0 (quilt)

Deleted: trunk/webgen0.4/debian/webgen0.4.manpages
===================================================================
--- trunk/webgen0.4/debian/webgen0.4.manpages	2011-02-09 19:43:15 UTC (rev 6041)
+++ trunk/webgen0.4/debian/webgen0.4.manpages	2011-02-13 01:14:13 UTC (rev 6042)
@@ -1 +0,0 @@
-man/man1/webgen.1

Added: trunk/webgen0.4/debian/webgen0.4.postinst
===================================================================
--- trunk/webgen0.4/debian/webgen0.4.postinst	                        (rev 0)
+++ trunk/webgen0.4/debian/webgen0.4.postinst	2011-02-13 01:14:13 UTC (rev 6042)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e 
+
+if [ "$1" = "configure" ]
+then
+  update-alternatives --install /usr/bin/webgen webgen /usr/bin/webgen0.4 40 \
+      --slave /usr/share/man/man1/webgen.1.gz webgen.1.gz /usr/share/man/man1/webgen0.4.1.gz
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#

Added: trunk/webgen0.4/debian/webgen0.4.prerm
===================================================================
--- trunk/webgen0.4/debian/webgen0.4.prerm	                        (rev 0)
+++ trunk/webgen0.4/debian/webgen0.4.prerm	2011-02-13 01:14:13 UTC (rev 6042)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e 
+
+if [ "$1" = "remove" ]
+then
+  update-alternatives --remove webgen /usr/bin/webgen0.4
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#




More information about the Pkg-ruby-extras-commits mailing list