You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2010/10/06 19:29:47 UTC

svn commit: r1005179 - in /tcl/rivet/trunk: ./ debian/

Author: mxmanghi
Date: Wed Oct  6 17:29:46 2010
New Revision: 1005179

URL: http://svn.apache.org/viewvc?rev=1005179&view=rev
Log:
* debian/*: most files in this directory have been modified to comply with the latest version of debian packaging 
    system. Some files were deleted because superseded by others which have been added to produce 2 separate
    packages: one for the module and the Tcl library, the other for the html manual.

Added:
    tcl/rivet/trunk/debian/README.source
    tcl/rivet/trunk/debian/clean
    tcl/rivet/trunk/debian/docs
    tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.doc-base
    tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.docs
    tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.substvars
    tcl/rivet/trunk/debian/libapache2-mod-rivet.install
    tcl/rivet/trunk/debian/libapache2-mod-rivet.postinst
    tcl/rivet/trunk/debian/libapache2-mod-rivet.prerm
    tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars
Removed:
    tcl/rivet/trunk/debian/500mod_rivet.info
    tcl/rivet/trunk/debian/rules.tcl
Modified:
    tcl/rivet/trunk/ChangeLog
    tcl/rivet/trunk/debian/changelog
    tcl/rivet/trunk/debian/control
    tcl/rivet/trunk/debian/copyright
    tcl/rivet/trunk/debian/files
    tcl/rivet/trunk/debian/rivet.conf
    tcl/rivet/trunk/debian/rules

Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1005179&r1=1005178&r2=1005179&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Wed Oct  6 17:29:46 2010
@@ -1,3 +1,8 @@
+2010-10-06 Massimo Manghi <mx...@apache.org>
+    * debian/*: most files in this directory have been modified to comply with the latest version of debian packaging 
+    system. Some files were deleted because superseded by others which have been added to produce 2 separate
+    packages: one for the module and the Tcl library, the other for the html manual.
+
 2010-09-20 Massimo Manghi <mx...@apache.org>
     * debian/*: changing some info in files needed by the debian
 

Added: tcl/rivet/trunk/debian/README.source
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/README.source?rev=1005179&view=auto
==============================================================================
--- tcl/rivet/trunk/debian/README.source (added)
+++ tcl/rivet/trunk/debian/README.source Wed Oct  6 17:29:46 2010
@@ -0,0 +1,8 @@
+libapache2-mod-rivet for Debian
+-------------------------------
+
+ libapache2-mod-rivet allows Apache to script web pages using the Tcl
+Command language.
+
+
+

Modified: tcl/rivet/trunk/debian/changelog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/changelog?rev=1005179&r1=1005178&r2=1005179&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/changelog (original)
+++ tcl/rivet/trunk/debian/changelog Wed Oct  6 17:29:46 2010
@@ -1,51 +1,11 @@
-libapache2-mod-rivet (2.0.1-1) unstable; urgency=low
-    
-  * repackaging rivet
+libapache2-mod-rivet (2.0.2-2) unstable; urgency=low
 
- -- Massimo Manghi <mx...@apache.org>  Wed, 15 Sep 2010 17:52:00 +0200
+  * Cruft removed from debian/
 
-rivet (0.5.0-2) unstable; urgency=low
+ -- Massimo Manghi <mx...@apache.org>  Mon, 21 Sep 2010 16:37:14 +0200
 
-  * Added a dependency on Apache.  Added .info file.  Added some automatic
-    configuration files.
+libapache2-mod-rivet (2.0.2-1) unstable; urgency=low
 
- -- David N. Welton <da...@debian.org>  Sat, 30 Apr 2005 10:37:09 +0200
-
-rivet (0.5.0-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- David N. Welton <da...@debian.org>  Thu, 24 Mar 2005 10:45:27 +0100
-
-rivet (0.4.0-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- David N. Welton <da...@debian.org>  Fri, 28 May 2004 22:44:16 +0200
-
-rivet (0.3.0-1) unstable; urgency=low
-
-  * New upstream version.
-  * Bug fix: "apache complains about mod_rivet not compiled with -DEAPI",
-    thanks to Massimo Manghi (Closes: #215111).
-
- -- David N. Welton <da...@debian.org>  Fri,  6 Feb 2004 22:49:10 +0100
-
-rivet (0.2.0-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- David N. Welton <da...@debian.org>  Wed,  1 Oct 2003 11:27:44 +0200
-
-rivet (0.1.2-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- David N. Welton <da...@debian.org>  Mon,  7 Apr 2003 19:45:59 -0700
-
-rivet (0.1.1-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- David N. Welton <da...@debian.org>  Thu, 13 Feb 2003 00:26:50 -0800
+  * Initial release 
 
+ -- Massimo Manghi <mx...@apache.org>  Mon, 20 Sep 2010 16:37:14 +0200

Added: tcl/rivet/trunk/debian/clean
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/clean?rev=1005179&view=auto
==============================================================================
--- tcl/rivet/trunk/debian/clean (added)
+++ tcl/rivet/trunk/debian/clean Wed Oct  6 17:29:46 2010
@@ -0,0 +1 @@
+

Modified: tcl/rivet/trunk/debian/control
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/control?rev=1005179&r1=1005178&r2=1005179&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/control (original)
+++ tcl/rivet/trunk/debian/control Wed Oct  6 17:29:46 2010
@@ -1,14 +1,16 @@
 Source: libapache2-mod-rivet
-Maintainer: Massimo Manghi <mx...@apache.org>
-Build-Depends: tcl8.5-dev, libapr1-dev, apache2-prefork-dev, debhelper (>=7.0.50~)
 Section: web
-Priority: optional
-Standards-Version: 3.5.8
+Priority: extra
+Maintainer: Massimo Manghi <mx...@apache.org>
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev
+Standards-Version: 3.8.4
 Homepage: http://tcl.apache.org/rivet/
+#Vcs-Git: git://git.debian.org/collab-maint/libapache2-mod-rivet.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/libapache2-mod-rivet.git;a=summary
 
 Package: libapache2-mod-rivet
 Architecture: any
-Depends: ${shlibs:Depends}, apache2, apache2-common, apache2-mpm-prefork, libapr1, tcl8.5, itcl3
+Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.5-dev, libapr1-dev, apache2-prefork-dev, debhelper (>= 7.0.50~)
 Description: Server-side Tcl programming system combining ease of use and power
  Apache Rivet is a system for creating dynamic web content via a
  programming language integrated with Apache Web Server. It is
@@ -19,3 +21,16 @@ Description: Server-side Tcl programming
  manipulation, XML, and so on). In order to meet these goals
  Tcl programming language was chosen to combine with the Apache Web
  Server.
+
+Package: libapache2-mod-rivet-doc
+Architecture: all
+Description: Server-side Tcl programming system combining ease of use and power
+ Apache Rivet is a system for creating dynamic web content via a
+ programming language integrated with Apache Web Server. It is
+ designed to be fast, powerful and extensible, consume few system
+ resources, be easy to learn, and to provide the user with a platform
+ that can also be used for other programming tasks outside the web
+ (GUI's, system administration tasks, text processing, database
+ manipulation, XML, and so on). In order to meet these goals
+ Tcl programming language was chosen to combine with the Apache Web.
+

Modified: tcl/rivet/trunk/debian/copyright
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/copyright?rev=1005179&r1=1005178&r2=1005179&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/copyright (original)
+++ tcl/rivet/trunk/debian/copyright Wed Oct  6 17:29:46 2010
@@ -1,210 +1,28 @@
-This package was debianized by David N. Welton <da...@debian.org> on
-Thu, 13 Feb 2003 00:26:50 -0800.
+This work was packaged for Debian by:
 
-It was downloaded from http://tcl.apache.org/rivet/
+    Massimo Manghi <mx...@apache.org> on Mon, 20 Sep 2010 16:37:14 +0200
 
-Upstream Authors: The Apache Software Foundation
+It was downloaded from:
+
+    http://tcl.apache.org/
+
+Upstream Author(s):
+
+    The Rivet Team
+    The Apache Software Foundation
 
 Copyright:
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The Rivet Team
+
+License:
+
+    Apache License
+    Version 2.0, January 2004
+    http://www.apache.org/licenses/
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Massimo Manghi <mx...@apache.org>
+
+

Added: tcl/rivet/trunk/debian/docs
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/docs?rev=1005179&view=auto
==============================================================================
--- tcl/rivet/trunk/debian/docs (added)
+++ tcl/rivet/trunk/debian/docs Wed Oct  6 17:29:46 2010
@@ -0,0 +1,8 @@
+BUGS
+form.txt
+README
+README.configure
+README.freebsd
+README.MacOSX
+TODO
+CHANGES

Modified: tcl/rivet/trunk/debian/files
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/files?rev=1005179&r1=1005178&r2=1005179&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/files (original)
+++ tcl/rivet/trunk/debian/files Wed Oct  6 17:29:46 2010
@@ -1 +1,2 @@
-libapache2-mod-rivet_2.0.1-1_amd64.deb web optional
+libapache2-mod-rivet_2.0.2-2_amd64.deb web extra
+libapache2-mod-rivet-doc_2.0.2-2_all.deb web extra

Added: tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.doc-base
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.doc-base?rev=1005179&view=auto
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.doc-base (added)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.doc-base Wed Oct  6 17:29:46 2010
@@ -0,0 +1,11 @@
+Document: Rivet
+Title: The Apache Rivet Programming Manual
+Author: The Rivet Team
+Abstract: This manual explains how to script
+  web pages using Rivet and the Tcl programming language
+Section: Web Development
+     
+Format: HTML
+Index: /usr/share/doc/libapache2-mod-rivet/html/index.html
+Files: /usr/share/doc/libapache2-mod-rivet/html/*.html
+

Added: tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.docs
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.docs?rev=1005179&view=auto
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.docs (added)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.docs Wed Oct  6 17:29:46 2010
@@ -0,0 +1 @@
+doc/html/

Added: tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.substvars
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.substvars?rev=1005179&view=auto
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.substvars (added)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.substvars Wed Oct  6 17:29:46 2010
@@ -0,0 +1 @@
+misc:Depends=

Added: tcl/rivet/trunk/debian/libapache2-mod-rivet.install
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet.install?rev=1005179&view=auto
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet.install (added)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet.install Wed Oct  6 17:29:46 2010
@@ -0,0 +1,2 @@
+debian/rivet.load   etc/apache2/mods-available
+debian/rivet.conf   etc/apache2/mods-available

Added: tcl/rivet/trunk/debian/libapache2-mod-rivet.postinst
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet.postinst?rev=1005179&view=auto
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet.postinst (added)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet.postinst Wed Oct  6 17:29:46 2010
@@ -0,0 +1,52 @@
+#!/bin/sh
+# postinst script for libapache2-mod-rivet
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+APACHE2CONF="/etc/apache2/"
+
+case "$1" in
+    configure)
+	if [ -z "$2" ] ; then
+            CD=`pwd`
+            cd $APACHE2CONF/mods-enabled
+            ln -s ../mods-available/rivet.load ./rivet.load
+            ln -s ../mods-available/rivet.conf ./rivet.conf
+            cd $CD
+            a2enmod -q rivet
+
+            if [ -e /etc/apache2/mods-enabled/rivet.load ] ; then
+               invoke-rc.d apache2 restart
+            fi
+       fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Added: tcl/rivet/trunk/debian/libapache2-mod-rivet.prerm
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet.prerm?rev=1005179&view=auto
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet.prerm (added)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet.prerm Wed Oct  6 17:29:46 2010
@@ -0,0 +1,43 @@
+#!/bin/sh
+# prerm script for libapache2-mod-rivet
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+       a2dismod -q -f rivet || true
+       invoke-rc.d apache2 restart
+    ;;
+
+    upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Added: tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars?rev=1005179&view=auto
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars (added)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars Wed Oct  6 17:29:46 2010
@@ -0,0 +1,2 @@
+shlibs:Depends=libc6 (>= 2.3.4), tcl8.5 (>= 8.5.0)
+misc:Depends=

Modified: tcl/rivet/trunk/debian/rivet.conf
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/rivet.conf?rev=1005179&r1=1005178&r2=1005179&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/rivet.conf (original)
+++ tcl/rivet/trunk/debian/rivet.conf Wed Oct  6 17:29:46 2010
@@ -2,3 +2,4 @@
   AddType application/x-httpd-rivet .rvt
   AddType application/x-rivet-tcl .tcl
 </IfModule>
+

Modified: tcl/rivet/trunk/debian/rules
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/rules?rev=1005179&r1=1005178&r2=1005179&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/rules (original)
+++ tcl/rivet/trunk/debian/rules Wed Oct  6 17:29:46 2010
@@ -1,16 +1,42 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# $Id$
+# Uncomment this to turn on verbose mode.
 
-export	DH_VERBOSE=1
+export DH_VERBOSE=1
 
 TCL_VERSION=8.5
-
 package=libapache2-mod-rivet
 
+export DH_OPTIONS
+
+#%:
+#	dh $@ 
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	-$(MAKE) clean 
+	dh_clean
+
+
+build: configure build-stamp
+
+build-stamp: configure-stamp
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
 configure: configure-stamp
+
 configure-stamp:
 	dh_testdir
+	chmod +x ./configure
 	./configure --with-tcl=/usr/lib/tcl$(TCL_VERSION)/	\
 		    --with-apache=/usr				\
 		    --with-apxs=/usr/bin/apxs2			\
@@ -20,39 +46,24 @@ configure-stamp:
 		    --enable-version-display 
 	touch configure-stamp
 
-build: build-stamp
+binary-indep: build libapache2-mod-rivet-doc
 
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
-	( cd doc/; $(MAKE) docs )
-	touch build-stamp
+binary-arch: build libapache2-mod-rivet
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) clean
-	dh_clean
+binary: build binary-arch binary-indep
 
-install: build
-	dh_testdir
-	dh_testroot
+libapache2-mod-rivet: build
+	dh_testdir -a 
+	dh_testroot -a 
 	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
+	dh_installdirs -p$@
 	dh_installchangelogs ChangeLog
-	dh_installdocs doc/*
-	dh_installexamples
-	dh_install
+	dh_install -a
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/$@
+	dh_installexamples -a -p$@
+	dh_auto_install -a -p$@ 
+#	dh_install -a $(CURDIR)/debian/tmp $(CURDIR/debian/$(package)
+	dh_install -a -p$@
 #	dh_installmenu
 #	dh_installdebconf
 #	dh_installlogrotate
@@ -62,19 +73,35 @@ binary-arch: build install
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installman -p$@
+	dh_link -p$@
+	dh_strip -p$@
+	dh_compress -p$@
+	dh_fixperms -p$@
+	dh_makeshlibs -p$@
+	dh_installdeb -p$@
+	dh_shlibdeps -p$@
+	dh_gencontrol -p$@
+	dh_md5sums -p$@
+	dh_builddeb -p$@ 
+
+libapache2-mod-rivet-doc: build
+	dh_testdir
+	( cd doc/; $(MAKE) docs )
+	dh_testroot
+	dh_installdirs -p$@
+	dh_installchangelogs -p$@ ChangeLog
+	dh_installdocs -p$@ 
+	dh_installman -p$@
+	dh_link -p$@
+	dh_strip -p$@
+	dh_compress -p$@
+	dh_fixperms -p$@
+	dh_makeshlibs -p$@
+	dh_installdeb -p$@
+	dh_shlibdeps -p$@
+	dh_gencontrol -p$@
+	dh_md5sums -p$@
+	dh_builddeb -p$@ 
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build build-stamp clean binary binary-indep binary-arch configure



---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org