From 8cf08f595fb48d11d5acd80f1b7f5431217a1601 Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Sun, 30 Dec 2012 02:03:19 +0200 Subject: [PATCH] Minor changes in debian/control, in patches and in .install files --- debian/changelog | 5 +++++ debian/control | 5 ++--- debian/mathgl-doc-en.install | 1 + debian/patches/CMakeLists-txt.patch | 1 + debian/patches/series | 1 + debian/patches/udav-udav-desktop.patch | 9 +++++++++ debian/udav.install | 3 ++- udav/udav.desktop | 1 - 8 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 debian/patches/udav-udav-desktop.patch diff --git a/debian/changelog b/debian/changelog index 698c8f9..f8889dc 100644 --- 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 Mon, 24 Dec 2012 22:25:24 +0200 diff --git a/debian/control b/debian/control index 2d7ec84..9a12110 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: mathgl Section: science Priority: optional Maintainer: Debian Science Maintainers -Uploaders: Dimitrios Eftaxiopoulos , D Haley -DM-Upload-Allowed: yes +Uploaders: Dimitrios Eftaxiopoulos 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 3605243..689a78a 100644 --- 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 004722c..d72eba3 100644 --- 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 4277de1..69cfe7e 100644 --- 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 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 f094068..0f9086d 100644 --- 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 3f28e31..91edad9 100755 --- a/udav/udav.desktop +++ b/udav/udav.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Version=1.0 Type=Application Terminal=false -- 2.30.2