[crystfel] 01/01: use cme fix to fix the control file
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Thu Aug 7 09:45:13 UTC 2014
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository crystfel.
commit eae396548e3c1bd817b5acd87a8b8d3d4bf14ac9
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Thu Aug 7 11:44:43 2014 +0200
use cme fix to fix the control file
---
debian/control | 43 ++++++++++++++++++++++-----------
debian/patches/fix-man-pages.patch | 2 +-
debian/patches/fix-readme.patch | 2 +-
debian/patches/pkgconfig.patch | 2 +-
debian/patches/skip-gpu-sim-check.patch | 2 +-
5 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/debian/control b/debian/control
index 501e8df..b769588 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,27 @@
Source: crystfel
-Section: science
-Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Valerio Mariani <valerio.mariani at gmail.com>
-Build-Depends: debhelper (>= 9), autotools-dev, fftw3-dev, libhdf5-dev, zlib1g-dev, libgsl0-dev, libgtk2.0-dev, gtk-doc-tools, libncurses5-dev, ocl-icd-opencl-dev
-Standards-Version: 3.9.5
-Homepage: http://www.desy.de/~twhite/crystfel/
+Section: science
+Priority: extra
+Build-Depends: debhelper (>= 9),
+ autotools-dev,
+ fftw3-dev,
+ gtk-doc-tools,
+ libgsl0-dev,
+ libgtk2.0-dev,
+ libhdf5-dev,
+ libncurses5-dev,
+ ocl-icd-opencl-dev,
+ zlib1g-dev
+Standards-Version: 3.9.3
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/crystfel.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/crystfel.git
+Homepage: http://www.desy.de/~twhite/crystfel/
Package: crystfel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: Suite of programs for processing "serial" diffraction data "snapshots"
CrystFEL is a suite of programs for processing diffraction data acquired
"serially" in a "snapshot" manner. That means: a large number of individual
@@ -29,9 +39,11 @@ Description: Suite of programs for processing "serial" diffraction data "snapsho
Package: libcrystfel4
Architecture: any
Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libcrystfel2, libcrystfel3
+Replaces: libcrystfel2,
+ libcrystfel3
Description: Suite of programs for processing "serial" diffraction data "snapshots"
CrystFEL is a suite of programs for processing diffraction data acquired
"serially" in a "snapshot" manner. That means: a large number of individual
@@ -48,12 +60,13 @@ Description: Suite of programs for processing "serial" diffraction data "snapsho
.
This package contains the shared libraries used by the crystfel standard and
extra programs
-
+
Package: libcrystfel-dev
Architecture: any
-Depends: libcrystfel4 (= ${binary:Version}), ${misc:Depends}
-Suggests: libcrystfel-doc
Section: libdevel
+Depends: ${misc:Depends},
+ libcrystfel4 (= ${binary:Version})
+Suggests: libcrystfel-doc
Description: Suite of programs for processing "serial" diffraction data "snapshots"
CrystFEL is a suite of programs for processing diffraction data acquired
"serially" in a "snapshot" manner. That means: a large number of individual
@@ -72,9 +85,9 @@ Description: Suite of programs for processing "serial" diffraction data "snapsho
is needed to build applications based on crystfel-opencl.
Package: crystfel-doc
+Architecture: all
Section: doc
Depends: ${misc:Depends}
-Architecture: all
Description: Suite of programs for processing "serial" diffraction data "snapshots"
CrystFEL is a suite of programs for processing diffraction data acquired
"serially" in a "snapshot" manner. That means: a large number of individual
@@ -92,10 +105,11 @@ Description: Suite of programs for processing "serial" diffraction data "snapsho
This package contains API documentation.
Package: libcrystfel-dbg
-Section: debug
Architecture: any
Multi-Arch: same
-Depends: libcrystfel4 (= ${binary:Version}), ${misc:Depends}
+Section: debug
+Depends: ${misc:Depends},
+ libcrystfel4 (= ${binary:Version})
Description: Suite of programs for processing "serial" diffraction data "snapshots"
CrystFEL is a suite of programs for processing diffraction data acquired
"serially" in a "snapshot" manner. That means: a large number of individual
@@ -112,3 +126,4 @@ Description: Suite of programs for processing "serial" diffraction data "snapsho
.
This package contains the debugging symbols for libcrystfel3-opencl and
crystfel-opencl.
+
diff --git a/debian/patches/fix-man-pages.patch b/debian/patches/fix-man-pages.patch
index 5d5cbd9..7c08eb6 100644
--- a/debian/patches/fix-man-pages.patch
+++ b/debian/patches/fix-man-pages.patch
@@ -1,4 +1,4 @@
-diff -rupN crystfel-0.5.3_orig/doc/man/crystfel_geometry.5 crystfel-0.5.3/doc/man/crystfel_geometry.5
+Description: Fix man pages.patch
--- crystfel-0.5.3_orig/doc/man/crystfel_geometry.5 2014-04-08 17:31:49.000000000 +0200
+++ crystfel-0.5.3/doc/man/crystfel_geometry.5 2014-04-22 09:58:20.945176355 +0200
@@ -8,7 +8,7 @@
diff --git a/debian/patches/fix-readme.patch b/debian/patches/fix-readme.patch
index a76b2b1..0f4803e 100644
--- a/debian/patches/fix-readme.patch
+++ b/debian/patches/fix-readme.patch
@@ -1,4 +1,4 @@
-diff -rupN crystfel-0.5.3_orig/README crystfel-0.5.3/README
+Description: Fix readme.patch
--- crystfel-0.5.3_orig/README 2014-04-09 16:07:02.000000000 +0200
+++ crystfel-0.5.3/README 2014-04-22 10:33:49.149166227 +0200
@@ -99,6 +99,18 @@ documentation created using GTK-Doc.
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index e3a05b7..dbf4880 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -1,4 +1,4 @@
-diff -rupN crystfel-0.5.3a_orig/libcrystfel/crystfel.pc.in crystfel-0.5.3a/libcrystfel/crystfel.pc.in
+Description: Pkgconfig.patch
--- crystfel-0.5.3a_orig/libcrystfel/crystfel.pc.in 2014-08-07 10:32:57.353599500 +0200
+++ crystfel-0.5.3a/libcrystfel/crystfel.pc.in 2014-08-07 10:35:08.589595391 +0200
@@ -6,5 +6,5 @@ includedir=@includedir@
diff --git a/debian/patches/skip-gpu-sim-check.patch b/debian/patches/skip-gpu-sim-check.patch
index 5159c3a..5f74ef9 100644
--- a/debian/patches/skip-gpu-sim-check.patch
+++ b/debian/patches/skip-gpu-sim-check.patch
@@ -1,4 +1,4 @@
-diff -rupN crystfel-0.5.3_orig/Makefile.in crystfel-0.5.3/Makefile.in
+Description: Skip gpu sim check.patch
--- crystfel-0.5.3_orig/Makefile.in 2014-04-09 16:17:51.000000000 +0200
+++ crystfel-0.5.3/Makefile.in 2014-04-15 14:42:24.024245651 +0200
@@ -76,8 +76,8 @@ TESTS = tests/list_check$(EXEEXT) $(MERG
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/crystfel.git
More information about the debian-science-commits
mailing list