[Pkg-ocaml-maint-commits] r2318 - trunk/packages/cryptokit/trunk/debian

Tue Dec 20 22:09:45 UTC 2005

Author: gildor
Date: 2005-12-20 22:09:44 +0000 (Tue, 20 Dec 2005)
New Revision: 2318

Modified:
   trunk/packages/cryptokit/trunk/debian/META.in
   trunk/packages/cryptokit/trunk/debian/changelog
   trunk/packages/cryptokit/trunk/debian/control
   trunk/packages/cryptokit/trunk/debian/control.in
   trunk/packages/cryptokit/trunk/debian/copyright
   trunk/packages/cryptokit/trunk/debian/rules
Log:
Fix lintian warning, use chrpath, prepare release -- SLG


Modified: trunk/packages/cryptokit/trunk/debian/META.in
===================================================================

--- trunk/packages/cryptokit/trunk/debian/META.in	2005-12-19 23:55:29 UTC (rev 2317)
+++ trunk/packages/cryptokit/trunk/debian/META.in	2005-12-20 22:09:44 UTC (rev 2318)
@@ -1,7 +1,7 @@
 name="cryptokit"
 version="@VERSION@"
-description="cryptographic primitives (symmetric and public-key ciphers)"
-requires="unix"
+description="Cryptographic primitives"
+requires="num unix"
 archive(byte)="cryptokit.cma"
 archive(native)="cryptokit.cmxa"
-linkopts = ""
+directory="+cryptokit"

Modified: trunk/packages/cryptokit/trunk/debian/changelog
===================================================================
--- trunk/packages/cryptokit/trunk/debian/changelog	2005-12-19 23:55:29 UTC (rev 2317)
+++ trunk/packages/cryptokit/trunk/debian/changelog	2005-12-20 22:09:44 UTC (rev 2318)
@@ -5,6 +5,8 @@
   * Stop using numerix, remove dependencies and patches related to numerix
   * Use svn-buildpackage
   * Get rid of hardcoded OCaml ABI
+  * Rewrite the META to META.in and place it in METAS/, add "num" to the list
+    of requires (and remove "numerix").
 
  -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Tue, 20 Dec 2005 00:45:55 +0100
 

Modified: trunk/packages/cryptokit/trunk/debian/control
===================================================================
--- trunk/packages/cryptokit/trunk/debian/control	2005-12-19 23:55:29 UTC (rev 2317)
+++ trunk/packages/cryptokit/trunk/debian/control	2005-12-20 22:09:44 UTC (rev 2318)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>, Michael K. Edwards <medwards-debian at sane.net>, Mike Furr <mfurr at debian.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: ocaml-nox (>= 3.09.0), zlib1g-dev, debhelper (>> 4.0.0), dpatch
+Build-Depends: ocaml-nox (>= 3.09.0), zlib1g-dev, debhelper (>> 4.0.0), dpatch, chrpath
 Standards-Version: 3.6.2.0
 
 Package: libcryptokit-ocaml

Modified: trunk/packages/cryptokit/trunk/debian/control.in
===================================================================
--- trunk/packages/cryptokit/trunk/debian/control.in	2005-12-19 23:55:29 UTC (rev 2317)
+++ trunk/packages/cryptokit/trunk/debian/control.in	2005-12-20 22:09:44 UTC (rev 2318)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>, Michael K. Edwards <medwards-debian at sane.net>, Mike Furr <mfurr at debian.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: ocaml-nox (>= #OCamlABI#), zlib1g-dev, debhelper (>> 4.0.0), dpatch
+Build-Depends: ocaml-nox (>= #OCamlABI#), zlib1g-dev, debhelper (>> 4.0.0), dpatch, chrpath
 Standards-Version: 3.6.2.0
 
 Package: libcryptokit-ocaml

Modified: trunk/packages/cryptokit/trunk/debian/copyright
===================================================================
--- trunk/packages/cryptokit/trunk/debian/copyright	2005-12-19 23:55:29 UTC (rev 2317)
+++ trunk/packages/cryptokit/trunk/debian/copyright	2005-12-20 22:09:44 UTC (rev 2318)
@@ -23,10 +23,9 @@
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
-You may have received a copy of the GNU Library General Public License
-along with Cryptokit; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+You may have received a copy of the GNU Library General Public License along
+with Cryptokit; see the file COPYING.  If not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 As a special exception to the GNU Library General Public License, you
 may link, statically or dynamically, a "work that uses the Library"

Modified: trunk/packages/cryptokit/trunk/debian/rules
===================================================================
--- trunk/packages/cryptokit/trunk/debian/rules	2005-12-19 23:55:29 UTC (rev 2317)
+++ trunk/packages/cryptokit/trunk/debian/rules	2005-12-20 22:09:44 UTC (rev 2318)
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
 OCAMLIBDIR := $(shell ocamlc -where)
 OCAMLABI=$(shell ocamlc -version)
 PKGNAME = libcryptokit-ocaml
@@ -48,11 +47,15 @@
 install: build-stamp debian/META
 	dh_testdir
 	dh_testroot
-	$(MAKE) install DESTDIR=$(PKGDIR)-dev
+	dh_installdirs
 	mkdir -p $(PKGDIR)-dev$(OCAMLIBDIR)/cryptokit
-	cp -p debian/META $(PKGDIR)-dev$(OCAMLIBDIR)/cryptokit/META
-	mkdir $(PKGDIR)/$(OCAMLIBDIR)/
-	mv $(PKGDIR)-dev/$(OCAMLIBDIR)/stublibs $(PKGDIR)/$(OCAMLIBDIR)
+	mkdir -p $(PKGDIR)-dev$(OCAMLIBDIR)/METAS
+	$(MAKE) install INSTALLDIR=$(PKGDIR)-dev/$(OCAMLIBDIR)/cryptokit
+	cp -p debian/META $(PKGDIR)-dev$(OCAMLIBDIR)/METAS/META.cryptokit
+	mkdir -p $(PKGDIR)/$(OCAMLIBDIR)/stublibs/
+	mv $(PKGDIR)-dev/$(OCAMLIBDIR)/cryptokit/stublibs \
+	 $(PKGDIR)/$(OCAMLIBDIR)/stublibs/dllcryptokit.so
+	chrpath -d $(PKGDIR)/$(OCAMLIBDIR)/stublibs/dllcryptokit.so
 
 binary-indep: install
 


