[Pkg-ocaml-maint-commits] r6157 - in /trunk/packages/bibtex2html/trunk/debian: bibtex2html.dirs bibtex2html.docs bibtex2html.manpages changelog control dirs rules rules.cdbs rules.old

treinen at users.alioth.debian.org treinen at users.alioth.debian.org
Wed Feb 11 21:01:37 UTC 2009 

Author: treinen
Date: Wed Feb 11 21:01:37 2009
New Revision: 6157

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6157
Log:
closer to building the package wih cdbs

Added:
    trunk/packages/bibtex2html/trunk/debian/bibtex2html.dirs   (props changed)
      - copied unchanged from r6156, trunk/packages/bibtex2html/trunk/debian/dirs
    trunk/packages/bibtex2html/trunk/debian/bibtex2html.docs
    trunk/packages/bibtex2html/trunk/debian/bibtex2html.manpages
    trunk/packages/bibtex2html/trunk/debian/rules.old   (with props)
Removed:
    trunk/packages/bibtex2html/trunk/debian/dirs
Modified:
    trunk/packages/bibtex2html/trunk/debian/changelog
    trunk/packages/bibtex2html/trunk/debian/control
    trunk/packages/bibtex2html/trunk/debian/rules
    trunk/packages/bibtex2html/trunk/debian/rules.cdbs

Propchange: trunk/packages/bibtex2html/trunk/debian/bibtex2html.dirs
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: trunk/packages/bibtex2html/trunk/debian/bibtex2html.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/bibtex2html.docs?rev=6157&op=file
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/bibtex2html.docs (added)
+++ trunk/packages/bibtex2html/trunk/debian/bibtex2html.docs Wed Feb 11 21:01:37 2009
@@ -1,0 +1,1 @@
+manual.html

Added: trunk/packages/bibtex2html/trunk/debian/bibtex2html.manpages
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/bibtex2html.manpages?rev=6157&op=file
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/bibtex2html.manpages (added)
+++ trunk/packages/bibtex2html/trunk/debian/bibtex2html.manpages Wed Feb 11 21:01:37 2009
@@ -1,0 +1,3 @@
+debian/bib2bib.1
+debian/bibtex2html.1
+debian/aux2bib.1

