[SCM] LHAPDF: Les Houches Accord PDF Interface branch, master, updated. upstream/5.8.7+repack-22-g1881c7b

Lifeng Sun lifongsun at gmail.com
Sat Jul 14 01:20:02 UTC 2012


The following commit has been merged in the master branch:
commit 427d120b00cdd94bab6a3eb5a2b9aff1e9753668
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Fri Jul 13 22:19:48 2012 +0800

    Move lhapdf-getdata script from lhapdf-pdfsets-minimal to python-lhapdf.

diff --git a/debian/changelog b/debian/changelog
index 35dbdf0..12123d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ lhapdf (5.8.8-1) unstable; urgency=low
 
   * New upstream release.
   * debian/rules: change to tiny-style.
+  * Move lhapdf-getdata script from lhapdf-pdfsets-minimal to
+    python-lhapdf.
 
  -- Lifeng Sun <lifongsun at gmail.com>  Fri, 13 Jul 2012 21:58:38 +0800
 
diff --git a/debian/control b/debian/control
index b4a2e48..89072fd 100644
--- a/debian/control
+++ b/debian/control
@@ -47,8 +47,8 @@ Description: [Physics] Les Houches Accord PDF Interface - development files
 Package: python-lhapdf
 Section: python
 Architecture: any
-Depends: liblhapdf0 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Recommends: lhapdf-pdfsets-minimal
+Depends: lhapdf-pdfsets-minimal (= ${source:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Breaks: lhapdf-pdfsets-minimal (<< 5.8.8)
 Description: Python Bindings for LHAPDF
  LHAPDF provides a unified and easy to use interface to modern PDF sets. It is
  designed to work not only with individual PDF sets but also with the more
@@ -80,7 +80,8 @@ Description: Octave Bindings for LHAPDF
 
 Package: lhapdf-pdfsets-minimal
 Architecture: all
-Depends: python-lhapdf, ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
+Recommends: python-lhapdf
 Description: Minimal PDF Sets of LHAPDF
  LHAPDF provides a unified and easy to use interface to modern PDF sets. It is
  designed to work not only with individual PDF sets but also with the more
@@ -91,7 +92,10 @@ Description: Minimal PDF Sets of LHAPDF
  possibilities.
  .
  This package provides a minimal PDF sets required by the test suites of
- LHAPDF.
+ LHAPDF and ThePEG.
+ .
+ Note: the python-lhapdf package provides lhapdf-getdata script to download
+ other PDF sets.
 
 Package: lhapdf-ccwrap-doc
 Section: doc
diff --git a/debian/lhapdf-pdfsets-minimal.install b/debian/lhapdf-pdfsets-minimal.install
index f56fff6..a12b5a5 100644
--- a/debian/lhapdf-pdfsets-minimal.install
+++ b/debian/lhapdf-pdfsets-minimal.install
@@ -1,3 +1,2 @@
-usr/bin/lhapdf-getdata
 PDFsets.index usr/share/lhapdf
 PDFsets/*     usr/share/lhapdf/PDFsets
diff --git a/debian/lhapdf-pdfsets-minimal.manpages b/debian/lhapdf-pdfsets-minimal.manpages
deleted file mode 100644
index 86575d2..0000000
--- a/debian/lhapdf-pdfsets-minimal.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/lhapdf-getdata.1
diff --git a/debian/python-lhapdf.install b/debian/python-lhapdf.install
index 0ba466f..d0f2b5a 100644
--- a/debian/python-lhapdf.install
+++ b/debian/python-lhapdf.install
@@ -1,2 +1,3 @@
+usr/bin/lhapdf-getdata
 usr/bin/lhapdf-query
 usr/lib/python*
diff --git a/debian/python-lhapdf.manpages b/debian/python-lhapdf.manpages
index f29fb90..4371b75 100644
--- a/debian/python-lhapdf.manpages
+++ b/debian/python-lhapdf.manpages
@@ -1 +1,2 @@
+debian/lhapdf-getdata.1
 debian/lhapdf-query.1

-- 
LHAPDF: Les Houches Accord PDF Interface



More information about the debian-science-commits mailing list