[Pkg-ocaml-maint-commits] r4393 - in /trunk/packages/confluence/trunk/debian: changelog rules watch

[treinen at users.alioth.debian.org]

Author: treinen
Date: Thu Sep  6 08:03:15 2007
New Revision: 4393

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4393
Log:
some cleanup in the confluence package

Modified:
    trunk/packages/confluence/trunk/debian/changelog
    trunk/packages/confluence/trunk/debian/rules
    trunk/packages/confluence/trunk/debian/watch

Modified: trunk/packages/confluence/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/changelog?rev=4393&op=diff
==============================================================================
--- trunk/packages/confluence/trunk/debian/changelog (original)
+++ trunk/packages/confluence/trunk/debian/changelog Thu Sep  6 08:03:15 2007
@@ -3,8 +3,12 @@
   * Adopting the package for debian-ocaml-maint (closes: Bug#418965).
   * debian/control: added XS-Vcs-Svn and XS-Vcs-Browse fields.
   * Adapted debian/svn-deblayout to the pkg-ocaml directory layout
+  * Use dpatch to manage patches, put diff from 0.10.6-4 into 01config.dpatch
+  * debian/watch: point now to fundhl.org
+  * debian/rules:
+    - cleanup
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 04 Sep 2007 09:33:32 +0200
+ -- Ralf Treinen <treinen at debian.org>  Wed, 05 Sep 2007 17:39:43 +0200
 
 confluence (0.10.6-4) unstable; urgency=low
 

Modified: trunk/packages/confluence/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/rules?rev=4393&op=diff
==============================================================================
--- trunk/packages/confluence/trunk/debian/rules (original)
+++ trunk/packages/confluence/trunk/debian/rules Thu Sep  6 08:03:15 2007
@@ -1,10 +1,5 @@
 #!/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.
+# debian/rules for confluence
 
 #export DH_VERBOSE=1
 
@@ -18,25 +13,18 @@
 
 build-stamp: patch
 	dh_testdir
-
-	# Add here commands to compile the package.
 	if [ -x /usr/bin/ocamlopt ]; then \
 	$(MAKE) PREFIX=$(CURDIR)/debian/confluence/usr OCAMLC=ocamlc OCAMLOPT=ocamlopt; \
 	else \
 	$(MAKE) -C src PREFIX=$(CURDIR)/debian/confluence/usr OCAMLC=ocamlc fnf.byte cf.byte doc; \
 	fi
-	#docbook-to-man debian/confluence.sgml > confluence.1
-
 	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
-
 	dh_clean cf.1 fnf.1
 
 install: build
@@ -44,8 +32,6 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-
-	# Add here commands to install the package into debian/confluence.
 	if [ -x /usr/bin/ocamlopt ]; then \
 	$(MAKE) install PREFIX=$(CURDIR)/debian/confluence/usr OCAMLC=ocamlc OCAMLOPT=ocamlopt; \
 	else \
@@ -57,35 +43,19 @@
 	$(CURDIR)/debian/confluence/usr/bin/cf  | txt2man -s 1 -t cf  > cf.1
 	$(CURDIR)/debian/confluence/usr/bin/fnf | txt2man -s 1 -t fnf > fnf.1
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman cf.1 fnf.1
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol -- -Vocaml:Depends=$(OCAML_DEP)

Modified: trunk/packages/confluence/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/confluence/trunk/debian/watch?rev=4393&op=diff
==============================================================================
--- trunk/packages/confluence/trunk/debian/watch (original)
+++ trunk/packages/confluence/trunk/debian/watch Thu Sep  6 08:03:15 2007
@@ -1,2 +1,2 @@
 version=3
-http://confluent.org/download/confluence-(.*)\.tar\.gz
+http://www.funhdl.org/download/confluence-(.*)\.tar\.gz