Minor changes in debian/control, in patches and in .install files

diff --git a/debian/changelog b/debian/changelog
index 698c8f9c0aea386437f87a7185bc83386fec8201..f8889dcabf5944cf3edb23d20dfd03d5cb712e9d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ mathgl (2.1.1-1) experimental; urgency=low
   * Change soname in libraries from 6 to 7
   * Add libmgl-qt7.0.0 library package creation
   * Add libmgl-fltk7.0.0 and libmgl-wx7.0.0 packages
+  * Remove DM-Upload-Allow field from debian/control
+  * Remove D. Haley from uploaders after his request
+  * Update Standards-Version to 3.9.4
+  * Add title for CMakeLists-txt.patch
+  * Remove encoding specification line from udav.desktop
 
  -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Mon, 24 Dec 2012 22:25:24 +0200
 

diff --git a/debian/control b/debian/control
index 2d7ec84fea45174b79c6585c256de0c66bf9d5de..9a121103c8991963dfda68eddfbd1a55e9a457a9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@ Source: mathgl
 Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-Uploaders: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>, D Haley <mycae@yahoo.com>
-DM-Upload-Allowed: yes
+Uploaders: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
 Build-Depends: debhelper (>= 9), libltdl-dev, libgsl0-dev, freeglut3-dev,
  libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, swig, cmake, libxft-dev,
  libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt4-dev, libwxgtk2.8-dev, 
@@ -11,7 +10,7 @@ Build-Depends: debhelper (>= 9), libltdl-dev, libgsl0-dev, freeglut3-dev,
  libgif-dev, python-dev, python-numpy, python-support, libfontconfig1-dev,
  libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev,
  mpi-default-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://mathgl.sourceforge.net/index.html
 Vcs-Git: git://git.debian.org/debian-science/packages/mathgl.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/mathgl.git

diff --git a/debian/mathgl-doc-en.install b/debian/mathgl-doc-en.install
index 36052433e2259a30730f56b2fe94f17d986c8de0..689a78a62354d12bdc1d22a8099562e702402505 100644 (file)
--- a/debian/mathgl-doc-en.install
+++ b/debian/mathgl-doc-en.install
@@ -2,6 +2,7 @@ debian/tmp/usr/share/doc/mathgl/*.png
 debian/tmp/usr/share/doc/mathgl/*.html
 debian/tmp/usr/share/doc/mathgl/*.pdf 
 debian/tmp/usr/share/doc/mathgl/png/*
+debian/tmp/usr/share/doc/mathgl/udav/*
 debian/tmp/usr/share/info/mathgl_en.info* usr/share/info/
 debian/tmp/usr/share/doc/mathgl/mathgl_en/* 
 debian/folder/mathgl-doc-en /usr/share/doc-base/
\ No newline at end of file

diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch
index 004722cf526ebb719ff8d5334575c0fb080453e1..d72eba36b0e9dc34323ebd5b2e1647154ccb90bc 100644 (file)
--- a/debian/patches/CMakeLists-txt.patch
+++ b/debian/patches/CMakeLists-txt.patch
@@ -1,3 +1,4 @@
+Enable all available features during build
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -16,32 +16,32 @@

diff --git a/debian/patches/series b/debian/patches/series
index 4277de1289da0f79046007582058505143729fb1..69cfe7e09f158e454ca66cbbec747ad796e0c3f2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+udav-udav-desktop.patch
 CMakeLists-txt.patch

diff --git a/debian/patches/udav-udav-desktop.patch b/debian/patches/udav-udav-desktop.patch
new file mode 100644 (file)
index 0000000..b589ed3
--- /dev/null
+++ b/debian/patches/udav-udav-desktop.patch
@@ -0,0 +1,9 @@
+Remove encoding specification line after lintian info
+--- a/udav/udav.desktop
++++ b/udav/udav.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Version=1.0
+ Type=Application
+ Terminal=false

diff --git a/debian/udav.install b/debian/udav.install
index f094068dce96d011ac1eeb6a02c30b851a24a002..0f9086d073a39d4392f74c9634248ee2d9b0b1b3 100644 (file)
--- a/debian/udav.install
+++ b/debian/udav.install
@@ -1,3 +1,4 @@
 debian/tmp/usr/bin/udav
 debian/tmp/usr/share/pixmaps/udav.png
-debian/tmp/usr/share/applications/udav.desktop
\ No newline at end of file
+debian/tmp/usr/share/applications/udav.desktop
+debian/tmp/usr/share/udav/udav_ru.qm
\ No newline at end of file

diff --git a/udav/udav.desktop b/udav/udav.desktop
index 3f28e31a0f3c426031932535228caf5aef35a621..91edad988b90f16ed8b19b95337103d9a094d690 100755 (executable)
--- a/udav/udav.desktop
+++ b/udav/udav.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
 Terminal=false