xRayUtilities Package
Hello,
I'm trying to package xrayutilities new version (1.5.1) as the one in Debian is the 1.2.0.
I cleaned the conflicts and edited d/changelog.
Now when I run "dgit sbuild" I get this error message :
________________________________________________________________________________________________________________
dgit: error: --quilt=gbp specified, implying patches-unapplied git tree
dgit: but git tree differs from orig in upstream files.
dgit: For full diff showing the problem(s), type:
dgit: git diff 6d8103f84ac364be0fb53f7ceb8748b0d5ee63da HEAD -- :/ ':!debian' ':!/.gitignore' ':!*/.gitignore'
________________________________________________________________________________________________________________
And when I run the git diff command, I get a message that I don't understand :
________________________________________________________________________________________________________________
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c905fa..693a199 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -154,14 +154,14 @@ v1.2.1, 2016-01-08
v1.2.0, 2015-08-03
* Radicon file support was removed (no test scripts available!)
-* replace pytables by faster and more convenient h5py
-* bug fixes/improvements in the file parsers (discovered by the unit tests!)
-* new unittests for file parsers (spec, edf, xrdml, esg, nja, fio, cbf, tif)
-* added different oxidation states of the chemical elements to the database
-* huge speed improvements for the database access, especially when querying
- multiple values at the same time
-* add PseudoVoigtAsym option in xu.math.peakfit
-* memory usage optimization in FastScanCCD
+* replace pytables by faster and more convenient h5py bug
+* fixes/improvements in the file parsers (discovered by the unit
+* tests!) new unittests for file parsers (spec, edf, xrdml, esg, nja,
+* fio, cbf, tif) added different oxidation states of the chemical
+* elements to the database huge speed improvements for the database
+* access, especially when querying multiple values at the same time
+* add PseudoVoigtAsym option in xu.math.peakfit memory usage
+* optimization in FastScanCCD
v1.1.2, 2015-04-22
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..8e3faac
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,196 @@
+Metadata-Version: 1.1
+Name: xrayutilities
+Version: 1.5.1
+Summary: package for x-ray diffraction data evaluation
+Home-page: http://xrayutilities.sourceforge.net
+Author: Dominik Kriegner
+Author-email: dominik.kriegner@gmail.com
+License: GPLv2
+Description:
+ =============
+ xrayutilities
+ =============
+
+ xrayutilities is a collection of scripts used to analyze x-ray diffraction
+ data. It consists of a Python package and several routines coded in C. It is
+ especially useful for the reciprocal space conversion of diffraction data
+ taken with linear and area detectors.
+
________________________________________________________________________________________________________________
I don't see what I am missing here, thus I'm looking for your help !
Thanks you for reading.
Cheers,
Alexandre Marie
Reply to: