[SCM] Extract bibliographic references from various sources branch, debian, updated. debian/1.4.3-2

Filippo Rusconi (Debian Maintainer) rusconi-debian at laposte.net
Wed Oct 13 16:04:56 UTC 2010


The following commit has been merged in the debian branch:
commit eb7100b3153c388abb5a963fd298d1c5b42d248e
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date:   Tue Oct 12 23:25:17 2010 +0200

    Implement build system based on use of CMake as per upstream setup.

diff --git a/debian/changelog b/debian/changelog
index 764d3ad..4200b41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cb2bib (1.4.3-2) unstable; urgency=low
+
+  * Implemented build system based on use of CMake as per upstream setup.
+
+ -- Filippo Rusconi <rusconi-debian at laposte.net>  Tue, 12 Oct 2010 23:23:51 +0200
+
 cb2bib (1.4.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index fa8ef65..cd40801 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Filippo Rusconi <rusconi-debian at laposte.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), libx11-dev, x11proto-core-dev, libqt4-dev (>=4.4), imagemagick
+Build-Depends: debhelper (>= 7), libx11-dev, x11proto-core-dev, libqt4-dev (>=4.4), cmake (>=2.6.0), imagemagick
 Standards-Version: 3.8.3
 Homepage: http://www.molspaces.com/cb2bib/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/cb2bib.git
diff --git a/debian/rules b/debian/rules
index bc6f28c..e3c4819 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
+CMAKE=/usr/bin/cmake
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -40,8 +42,14 @@ configure-stamp:
 	dh_testdir
 
 	mkdir -p $(BUILDDIR)
-	cp -rpf cb2bib.pro cb2bib.rc configure src $(BUILDDIR)
-	cd $(BUILDDIR) && ./configure --qmakepath /usr/bin/qmake-qt4	\
+
+	cd $(BUILDDIR)  && $(CMAKE) -DC2B_USE_LZO=0 \
+	-D CMAKE_INSTALL_PREFIX=/usr ../
+
+	$(MAKE) -C $(BUILDDIR)
+
+#	cp -rpf cb2bib.pro cb2bib.rc configure src $(BUILDDIR)
+#	cd $(BUILDDIR) && ./configure --qmakepath /usr/bin/qmake-qt4	\
 	--prefix /usr --bindir /usr/bin --datadir /usr/share		\
 	--desktopdatadir /usr/share/applications --icondir		\
 	/usr/share/pixmaps --disable-lzo

-- 
Extract bibliographic references from various sources



More information about the debian-science-commits mailing list