[med-svn] [Git][med-team/gwyddion][master] 5 commits: build without libgconf2-dev

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / gwyddion


Commits:
fbc9fab9 by Andreas Tille at 2018-03-26T11:50:35+02:00
build without libgconf2-dev

- - - - -
87dbd920 by Andreas Tille at 2018-03-26T12:08:03+02:00
avoid file conflicts between -dev and -doc package

- - - - -
e5777161 by Andreas Tille at 2018-03-26T12:10:21+02:00
libgwyddion2-0: Depends: python

- - - - -
8596c97a by Andreas Tille at 2018-03-26T12:47:51+02:00
Really fix conflicting files issue

- - - - -
b771817c by Andreas Tille at 2018-03-26T13:09:23+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/gwyddion-common.install
- − debian/libgwyddion20-doc.docs
- + debian/libgwyddion20-doc.links


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
-gwyddion (2.50-1) UNRELEASED; urgency=medium
+gwyddion (2.50-1) unstable; urgency=medium
 
   * New upstream version
   * Add registry entries
   * Standards-Version: 4.1.3
   * debhelper 11
+  * build without libgconf2-dev
+    Closes: #894055
+  * avoid file conflicts between -dev and -doc package
+  * libgwyddion2-0: Depends: python
 
- -- Andreas Tille <tille at debian.org>  Mon, 26 Mar 2018 08:42:03 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 26 Mar 2018 12:10:41 +0200
 
 gwyddion (2.49-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 11~),
                libgtksourceview2.0-dev,
                python,
                ruby,
-               libgconf2-dev,
                libxml2-dev,
                chrpath
 Standards-Version: 4.1.3
@@ -93,6 +92,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         python,
          gwyddion-common (= ${source:Version})
 Suggests: libgwyddion20-doc
 Description: libraries for Gwyddion SPM analysis tool


=====================================
debian/gwyddion-common.install
=====================================
--- a/debian/gwyddion-common.install
+++ b/debian/gwyddion-common.install
@@ -1,4 +1,3 @@
-etc/gconf/schemas/
 usr/share/locale/
 usr/share/icons/
 usr/share/gwyddion/


=====================================
debian/libgwyddion20-doc.docs deleted
=====================================
--- a/debian/libgwyddion20-doc.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTHORS
-README
-THANKS
-TODO


=====================================
debian/libgwyddion20-doc.links
=====================================
--- /dev/null
+++ b/debian/libgwyddion20-doc.links
@@ -0,0 +1,4 @@
+usr/share/doc/gwyddion-common/AUTHORS.gz	usr/share/doc/libgwyddion20-doc/AUTHORS.gz
+usr/share/doc/gwyddion-common/README		usr/share/doc/libgwyddion20-doc/README
+usr/share/doc/gwyddion-common/THANKS		usr/share/doc/libgwyddion20-doc/THANKS
+usr/share/doc/gwyddion-common/TODO		usr/share/doc/libgwyddion20-doc/TODO



View it on GitLab: https://salsa.debian.org/med-team/gwyddion/compare/517358f3bd1f5f7c2e2dfcbbc8705839a950e6f1...b771817c532ec86efc52829e0e9a6ce274430f0b

---
View it on GitLab: https://salsa.debian.org/med-team/gwyddion/compare/517358f3bd1f5f7c2e2dfcbbc8705839a950e6f1...b771817c532ec86efc52829e0e9a6ce274430f0b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180326/7cbbcfba/attachment-0001.html>