[Pkg-ocaml-maint-commits] r2254 - in trunk/packages/cocanwiki: trunk/debian trunk/debian/patches upstream

[Stefano Zacchiroli]

Author: zack
Date: 2005-12-06 14:19:02 +0000 (Tue, 06 Dec 2005)
New Revision: 2254

Added:
   trunk/packages/cocanwiki/trunk/debian/patches/13_conf_location.dpatch
   trunk/packages/cocanwiki/upstream/cocanwiki_1.3.20.orig.tar.gz
Removed:
   trunk/packages/cocanwiki/upstream/cocanwiki_1.3.19.orig.tar.gz
Modified:
   trunk/packages/cocanwiki/trunk/debian/changelog
   trunk/packages/cocanwiki/trunk/debian/patches/00list
Log:
new upstream release


Modified: trunk/packages/cocanwiki/trunk/debian/changelog
===================================================================
--- trunk/packages/cocanwiki/trunk/debian/changelog	2005-12-05 22:36:00 UTC (rev 2253)
+++ trunk/packages/cocanwiki/trunk/debian/changelog	2005-12-06 14:19:02 UTC (rev 2254)
@@ -1,3 +1,10 @@
+cocanwiki (1.3.20-1) unstable; urgency=low
+
+  * new upstream release
+  * installs cocanwiki.conf in /etc/cocanwiki/
+
+ -- Stefano Zacchiroli <zack at debian.org>  Tue,  6 Dec 2005 11:08:13 +0100
+
 cocanwiki (1.3.19-1) unstable; urgency=low
 
   * new upstream release

Modified: trunk/packages/cocanwiki/trunk/debian/patches/00list
===================================================================
--- trunk/packages/cocanwiki/trunk/debian/patches/00list	2005-12-05 22:36:00 UTC (rev 2253)
+++ trunk/packages/cocanwiki/trunk/debian/patches/00list	2005-12-06 14:19:02 UTC (rev 2254)
@@ -0,0 +1 @@
+13_conf_location.dpatch

Added: trunk/packages/cocanwiki/trunk/debian/patches/13_conf_location.dpatch
===================================================================
--- trunk/packages/cocanwiki/trunk/debian/patches/13_conf_location.dpatch	2005-12-05 22:36:00 UTC (rev 2253)
+++ trunk/packages/cocanwiki/trunk/debian/patches/13_conf_location.dpatch	2005-12-06 14:19:02 UTC (rev 2254)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_conf_location.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2005-10-28 12:02:40.000000000 +0200
++++ trunk/Makefile	2005-12-06 11:10:54.000000000 +0100
+@@ -13,8 +13,8 @@
+ pkg-install:
+ 	$(MAKE) -C scripts install
+ 
+-	install -d -m 0755 $(DESTDIR)$(APACHECONFDIR)
+-	install -m 0644 conf/cocanwiki.conf $(DESTDIR)$(APACHECONFDIR)/cocanwiki.conf
++	install -d -m 0755 $(DESTDIR)$(COCANWIKICONFDIR)
++	install -m 0644 conf/cocanwiki.conf $(DESTDIR)$(COCANWIKICONFDIR)/cocanwiki.conf
+ 
+ 	install -d -m 0755 $(DESTDIR)$(WIKIINSTALLDIR)
+ 	install -d -m 0755 $(DESTDIR)$(WIKIINSTALLDIR)/conf
+diff -urNad trunk~/Makefile.config trunk/Makefile.config
+--- trunk~/Makefile.config	2005-12-05 11:08:59.000000000 +0100
++++ trunk/Makefile.config	2005-12-06 11:10:32.000000000 +0100
+@@ -9,5 +9,6 @@
+ # building the Debian package.
+ 
+ APACHECONFDIR := /etc/apache
++COCANWIKICONFDIR := /etc/cocanwiki
+ 
+ WIKIINSTALLDIR := /usr/share/cocanwiki


Property changes on: trunk/packages/cocanwiki/trunk/debian/patches/13_conf_location.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/packages/cocanwiki/upstream/cocanwiki_1.3.19.orig.tar.gz
===================================================================
(Binary files differ)

Added: trunk/packages/cocanwiki/upstream/cocanwiki_1.3.20.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/cocanwiki/upstream/cocanwiki_1.3.20.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream