[Pkg-ocaml-maint-commits] r1956 - trunk/packages/mlpcap/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-11-09 15:29:34 +0000 (Wed, 09 Nov 2005)
New Revision: 1956

Removed:
   trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml-dev.dirs
   trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml.dirs
Modified:
   trunk/packages/mlpcap/trunk/debian/changelog
   trunk/packages/mlpcap/trunk/debian/control
   trunk/packages/mlpcap/trunk/debian/copyright
   trunk/packages/mlpcap/trunk/debian/rules
Log:
Prepare transition to 3.09: remove libdir reference -- SLG


Modified: trunk/packages/mlpcap/trunk/debian/changelog
===================================================================
--- trunk/packages/mlpcap/trunk/debian/changelog	2005-11-09 15:20:40 UTC (rev 1955)
+++ trunk/packages/mlpcap/trunk/debian/changelog	2005-11-09 15:29:34 UTC (rev 1956)
@@ -1,3 +1,11 @@
+mlpcap (0.9-6) unstable; urgency=low
+
+  * Remove direct reference to ocaml library dir
+  * Upgrade standards version to 3.6.2.0 (no change)
+  * Change FSF address in copyright
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 16:22:15 +0100
+
 mlpcap (0.9-5) unstable; urgency=low
 
   * Transition to svn-buildpackage

Modified: trunk/packages/mlpcap/trunk/debian/control
===================================================================
--- trunk/packages/mlpcap/trunk/debian/control	2005-11-09 15:20:40 UTC (rev 1955)
+++ trunk/packages/mlpcap/trunk/debian/control	2005-11-09 15:29:34 UTC (rev 1956)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
 Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, dpatch (>= 1.11), camlidl, libffcall1-dev, ocaml-findlib, libpcap0.8-dev
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.2.0
 
 Package: libmlpcap-ocaml
 Architecture: any

Modified: trunk/packages/mlpcap/trunk/debian/copyright
===================================================================
--- trunk/packages/mlpcap/trunk/debian/copyright	2005-11-09 15:20:40 UTC (rev 1955)
+++ trunk/packages/mlpcap/trunk/debian/copyright	2005-11-09 15:29:34 UTC (rev 1956)
@@ -17,9 +17,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   along with this package; if not, write to the Free Software 
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU Lesser General
 Public License can be found in `/usr/share/common-licenses/LGPL'

Deleted: trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml-dev.dirs
===================================================================
--- trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml-dev.dirs	2005-11-09 15:20:40 UTC (rev 1955)
+++ trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml-dev.dirs	2005-11-09 15:29:34 UTC (rev 1956)
@@ -1 +0,0 @@
-/usr/lib/ocaml/3.08.3

Deleted: trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml.dirs
===================================================================
--- trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml.dirs	2005-11-09 15:20:40 UTC (rev 1955)
+++ trunk/packages/mlpcap/trunk/debian/libmlpcap-ocaml.dirs	2005-11-09 15:29:34 UTC (rev 1956)
@@ -1 +0,0 @@
-/usr/lib/ocaml/3.08.3/stublibs

Modified: trunk/packages/mlpcap/trunk/debian/rules
===================================================================
--- trunk/packages/mlpcap/trunk/debian/rules	2005-11-09 15:20:40 UTC (rev 1955)
+++ trunk/packages/mlpcap/trunk/debian/rules	2005-11-09 15:29:34 UTC (rev 1956)
@@ -3,26 +3,23 @@
 # We want to use dpatch.
 include /usr/share/dpatch/dpatch.make
 PACKAGE = mlpcap
+OCAMLIBDIR=`ocamlc -where`
+DESTDIR_DEV=$(CURDIR)/debian/libmlpcap-ocaml-dev/
+DESTDIR=$(CURDIR)/debian/libmlpcap-ocaml/
 
-export OCAML_LIBDIR=`ocamlc -where`
-
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
-
-	CFLAGS=-fPIC ./configure --enable-examples --with-camlidl-lib=$(OCAML_LIBDIR)
-	
+	CFLAGS=-fPIC ./configure --enable-examples --with-camlidl-lib=$(OCAMLIBDIR)
 	touch configure-stamp
 
 build: configure-stamp build-stamp
 build-stamp: 	
 	dh_testdir
-
 	$(MAKE) 
 	if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
 		$(MAKE) opt;\
 	fi
-		
 	touch build-stamp
 
 clean: unpatch
@@ -41,11 +38,12 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
+	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
+	mkdir -p $(DESTDIR)/$(OCAMLIBDIR)/stublibs
 	$(MAKE) install \
-	  DESTDIR="-ldconf ignore -destdir $(CURDIR)/debian/libmlpcap-ocaml-dev/$(OCAML_LIBDIR)/"
-	mv $(CURDIR)/debian/libmlpcap-ocaml-dev/$(OCAML_LIBDIR)/pcap/*.so \
-	  $(CURDIR)/debian/libmlpcap-ocaml/$(OCAML_LIBDIR)/stublibs/
+	  DESTDIR="-ldconf ignore -destdir $(DESTDIR_DEV)/$(OCAMLIBDIR)/"
+	mv $(DESTDIR_DEV)/$(OCAMLIBDIR)/pcap/*.so \
+	  $(DESTDIR)/$(OCAMLIBDIR)/stublibs/
 
 binary-indep: build install