[Pkg-ocaml-maint-commits] r2727 - /trunk/packages/lablgtk/trunk/debian/

[smimram at users.alioth.debian.org]

Author: smimram
Date: Thu May 18 16:20:51 2006
New Revision: 2727

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2727
Log:
Various minor fixes before upload.

Removed:
    trunk/packages/lablgtk/trunk/debian/control.in
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.dirs
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml-dev.files
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.dirs
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-gnome-ocaml.files
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.dirs
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.dirs
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml.install
Modified:
    trunk/packages/lablgtk/trunk/debian/changelog
    trunk/packages/lablgtk/trunk/debian/control
    trunk/packages/lablgtk/trunk/debian/rules

Modified: trunk/packages/lablgtk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/changelog?rev=2727&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/changelog (original)
+++ trunk/packages/lablgtk/trunk/debian/changelog Thu May 18 16:20:51 2006
@@ -1,12 +1,13 @@
-lablgtk2 (2.6.0-5) UNRELEASED; urgency=low
+lablgtk2 (2.6.0-5) unstable; urgency=low
 
   * Rebuilt against ocaml 3.09.2 (bumped deps accordingly).
   * debian/control
-    - bumped Standards-Version to 3.7.2 (no changes needed)
+    - bumped Standards-Version to 3.7.2 (no changes needed).
   * debian/*
-    - ported .in handling to the more "standard" why, avoiding the risk of
-      (re-)generating debian/control during the build
-    - removed -gl stuff, we don't have a package for that
+    - ported .in handling to the more "standard" way, avoiding the risk of
+      (re-)generating debian/control during the build.
+    - removed -gl stuff in order to avoid the NEW queue for now, we will split
+      the opengl specific parts later.
 
  -- Stefano Zacchiroli <zack at debian.org>  Wed, 17 May 2006 00:32:44 +0000
 

Modified: trunk/packages/lablgtk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/control?rev=2727&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/control (original)
+++ trunk/packages/lablgtk/trunk/debian/control Thu May 18 16:20:51 2006
@@ -25,7 +25,7 @@
  lablgtk2 contains bindings for gtk+ 2.x and Objective Caml.
  .
  This package include only the dynamic libraries needed for running dynamic
- bytecode executables using gnome functionalities (panel-appel, gnomeui,
+ bytecode executables using gnome functionalities (panel-applet, gnomeui,
  gnome-canvas, rsvg).
 
 Package: liblablgtk2-ocaml-dev

Modified: trunk/packages/lablgtk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/rules?rev=2727&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/rules (original)
+++ trunk/packages/lablgtk/trunk/debian/rules Thu May 18 16:20:51 2006
@@ -5,16 +5,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-OCAMLABI = $(shell ocamlc -version)
-OFILES = $(patsubst %.in,%,$(shell ls debian/*.in))
-export OCAML_LIBDIR=`ocamlc -where`
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+OCAML_LIBDIR := $(shell ocamlc -where)
 
 DESTDIR = $(CURDIR)/debian/tmp
 
 # We want to use dpatch.
 include /usr/share/dpatch/dpatch.make
 PACKAGE = lablgtk
-
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -27,8 +26,7 @@
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 
 configure: configure-stamp
-configure-stamp:
-
+configure-stamp: ocamlinit
 	dh_testdir
 
 	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
@@ -70,11 +68,12 @@
 	cd $(DESTDIR)/$(OCAML_LIBDIR)/stublibs/; for f in *.so; do chrpath -d $$f; done
 
 	# Install METAs
-	cp debian/META $(CURDIR)/debian/liblablgtk2-ocaml-dev$(OCAML_LIBDIR)/lablgtk2
-	cp debian/META.lablgtk2-gnome $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev$(OCAML_LIBDIR)/METAS
+	cp debian/META $(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_LIBDIR)/lablgtk2
+	cp debian/META.lablgtk2-gl $(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_LIBDIR)/lablgtk2
+	cp debian/META.lablgtk2-gnome $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev/$(OCAML_LIBDIR)/METAS
 
 	# This file is needed by lablgtk2-doc
-	cp src/gnomeDruid.cmi $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev$(OCAML_LIBDIR)/lablgtk2
+	cp src/gnomeDruid.cmi $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev/$(OCAML_LIBDIR)/lablgtk2
 
 	# Examples
 	cp -r examples/rsvg examples/panel examples/canvas $(CURDIR)/debian/liblablgtk2-gnome-ocaml-dev/usr/share/doc/liblablgtk2-gnome-ocaml-dev/examples/
@@ -93,13 +92,12 @@
 
 #	dh_installdebconf -s
 	dh_installdocs -s
-	dh_installexamples -s --exclude='.cvsignore' --exclude='rsvg' --exclude='panel' --exclude='canvas' --exclude='GL'
+	dh_installexamples -s --exclude='.cvsignore' --exclude='rsvg' --exclude='panel' --exclude='canvas'
 	dh_installmenu -s
 	dh_movefiles -s
 	dh_install -s --sourcedir=$(DESTDIR) --list-missing
 	dh_installman -s
 	dh_installinfo -s
-#	dh_undocumented -s
 	dh_installchangelogs CHANGES -s
 	dh_link -s
 	dh_strip -s