[SCM] Packaging of gpp4 branch, master, updated. debian/1.3.1-0ubuntu2-5-gd07b45c

Fri Jul 20 20:52:22 UTC 2012

The following commit has been merged in the master branch:
commit d07b45ccc756ad7a529581f34a8d6bd0af7cf69b
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Jul 20 22:52:13 2012 +0200

    multi arch and other things

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 6c4353b..7b9c51e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,20 @@ Source: gpp4
 Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
+Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>,
+	   Morten Kjeldgaard <mok0 at ubuntu.com>
 Homepage: https://launchpad.net/gpp4
-Build-Depends: debhelper (>= 8), autotools-dev, quilt, pkg-config, 
- libmmdb-dev, gfortran, m4
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, libmmdb-dev, gfortran, m4
 Build-Depends-Indep: doxygen
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gpp4.git
 Vcs-Git: git://git.debian.org/git/debian-science/packages/gpp4.git
 
 Package: libgpp4-0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: runtime library for CCP4 compatible programs
  The goal of the ggp4 project is to provide a standalone replacement for
@@ -31,7 +33,7 @@ Package: libgpp4-dev
 Section: libdevel
 Architecture: any
 Suggests: libgpp4-doc
-Depends: libgpp4-0 (= ${binary:Version}), ${misc:Depends}
+Depends: ${misc:Depends}, libgpp4-0 (= ${binary:Version})
 Description: development environment for CCP4 compatible programs
  The goal of the ggp4 project is to provide a standalone replacement for
  the CCP4 library for macromolecular crystallography. The library performs
@@ -44,10 +46,12 @@ Description: development environment for CCP4 compatible programs
  This package provides header files and library for developing free
  CCP4 compatible programs.
 
-Package: libgpp4f-0
+Package: libgpp4f0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libgpp4-0 (= ${binary:Version}), libmmdb0, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, libgpp4-0 (= ${binary:Version})
 Description: shared library for CCP4 compatible programs
  The goal of the ggp4 project is to provide a standalone replacement for
  the CCP4 library for macromolecular crystallography. The library performs
@@ -64,7 +68,7 @@ Package: libgpp4f-dev
 Section: libdevel
 Architecture: any
 Suggests: libgpp4-doc
-Depends: libgpp4-0 (= ${binary:Version}), libgpp4f-0 (= ${binary:Version}), ${misc:Depends}
+Depends: ${misc:Depends}, libgpp4f0 (= ${binary:Version})
 Description: development environment for CCP4 compatible programs
  The goal of the ggp4 project is to provide a standalone replacement for
  the CCP4 library for macromolecular crystallography. The library performs
diff --git a/debian/libgpp4-0.install b/debian/libgpp4-0.install
index 74562a1..58a91c9 100644
--- a/debian/libgpp4-0.install
+++ b/debian/libgpp4-0.install
@@ -1,2 +1,2 @@
-usr/lib/libgpp4.so.*
+usr/lib/*/libgpp4.so.*
 usr/share/gpp4
diff --git a/debian/libgpp4-0.symbols b/debian/libgpp4-0.symbols
index f55b362..4792036 100644
--- a/debian/libgpp4-0.symbols
+++ b/debian/libgpp4-0.symbols
@@ -67,6 +67,7 @@ libgpp4.so.0 libgpp4-0 #MINVER#
  MtzPut at Base 1.0.4
  MtzRJustPath at Base 1.0.4
  MtzResLimits at Base 1.0.4
+ MtzRewdInput at Base 1.3.1
  MtzRrefl at Base 1.0.4
  MtzSetLookup at Base 1.0.4
  MtzSetPath at Base 1.0.4
diff --git a/debian/libgpp4-dev.install b/debian/libgpp4-dev.install
index 96e2330..5d7e0d8 100644
--- a/debian/libgpp4-dev.install
+++ b/debian/libgpp4-dev.install
@@ -1,4 +1,3 @@
 usr/include/gpp4
-usr/lib/libgpp4.a
-usr/lib/libgpp4.so
-usr/lib/pkgconfig/gpp4.pc
+usr/lib/*/libgpp4.so
+usr/lib/*/pkgconfig/gpp4.pc
diff --git a/debian/libgpp4-doc.doc-base b/debian/libgpp4-doc.doc-base
index 10a1750..24e00d2 100644
--- a/debian/libgpp4-doc.doc-base
+++ b/debian/libgpp4-doc.doc-base
@@ -2,7 +2,7 @@ Document: gpp4
 Title: gpp4 Programmers Manual
 Author: Various
 Abstract: This manual is generated from the source code of libgpp4.
-Section: Devel
+Section: Programming/C
 
 Format: HTML
 Index: /usr/share/doc/libgpp4-doc/html/index.html
diff --git a/debian/libgpp4f-0.install b/debian/libgpp4f-0.install
deleted file mode 100644
index fb5a17f..0000000
--- a/debian/libgpp4f-0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libgpp4f.so.*
-
diff --git a/debian/libgpp4f-dev.install b/debian/libgpp4f-dev.install
index a3d69b9..688734c 100644
--- a/debian/libgpp4f-dev.install
+++ b/debian/libgpp4f-dev.install
@@ -1,3 +1,2 @@
-usr/lib/libgpp4f.a
-usr/lib/libgpp4f.so
-usr/lib/pkgconfig/gpp4f.pc
+usr/lib/*/libgpp4f.so
+usr/lib/*/pkgconfig/gpp4f.pc
diff --git a/debian/libgpp4f0.install b/debian/libgpp4f0.install
new file mode 100644
index 0000000..dc0117c
--- /dev/null
+++ b/debian/libgpp4f0.install
@@ -0,0 +1,2 @@
+usr/lib/*/libgpp4f.so.*
+
diff --git a/debian/rules b/debian/rules
index e055459..db7fced 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,6 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; mode: font-lock -*-
 
-include /usr/share/quilt/quilt.make
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 # Export DH_OPTIONS to save options for binary-common
 export DH_OPTIONS
 
@@ -17,88 +12,12 @@ else
 	CFLAGS += -O2 -D_REENTRANT
 endif
 
-config.status: patch configure
-	dh_testdir
-	./configure --prefix=/usr
-
-build: build-arch
-
-build-arch: build-arch-stamp
-build-arch-stamp: config.status
-	dh_testdir
-
-	# Build the libary
-	$(MAKE) CFLAGS="$(CFLAGS)"
-	touch $@
+%:
+	dh $@
 
-# The build-indep target is called from install-indep only
-# This is to avoid generating the doxygen docs in a -B build
-build-indep: build-indep-stamp
-build-indep-stamp:
-	dh_testdir
+override_dh_auto_build-indep:
+	doxygen
 
-	# create the doxygen documentation
-	doxygen	
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp
-
-	# Clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	# remove the doxygen-generated tree
+override_dh_clean:
 	rm -rf doc/
-
 	dh_clean
-
-install: install-indep install-arch
-
-install-indep: build-indep
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	# Install the compiled library in debian/tmp tree
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	dh_install -a --sourcedir=debian/tmp
-
-# Build architecture-independent packages
-binary-indep: build-indep install-indep
-	dh_testdir
-	dh_testroot
-	# Now call make recursively to execute the common bits 
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture-dependent package
-binary-arch: build-arch install-arch
-	dh_testdir
-	dh_testroot
-	dh_strip
-	dh_makeshlibs
-	dh_shlibdeps
-	# Now call make recursively to execute the common bits 
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# These are the debhelpers common to both indep and arch-dependent
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch build-indep build-indep-stamp build-arch build-arch-stamp
-
-####
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Packaging of gpp4

