[SCM] kalzium packaging branch, master, updated. 71565eb02deaa3bc4d84d76ac5d2f37d12799d8d
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Wed Oct 26 21:33:24 UTC 2011
The following commit has been merged in the master branch:
commit 32c658a3af69987c5ddb37a5b77bc2b7b1b63171
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Wed Oct 26 22:36:22 2011 +0200
Fold libcompoundviewer4 and libscience4 back in kalzium.
---
debian/control | 40 +--------
debian/kalzium-dev.install | 13 ---
debian/kalzium-dev.install.armel | 12 ---
debian/kalzium.install | 4 +
debian/kalzium.lintian-overrides | 4 +-
debian/libcompoundviewer4.install | 2 -
debian/libcompoundviewer4.symbols | 6 --
debian/libscience4.install | 2 -
debian/libscience4.symbols | 172 -------------------------------------
debian/not-installed | 15 +++
debian/rules | 6 +-
11 files changed, 27 insertions(+), 249 deletions(-)
diff --git a/debian/control b/debian/control
index 1646f5f..655b8fa 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,8 @@ Package: kalzium
Architecture: any
Section: science
Depends: ${shlibs:Depends}, ${misc:Depends}, kalzium-data (>= ${source:Version})
+Breaks: libkdeedu4 (<< 4:4.6.80), libscience4
+Replaces: libkdeedu4 (<< 4:4.6.80), libscience4
Suggests: khelpcenter4
Description: periodic table and chemistry tools for KDE
Kalzium is a full-featured chemistry application for KDE, including a
@@ -44,44 +46,6 @@ Description: data files for Kalzium
.
This package is part of the KDE education module.
-Package: kalzium-dev
-Architecture: any
-Section: devel
-Depends: ${misc:Depends}, libscience4 (= ${binary:Version}),
- libcompoundviewer4 (= ${binary:Version}) [i386 amd64 powerpc], kalzium (= ${binary:Version})
-Breaks: libkdeedu-dev (<< 4:4.6.80)
-Replaces: libkdeedu-dev (<< 4:4.6.80)
-Description: development headers for Kalzium
- This package contains the development headers for libscience and
- libcompoundviewer.
- .
- This package is part of the KDE education module.
-
-Package: libscience4
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libkdeedu-data (>= ${source:Upstream-Version})
-Replaces: libkdeedu4 (<< 4:4.6.80)
-Breaks: libkdeedu4 (<< 4:4.6.80)
-Description: library providing classes for chemical data
- This package contains a library that provides classes for chemical data. This
- library is mainly used by Kalzium.
- .
- This package is part of the KDE education module.
-
-Package: libcompoundviewer4
-Architecture: i386 amd64 powerpc
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: kalzium (<< 4:4.6.80)
-Replaces: kalzium (<< 4:4.6.80)
-Description: library for Molecular Graphics and Modelling using Avogadro
- This package contains a library that provides classes for molecular modelling
- using the Molecular Graphics and Modelling System Avogadro. This library is
- mainly used by Kalzium.
- .
- This package is part of the KDE education module.
-
Package: kalzium-dbg
Architecture: any
Section: debug
diff --git a/debian/kalzium-dev.install b/debian/kalzium-dev.install
deleted file mode 100644
index 9bdd4fe..0000000
--- a/debian/kalzium-dev.install
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/include/libkdeedu/chemicaldataobject.h
-usr/include/libkdeedu/element.h
-usr/include/libkdeedu/elementparser.h
-usr/include/libkdeedu/isotope.h
-usr/include/libkdeedu/isotopeparser.h
-usr/include/libkdeedu/libkdeedu_science_export.h
-usr/include/libkdeedu/moleculeparser.h
-usr/include/libkdeedu/parser.h
-usr/include/libkdeedu/psetables.h
-usr/include/libkdeedu/spectrum.h
-usr/include/libkdeedu/spectrumparser.h
-usr/lib/libcompoundviewer.so
-usr/lib/libscience.so
diff --git a/debian/kalzium-dev.install.armel b/debian/kalzium-dev.install.armel
deleted file mode 100644
index 2789bdc..0000000
--- a/debian/kalzium-dev.install.armel
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/include/libkdeedu/chemicaldataobject.h
-usr/include/libkdeedu/element.h
-usr/include/libkdeedu/elementparser.h
-usr/include/libkdeedu/isotope.h
-usr/include/libkdeedu/isotopeparser.h
-usr/include/libkdeedu/libkdeedu_science_export.h
-usr/include/libkdeedu/moleculeparser.h
-usr/include/libkdeedu/parser.h
-usr/include/libkdeedu/psetables.h
-usr/include/libkdeedu/spectrum.h
-usr/include/libkdeedu/spectrumparser.h
-usr/lib/libscience.so
diff --git a/debian/kalzium.install b/debian/kalzium.install
index 088a43a..0368cb0 100644
--- a/debian/kalzium.install
+++ b/debian/kalzium.install
@@ -5,6 +5,10 @@ usr/lib/kde4/nuclearCalculator.so
usr/lib/kde4/plasma_applet_didyouknow.so
usr/lib/kde4/plasma_applet_molmassCalculator.so
usr/lib/kde4/plasma_engine_kalzium.so
+usr/lib/libcompoundviewer.so.4
+usr/lib/libcompoundviewer.so.4.7.0
+usr/lib/libscience.so.4
+usr/lib/libscience.so.4.7.0
usr/share/applications/kde4/kalzium.desktop
usr/share/kde4/services/concentrationCalculator.desktop
usr/share/kde4/services/gasCalculator.desktop
diff --git a/debian/kalzium.lintian-overrides b/debian/kalzium.lintian-overrides
index d8ed8be..af05800 100644
--- a/debian/kalzium.lintian-overrides
+++ b/debian/kalzium.lintian-overrides
@@ -1 +1,3 @@
-kalzium: package-name-doesnt-match-sonames libcompoundviewer4
+kalzium: package-name-doesnt-match-sonames libcompoundviewer4 libscience4
+kalzium: no-symbols-control-file usr/lib/libscience.so.4.7.0
+kalzium: no-symbols-control-file usr/lib/libcompoundviewer.so.4.7.0
diff --git a/debian/libcompoundviewer4.install b/debian/libcompoundviewer4.install
deleted file mode 100644
index 6760fcb..0000000
--- a/debian/libcompoundviewer4.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libcompoundviewer.so.4
-usr/lib/libcompoundviewer.so.4.7.0
diff --git a/debian/libcompoundviewer4.symbols b/debian/libcompoundviewer4.symbols
deleted file mode 100644
index 87c69fa..0000000
--- a/debian/libcompoundviewer4.symbols
+++ /dev/null
@@ -1,6 +0,0 @@
-# SymbolsHelper-Confirmed: 4:4.6.90 amd64
-libcompoundviewer.so.4 libcompoundviewer4 #MINVER#
- _ZN17OpenBabel2Wrapper10getFormulaEPN8Avogadro8MoleculeE at Base 4:4.6.90
- _ZN17OpenBabel2Wrapper12readMoleculeERK7QString at Base 4:4.6.90
- _ZN17OpenBabel2Wrapper13writeMoleculeERK7QStringPN8Avogadro8MoleculeE at Base 4:4.6.90
- _ZN17OpenBabel2Wrapper16getPrettyFormulaEPN8Avogadro8MoleculeE at Base 4:4.6.90
diff --git a/debian/libscience4.install b/debian/libscience4.install
deleted file mode 100644
index b6ece8e..0000000
--- a/debian/libscience4.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libscience.so.4
-usr/lib/libscience.so.4.7.0
diff --git a/debian/libscience4.symbols b/debian/libscience4.symbols
deleted file mode 100644
index 636fded..0000000
--- a/debian/libscience4.symbols
+++ /dev/null
@@ -1,172 +0,0 @@
-# SymbolsHelper-Confirmed: 4:4.6.90 amd64
-libscience.so.4 libscience4 #MINVER#
- _ZN13IsotopeParser10charactersERK7QString at Base 4:4.6.2
- _ZN13IsotopeParser10endElementERK7QStringS2_S2_ at Base 4:4.6.2
- _ZN13IsotopeParser11getIsotopesEv at Base 4:4.6.2
- _ZN13IsotopeParser12startElementERK7QStringS2_S2_RK14QXmlAttributes at Base 4:4.6.2
- _ZN13IsotopeParserC1Ev at Base 4:4.6.2
- _ZN13IsotopeParserC2Ev at Base 4:4.6.2
- _ZN13IsotopeParserD0Ev at Base 4:4.6.2
- _ZN13IsotopeParserD1Ev at Base 4:4.6.2
- _ZN13IsotopeParserD2Ev at Base 4:4.6.2
- _ZN14MoleculeParser10expandTermERK7QString at Base 4:4.6.2
- _ZN14MoleculeParser12getNextTokenEv at Base 4:4.6.2
- _ZN14MoleculeParser13expandFormulaERK7QString at Base 4:4.6.2
- _ZN14MoleculeParser13lookupElementERK7QString at Base 4:4.6.2
- _ZN14MoleculeParser16parseSubmoleculeEPdP15ElementCountMap at Base 4:4.6.2
- _ZN14MoleculeParser6weightERK7QStringPdP15ElementCountMap at Base 4:4.6.2
- _ZN14MoleculeParser9aliasListEv at Base 4:4.6.2
- _ZN14MoleculeParser9parseTermEPdP15ElementCountMap at Base 4:4.6.2
- _ZN14MoleculeParserC1ERK5QListIP7ElementE at Base 4:4.6.2
- _ZN14MoleculeParserC1ERK7QString at Base 4:4.6.2
- _ZN14MoleculeParserC2ERK5QListIP7ElementE at Base 4:4.6.2
- _ZN14MoleculeParserC2ERK7QString at Base 4:4.6.2
- _ZN14MoleculeParserD0Ev at Base 4:4.6.2
- _ZN14MoleculeParserD1Ev at Base 4:4.6.2
- _ZN14MoleculeParserD2Ev at Base 4:4.6.2
- _ZN14SpectrumParser10charactersERK7QString at Base 4:4.6.2
- _ZN14SpectrumParser10endElementERK7QStringS2_S2_ at Base 4:4.6.2
- _ZN14SpectrumParser12getSpectrumsEv at Base 4:4.6.2
- _ZN14SpectrumParser12startElementERK7QStringS2_S2_RK14QXmlAttributes at Base 4:4.6.2
- _ZN14SpectrumParserC1Ev at Base 4:4.6.2
- _ZN14SpectrumParserC2Ev at Base 4:4.6.2
- _ZN14SpectrumParserD0Ev at Base 4:4.6.2
- _ZN14SpectrumParserD1Ev at Base 4:4.6.2
- _ZN14SpectrumParserD2Ev at Base 4:4.6.2
- _ZN15ElementCountMap3addEP7Elementi at Base 4:4.6.2
- _ZN15ElementCountMap3addERS_ at Base 4:4.6.2
- _ZN15ElementCountMap6searchEP7Element at Base 4:4.6.2
- _ZN15ElementCountMap8elementsEv at Base 4:4.6.2
- _ZN15ElementCountMap8multiplyEi at Base 4:4.6.2
- _ZN15ElementCountMapC1Ev at Base 4:4.6.2
- _ZN15ElementCountMapC2Ev at Base 4:4.6.2
- _ZN15ElementCountMapD1Ev at Base 4:4.6.2
- _ZN15ElementCountMapD2Ev at Base 4:4.6.2
- _ZN16ElementSaxParser10charactersERK7QString at Base 4:4.6.2
- _ZN16ElementSaxParser10endElementERK7QStringS2_S2_ at Base 4:4.6.2
- _ZN16ElementSaxParser11getElementsEv at Base 4:4.6.2
- _ZN16ElementSaxParser12startElementERK7QStringS2_S2_RK14QXmlAttributes at Base 4:4.6.2
- _ZN16ElementSaxParserC1Ev at Base 4:4.6.2
- _ZN16ElementSaxParserC2Ev at Base 4:4.6.2
- _ZN16ElementSaxParserD0Ev at Base 4:4.6.2
- _ZN16ElementSaxParserD1Ev at Base 4:4.6.2
- _ZN16ElementSaxParserD2Ev at Base 4:4.6.2
- _ZN18ChemicalDataObject13setErrorValueERK8QVariant at Base 4:4.6.2
- _ZN18ChemicalDataObject7setDataERK8QVariant at Base 4:4.6.2
- _ZN18ChemicalDataObject7setTypeENS_11BlueObeliskE at Base 4:4.6.2
- _ZN18ChemicalDataObject7setTypeEi at Base 4:4.6.2
- _ZN18ChemicalDataObject7setUnitEi at Base 4:4.6.90
- _ZN18ChemicalDataObjectC1ERK8QVariantNS_11BlueObeliskES2_ at Base 4:4.6.2
- _ZN18ChemicalDataObjectC1ERKS_ at Base 4:4.6.2
- _ZN18ChemicalDataObjectC1Ev at Base 4:4.6.2
- _ZN18ChemicalDataObjectC2ERK8QVariantNS_11BlueObeliskES2_ at Base 4:4.6.2
- _ZN18ChemicalDataObjectC2ERKS_ at Base 4:4.6.2
- _ZN18ChemicalDataObjectC2Ev at Base 4:4.6.2
- _ZN18ChemicalDataObjectD1Ev at Base 4:4.6.2
- _ZN18ChemicalDataObjectD2Ev at Base 4:4.6.2
- _ZN18ChemicalDataObjectaSERKS_ at Base 4:4.6.2
- _ZN6Parser11getNextCharEv at Base 4:4.6.2
- _ZN6Parser12getNextTokenEv at Base 4:4.6.2
- _ZN6Parser14skipWhitespaceEv at Base 4:4.6.2
- _ZN6Parser16parseSimpleFloatEPd at Base 4:4.6.2
- _ZN6Parser5startERK7QString at Base 4:4.6.2
- _ZN6Parser8parseIntEPi at Base 4:4.6.2
- _ZN6ParserC1ERK7QString at Base 4:4.6.2
- _ZN6ParserC1Ev at Base 4:4.6.2
- _ZN6ParserC2ERK7QString at Base 4:4.6.2
- _ZN6ParserC2Ev at Base 4:4.6.2
- _ZN6ParserD0Ev at Base 4:4.6.2
- _ZN6ParserD1Ev at Base 4:4.6.2
- _ZN6ParserD2Ev at Base 4:4.6.2
- _ZN7Element7addDataERK18ChemicalDataObject at Base 4:4.6.2
- _ZN7Element7addDataERK8QVariantN18ChemicalDataObject11BlueObeliskE at Base 4:4.6.2
- _ZN7ElementC1Ev at Base 4:4.6.2
- _ZN7ElementC2Ev at Base 4:4.6.2
- _ZN7ElementD0Ev at Base 4:4.6.2
- _ZN7ElementD1Ev at Base 4:4.6.2
- _ZN7ElementD2Ev at Base 4:4.6.2
- _ZN7Isotope11setNucleonsEi at Base 4:4.6.2
- _ZN7Isotope18nucleonsAfterDecayENS_5DecayE at Base 4:4.6.2
- _ZN7Isotope7addDataE18ChemicalDataObject at Base 4:4.6.2
- _ZN7IsotopeC1Ev at Base 4:4.6.2
- _ZN7IsotopeC2Ev at Base 4:4.6.2
- _ZN7IsotopeD1Ev at Base 4:4.6.2
- _ZN7IsotopeD2Ev at Base 4:4.6.2
- _ZN8Spectrum11wavelengthsEdd at Base 4:4.6.2
- _ZN8Spectrum17adjustIntensitiesEv at Base 4:4.6.2
- _ZN8Spectrum18adjustToWavelengthEdd at Base 4:4.6.2
- _ZN8Spectrum4peak16wavelengthToUnitEi at Base 4:4.6.90
- _ZN8Spectrum7maxPeakEi at Base 4:4.6.90
- _ZN8Spectrum7maxPeakEv at Base 4:4.6.2
- _ZN8Spectrum7minPeakEi at Base 4:4.6.90
- _ZN8Spectrum7minPeakEv at Base 4:4.6.2
- _ZN8SpectrumC1Ev at Base 4:4.6.2
- _ZN8SpectrumC2Ev at Base 4:4.6.2
- _ZN8SpectrumD1Ev at Base 4:4.6.2
- _ZN8SpectrumD2Ev at Base 4:4.6.2
- _ZN9pseTables12getTabletypeE7QString at Base 4:4.6.2
- _ZN9pseTables12getTabletypeEi at Base 4:4.6.2
- _ZN9pseTables8instanceEv at Base 4:4.6.2
- _ZN9pseTablesC1Ev at Base 4:4.6.2
- _ZN9pseTablesC2Ev at Base 4:4.6.2
- _ZN9pseTablesD1Ev at Base 4:4.6.2
- _ZN9pseTablesD2Ev at Base 4:4.6.2
- _ZNK16ElementSaxParser4unitERK7QString at Base 4:4.6.90
- _ZNK18ChemicalDataObject10errorValueEv at Base 4:4.6.2
- _ZNK18ChemicalDataObject12unitAsStringEv at Base 4:4.6.2
- _ZNK18ChemicalDataObject13valueAsStringEv at Base 4:4.6.2
- _ZNK18ChemicalDataObject4typeEv at Base 4:4.6.2
- _ZNK18ChemicalDataObject4unitEv at Base 4:4.6.2
- _ZNK18ChemicalDataObject5valueEv at Base 4:4.6.2
- _ZNK18ChemicalDataObjecteqERK7QString at Base 4:4.6.2
- _ZNK18ChemicalDataObjecteqERKS_ at Base 4:4.6.2
- _ZNK18ChemicalDataObjecteqEb at Base 4:4.6.2
- _ZNK18ChemicalDataObjecteqEd at Base 4:4.6.2
- _ZNK18ChemicalDataObjecteqEi at Base 4:4.6.2
- _ZNK18ChemicalDataObjectneERKS_ at Base 4:4.6.2
- _ZNK7Element12dataAsStringEN18ChemicalDataObject11BlueObeliskE at Base 4:4.6.2
- _ZNK7Element12dataAsStringEN18ChemicalDataObject11BlueObeliskEi at Base 4:4.6.90
- _ZNK7Element13dataAsVariantEN18ChemicalDataObject11BlueObeliskE at Base 4:4.6.2
- _ZNK7Element13dataAsVariantEN18ChemicalDataObject11BlueObeliskEi at Base 4:4.6.90
- _ZNK7Element20dataAsStringWithUnitEN18ChemicalDataObject11BlueObeliskEi at Base 4:4.6.90
- _ZNK7Isotope10alphadecayEv at Base 4:4.6.2
- _ZNK7Isotope11errorMarginEv at Base 4:4.6.2
- _ZNK7Isotope12eclikelinessEv at Base 4:4.6.2
- _ZNK7Isotope12halflifeUnitEv at Base 4:4.6.2
- _ZNK7Isotope13betaplusdecayEv at Base 4:4.6.2
- _ZNK7Isotope14betaminusdecayEv at Base 4:4.6.2
- _ZNK7Isotope15alphalikelinessEv at Base 4:4.6.2
- _ZNK7Isotope18betapluslikelinessEv at Base 4:4.6.2
- _ZNK7Isotope19betaminuslikelinessEv at Base 4:4.6.2
- _ZNK7Isotope19parentElementNumberEv at Base 4:4.6.2
- _ZNK7Isotope19parentElementSymbolEv at Base 4:4.6.2
- _ZNK7Isotope4massEv at Base 4:4.6.2
- _ZNK7Isotope4spinEv at Base 4:4.6.2
- _ZNK7Isotope7ecdecayEv at Base 4:4.6.2
- _ZNK7Isotope8halflifeEv at Base 4:4.6.2
- _ZNK7Isotope8nucleonsEv at Base 4:4.6.2
- _ZNK7Isotope9abundanceEv at Base 4:4.6.2
- _ZNK7Isotope9magmomentEv at Base 4:4.6.2
- _ZNK8Spectrum19parentElementNumberEv at Base 4:4.6.2
- _ZNK9pseTables6tablesEv at Base 4:4.6.2
- _ZTI13IsotopeParser at Base 4:4.6.2
- _ZTI14MoleculeParser at Base 4:4.6.2
- _ZTI14SpectrumParser at Base 4:4.6.2
- _ZTI16ElementSaxParser at Base 4:4.6.2
- _ZTI6Parser at Base 4:4.6.2
- _ZTI7Element at Base 4:4.6.2
- _ZTS13IsotopeParser at Base 4:4.6.2
- _ZTS14MoleculeParser at Base 4:4.6.2
- _ZTS14SpectrumParser at Base 4:4.6.2
- _ZTS16ElementSaxParser at Base 4:4.6.2
- _ZTS6Parser at Base 4:4.6.2
- _ZTS7Element at Base 4:4.6.2
- _ZTV13IsotopeParser at Base 4:4.6.2
- _ZTV14MoleculeParser at Base 4:4.6.2
- _ZTV14SpectrumParser at Base 4:4.6.2
- _ZTV16ElementSaxParser at Base 4:4.6.2
- _ZTV6Parser at Base 4:4.6.2
- _ZTV7Element at Base 4:4.6.2
- (c++)"non-virtual thunk to ElementSaxParser::~ElementSaxParser()@Base" 4:4.6.2
- (c++)"non-virtual thunk to IsotopeParser::~IsotopeParser()@Base" 4:4.6.2
- (c++)"non-virtual thunk to SpectrumParser::~SpectrumParser()@Base" 4:4.6.2
diff --git a/debian/not-installed b/debian/not-installed
index 86d28c3..f7e58e0 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,17 @@
# compressed manpage
./usr/share/man/man1/kalzium.1
+
+# These would belong to kalzium-dev
+./usr/include/libkdeedu/chemicaldataobject.h
+./usr/include/libkdeedu/element.h
+./usr/include/libkdeedu/elementparser.h
+./usr/include/libkdeedu/isotope.h
+./usr/include/libkdeedu/isotopeparser.h
+./usr/include/libkdeedu/libkdeedu_science_export.h
+./usr/include/libkdeedu/moleculeparser.h
+./usr/include/libkdeedu/parser.h
+./usr/include/libkdeedu/psetables.h
+./usr/include/libkdeedu/spectrum.h
+./usr/include/libkdeedu/spectrumparser.h
+./usr/lib/libcompoundviewer.so
+./usr/lib/libscience.so
diff --git a/debian/rules b/debian/rules
index d759925..e8c3e7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,9 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
override_dh_makeshlibs:
$(overridden_command) -V -- -c0
-override_dh_shlibdeps:
- $(overridden_command) $(patsubst %,-p%,$(filter lib%,$(shell dh_listpackages))) -- -xkde-runtime
- $(overridden_command) --remaining-packages
+#override_dh_shlibdeps:
+# $(overridden_command) $(patsubst %,-p%,$(filter lib%,$(shell dh_listpackages))) -- -xkde-runtime
+# $(overridden_command) --remaining-packages
override_dh_strip:
$(overridden_command) --dbg-package=kalzium-dbg
--
kalzium packaging
More information about the pkg-kde-commits
mailing list