Modified: trunk/packages/bibtex2html/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/changelog?rev=6157&op=diff
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/changelog (original)
+++ trunk/packages/bibtex2html/trunk/debian/changelog Wed Feb 11 21:01:37 2009
@@ -1,3 +1,9 @@
+bibtex2html (1.93-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+ -- Ralf Treinen <treinen at debian.org>  Sun, 14 Dec 2008 17:59:04 +0100
+
 bibtex2html (1.93-1) unstable; urgency=low
 
   * New upstream version. This release allows to to sort entries by date

Modified: trunk/packages/bibtex2html/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/control?rev=6157&op=diff
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/control (original)
+++ trunk/packages/bibtex2html/trunk/debian/control Wed Feb 11 21:01:37 2009
@@ -5,14 +5,14 @@
 Uploaders: Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>, Julien Cristau <jcristau at debian.org>
 Standards-Version: 3.8.0
 Build-Depends-Indep: ocaml-nox (>= 3.07), hevea
-Build-Depends: debhelper (>= 4.0), dpatch
+Build-Depends: debhelper (>= 4.0), dpatch, cdbs
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/
 Homepage: http://www.lri.fr/~filliatr/bibtex2html/index.en.html
 
 Package: bibtex2html
 Architecture: all
-Depends: ocaml-base-nox-${F:OCamlABI}, perl, texlive-base
+Depends: ocaml-base-nox-${F:OCamlABI}, perl, texlive-base, ${misc:Depends}
 Suggests: hlins
 Description: filters BibTeX files and translates them to HTML
  Collection of tools for filtering BibTeX data bases and for producing

Modified: trunk/packages/bibtex2html/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/rules?rev=6157&op=diff
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/rules (original)
+++ trunk/packages/bibtex2html/trunk/debian/rules Wed Feb 11 21:01:37 2009
@@ -1,59 +1,15 @@
 #!/usr/bin/make -f
-# debian/rules for bibtex2html
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-# export DH_VERBOSE=1
+# we have decided to build this package as bytecode
+DEB_MAKE_BUILD_TARGET = byte manual.html
+DEB_MAKE_INSTALL_TARGET = install-byte
 
-DESTDIR  := `pwd`/debian/bibtex2html
-OCAMLABI := $(shell ocamlc -version)
-
-build: Makefile bibtex2html
-
-Makefile: patch
-	dh_testdir
-	./configure\
-		--bindir=$(DESTDIR)/usr/bin\
-		--prefix=$(DESTDIR)/usr/share
-	touch configure-stamp
-
-bibtex2html:
-	dh_testdir
-	$(MAKE) byte manual.html
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	if [ -e Makefile ]; then $(MAKE) dist-clean; fi
-	-rm config.status config.cache config.log
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install-byte
-	cp manual.html $(DESTDIR)/usr/share/doc/bibtex2html
-	# our own man pages are much more useful
-	-rm $(DESTDIR)/usr/share/man/man1/bib2bib.1
-	-rm $(DESTDIR)/usr/share/man/man1/bibtex2html.1
-
-binary-arch: build install
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs CHANGES
-	dh_installman debian/bib2bib.1 debian/bibtex2html.1 debian/aux2bib.1
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums 
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+# upstream makefile does not respect DESTDIR
+DESTDIR  := $(CURDIR)/debian/bibtex2html
+DEB_CONFIGURE_EXTRA_FLAGS = \
+	 --bindir=$(DESTDIR)/usr/bin --prefix=$(DESTDIR)/usr/share

Modified: trunk/packages/bibtex2html/trunk/debian/rules.cdbs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/rules.cdbs?rev=6157&op=diff
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/rules.cdbs (original)
+++ trunk/packages/bibtex2html/trunk/debian/rules.cdbs Wed Feb 11 21:01:37 2009
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/ocaml.mk
 
 # we have decided to build this package as bytecode
@@ -9,7 +10,6 @@
 DEB_MAKE_INSTALL_TARGET = install-byte
 
 # upstream makefile does not respect DESTDIR
-DESTDIR  := `pwd`/debian/bibtex2html
+DESTDIR  := $(CURDIR)/debian/bibtex2html
 DEB_CONFIGURE_EXTRA_FLAGS = \
 	 --bindir=$(DESTDIR)/usr/bin --prefix=$(DESTDIR)/usr/share
-

Added: trunk/packages/bibtex2html/trunk/debian/rules.old
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/bibtex2html/trunk/debian/rules.old?rev=6157&op=file
==============================================================================
--- trunk/packages/bibtex2html/trunk/debian/rules.old (added)
+++ trunk/packages/bibtex2html/trunk/debian/rules.old Wed Feb 11 21:01:37 2009
@@ -1,0 +1,59 @@
+#!/usr/bin/make -f
+# debian/rules for bibtex2html
+
+include /usr/share/dpatch/dpatch.make
+
+# export DH_VERBOSE=1
+
+DESTDIR  := `pwd`/debian/bibtex2html
+OCAMLABI := $(shell ocamlc -version)
+
+build: Makefile bibtex2html
+
+Makefile: patch
+	dh_testdir
+	./configure\
+		--bindir=$(DESTDIR)/usr/bin\
+		--prefix=$(DESTDIR)/usr/share
+	touch configure-stamp
+
+bibtex2html:
+	dh_testdir
+	$(MAKE) byte manual.html
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	if [ -e Makefile ]; then $(MAKE) dist-clean; fi
+	-rm config.status config.cache config.log
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) install-byte
+	cp manual.html $(DESTDIR)/usr/share/doc/bibtex2html
+	# our own man pages are much more useful
+	-rm $(DESTDIR)/usr/share/man/man1/bib2bib.1
+	-rm $(DESTDIR)/usr/share/man/man1/bibtex2html.1
+
+binary-arch: build install
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installchangelogs CHANGES
+	dh_installman debian/bib2bib.1 debian/bibtex2html.1 debian/aux2bib.1
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_md5sums 
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch

Propchange: trunk/packages/bibtex2html/trunk/debian/rules.old
------------------------------------------------------------------------------
    svn:executable = *

More information about the Pkg-ocaml-maint-commits mailing list