r44607 - in /packages/libcomplearn/trunk/debian: changelog compat control patches/ patches/glib-single-include.patch patches/series rules
tille at users.alioth.debian.org
tille at users.alioth.debian.org
Mon Mar 26 08:26:09 UTC 2012
Author: tille
Date: Mon Mar 26 08:26:08 2012
New Revision: 44607
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44607
Log:
No individual glib headers. Some general packaging updates
Added:
packages/libcomplearn/trunk/debian/patches/
packages/libcomplearn/trunk/debian/patches/glib-single-include.patch
packages/libcomplearn/trunk/debian/patches/series
Modified:
packages/libcomplearn/trunk/debian/changelog
packages/libcomplearn/trunk/debian/compat
packages/libcomplearn/trunk/debian/control
packages/libcomplearn/trunk/debian/rules
Modified: packages/libcomplearn/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libcomplearn/trunk/debian/changelog?rev=44607&op=diff
==============================================================================
--- packages/libcomplearn/trunk/debian/changelog (original)
+++ packages/libcomplearn/trunk/debian/changelog Mon Mar 26 08:26:08 2012
@@ -1,3 +1,19 @@
+libcomplearn (1.1.7-2) unstable; urgency=low
+
+ * debian/control:
+ - Standards-Version 3.9.3 (no changes needed)
+ - Fixed Vcs fields
+ - Removed duplicated "Section: libs" entries
+ * debhelper compatibility version 8 (control+compat)
+ * debian/patches/glib-single-include.patch:
+ No individual glib headers. File was created by running
+ http://people.debian.org/~biebl/fix-glib-includes.sh
+ Closes: #665561
+ * debian/rules:
+ Rewritten to use short dh
+
+ -- Andreas Tille <tille at debian.org> Mon, 26 Mar 2012 09:33:32 +0200
+
libcomplearn (1.1.7-1) unstable; urgency=low
* New upstream version
Modified: packages/libcomplearn/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/libcomplearn/trunk/debian/compat?rev=44607&op=diff
==============================================================================
--- packages/libcomplearn/trunk/debian/compat (original)
+++ packages/libcomplearn/trunk/debian/compat Mon Mar 26 08:26:08 2012
@@ -1,1 +1,1 @@
-7
+8
Modified: packages/libcomplearn/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libcomplearn/trunk/debian/control?rev=44607&op=diff
==============================================================================
--- packages/libcomplearn/trunk/debian/control (original)
+++ packages/libcomplearn/trunk/debian/control Mon Mar 26 08:26:08 2012
@@ -4,13 +4,13 @@
Uploaders: Rudi Cilibrasi <cilibrar at debian.org>,
Andreas Tille <tille at debian.org>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), autotools-dev, libtool, pkg-config, zlib1g-dev, libbz2-dev,
+Build-Depends: debhelper (>= 8), autotools-dev, libtool, pkg-config, zlib1g-dev, libbz2-dev,
libbz2-1.0, libgsl0-dev, libxml2-dev, libglib2.0-dev, doxygen
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Section: libs
Homepage: http://complearn.org/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libcomplearn/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libcomplearn/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libcomplearn/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-science/packages/R/libcomplearn/trunk/
Package: libcomplearn-gomp-dev
Section: libdevel
@@ -47,7 +47,6 @@
.
Package: libcomplearn1
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: machine-learning with data compression core library runtime files
@@ -57,7 +56,6 @@
.
Package: libcomplearn-gomp1
-Section: libs
Architecture: any
Depends: libgomp1, ${shlibs:Depends}, ${misc:Depends}
Description: machine-learning core library runtime files with OpenMP (libgomp)
Added: packages/libcomplearn/trunk/debian/patches/glib-single-include.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libcomplearn/trunk/debian/patches/glib-single-include.patch?rev=44607&op=file
==============================================================================
--- packages/libcomplearn/trunk/debian/patches/glib-single-include.patch (added)
+++ packages/libcomplearn/trunk/debian/patches/glib-single-include.patch Mon Mar 26 08:26:08 2012
@@ -1,0 +1,198 @@
+Author: Andreas Tille <tille at debian.org>
+Bug-Fixed: http://bugs.debian.org/665561
+Date: Mon, 26 Mar 2012 09:33:32 +0200
+Description: No individual glib headers
+ File was created by running
+ http://people.debian.org/~biebl/fix-glib-includes.sh
+
+--- libcomplearn-1.1.7.orig/doxy/real-compressor.c
++++ libcomplearn-1.1.7/doxy/real-compressor.c
+@@ -10,7 +10,6 @@
+
+ #include <glib.h>
+ #include <glib-object.h>
+-#include <glib/garray.h>
+ #include <gsl/gsl_matrix.h>
+
+ #define COMPLEARN_ERROR 1
+--- libcomplearn-1.1.7.orig/src/anydecompress.c
++++ libcomplearn-1.1.7/src/anydecompress.c
+@@ -29,7 +29,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <getopt.h>
+ #include <locale.h>
+ #include <libintl.h>
+--- libcomplearn-1.1.7.orig/src/complearn-compressor-driver.gob
++++ libcomplearn-1.1.7/src/complearn-compressor-driver.gob
+@@ -1,6 +1,6 @@
+ requires 2.0.0
+ %headertop{
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <libintl.h>
+ #include <stdlib.h>
+ #include "real-compressor.h"
+--- libcomplearn-1.1.7.orig/src/complearn-environment.gob
++++ libcomplearn-1.1.7/src/complearn-environment.gob
+@@ -39,7 +39,6 @@
+ */
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <glib.h>
+ #include <gmodule.h>
+ #include <libintl.h>
+ #include "complearn.h"
+--- libcomplearn-1.1.7.orig/src/complearn-external-compressor.gob
++++ libcomplearn-1.1.7/src/complearn-external-compressor.gob
+@@ -1,6 +1,6 @@
+ requires 2.0.0
+ %headertop{
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <libintl.h>
+ #include "real-compressor.h"
+ #include "complearn-real-compressor-adaptor.h"
+--- libcomplearn-1.1.7.orig/src/complearn-external-file-compressor.gob
++++ libcomplearn-1.1.7/src/complearn-external-file-compressor.gob
+@@ -1,6 +1,6 @@
+ requires 2.0.0
+ %headertop{
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <libintl.h>
+ #include "real-compressor.h"
+ #include "complearn-real-compressor-adaptor.h"
+--- libcomplearn-1.1.7.orig/src/complearn-rcbzip.gob
++++ libcomplearn-1.1.7/src/complearn-rcbzip.gob
+@@ -1,6 +1,6 @@
+ requires 2.0.0
+ %headertop{
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <libintl.h>
+ #include "real-compressor.h"
+ #include "complearn-real-compressor-adaptor.h"
+--- libcomplearn-1.1.7.orig/src/complearn-rcgzip.gob
++++ libcomplearn-1.1.7/src/complearn-rcgzip.gob
+@@ -1,6 +1,6 @@
+ requires 2.0.0
+ %headertop{
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <libintl.h>
+ #include "real-compressor.h"
+ #include "complearn-real-compressor-adaptor.h"
+--- libcomplearn-1.1.7.orig/src/complearn-real-compressor-adaptor.gob
++++ libcomplearn-1.1.7/src/complearn-real-compressor-adaptor.gob
+@@ -1,6 +1,6 @@
+ requires 2.0.0
+ %headertop{
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "real-compressor.h"
+ %}
+
+--- libcomplearn-1.1.7.orig/src/complearn-vcblocksort.gob
++++ libcomplearn-1.1.7/src/complearn-vcblocksort.gob
+@@ -1,6 +1,6 @@
+ requires 2.0.0
+ %headertop{
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "real-compressor.h"
+ #include "complearn-real-compressor-adaptor.h"
+ %}
+--- libcomplearn-1.1.7.orig/src/complearn/complearn-compressor-driver.h
++++ libcomplearn-1.1.7/src/complearn/complearn-compressor-driver.h
+@@ -4,7 +4,6 @@
+ #include <glib-object.h>
+
+
+-#include <glib/garray.h>
+ #include <libintl.h>
+ #include <stdlib.h>
+ #include "real-compressor.h"
+--- libcomplearn-1.1.7.orig/src/complearn/complearn-environment.h
++++ libcomplearn-1.1.7/src/complearn/complearn-environment.h
+@@ -4,7 +4,6 @@
+ #include <glib-object.h>
+
+
+-#include <glib.h>
+ #include <glib/gstdio.h>
+ #include "real-compressor.h"
+
+--- libcomplearn-1.1.7.orig/src/complearn/complearn-external-compressor.h
++++ libcomplearn-1.1.7/src/complearn/complearn-external-compressor.h
+@@ -4,7 +4,6 @@
+ #include <glib-object.h>
+
+
+-#include <glib/garray.h>
+ #include <libintl.h>
+ #include "real-compressor.h"
+ #include "complearn-real-compressor-adaptor.h"
+--- libcomplearn-1.1.7.orig/src/complearn/complearn-external-file-compressor.h
++++ libcomplearn-1.1.7/src/complearn/complearn-external-file-compressor.h
+@@ -4,7 +4,6 @@
+ #include <glib-object.h>
+
+
+-#include <glib/garray.h>
+ #include <libintl.h>
+ #include "real-compressor.h"
+ #include "complearn-real-compressor-adaptor.h"
+--- libcomplearn-1.1.7.orig/src/complearn/complearn-rcbzip.h
++++ libcomplearn-1.1.7/src/complearn/complearn-rcbzip.h
+@@ -4,7 +4,6 @@
+ #include <glib-object.h>
+
+
+-#include <glib/garray.h>
+ #include <libintl.h>
+ #include "real-compressor.h"
+ #include "complearn-real-compressor-adaptor.h"
+--- libcomplearn-1.1.7.orig/src/complearn/complearn-rcgzip.h
++++ libcomplearn-1.1.7/src/complearn/complearn-rcgzip.h
+@@ -4,7 +4,6 @@
+ #include <glib-object.h>
+
+
+-#include <glib/garray.h>
+ #include <libintl.h>
+ #include "real-compressor.h"
+ #include "complearn-real-compressor-adaptor.h"
+--- libcomplearn-1.1.7.orig/src/complearn/complearn-real-compressor-adaptor.h
++++ libcomplearn-1.1.7/src/complearn/complearn-real-compressor-adaptor.h
+@@ -4,7 +4,6 @@
+ #include <glib-object.h>
+
+
+-#include <glib/garray.h>
+ #include "real-compressor.h"
+
+ #ifndef __COMPLEARN_REAL_COMPRESSOR_ADAPTOR_H__
+--- libcomplearn-1.1.7.orig/src/complearn/complearn-vcblocksort.h
++++ libcomplearn-1.1.7/src/complearn/complearn-vcblocksort.h
+@@ -4,7 +4,6 @@
+ #include <glib-object.h>
+
+
+-#include <glib/garray.h>
+ #include "real-compressor.h"
+ #include "complearn-real-compressor-adaptor.h"
+
+--- libcomplearn-1.1.7.orig/src/complearn/real-compressor.h
++++ libcomplearn-1.1.7/src/complearn/real-compressor.h
+@@ -9,7 +9,6 @@
+
+ #include <glib.h>
+ #include <glib-object.h>
+-#include <glib/garray.h>
+ #include <gsl/gsl_matrix.h>
+
+ #define COMPLEARN_ERROR 1
Added: packages/libcomplearn/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libcomplearn/trunk/debian/patches/series?rev=44607&op=file
==============================================================================
--- packages/libcomplearn/trunk/debian/patches/series (added)
+++ packages/libcomplearn/trunk/debian/patches/series Mon Mar 26 08:26:08 2012
@@ -1,0 +1,1 @@
+glib-single-include.patch
Modified: packages/libcomplearn/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libcomplearn/trunk/debian/rules?rev=44607&op=diff
==============================================================================
--- packages/libcomplearn/trunk/debian/rules (original)
+++ packages/libcomplearn/trunk/debian/rules Mon Mar 26 08:26:08 2012
@@ -1,62 +1,26 @@
#!/usr/bin/make -f
# rules file for libcomplearn
-build: build-stamp
-build-stamp:
- dh_testdir
+%:
+ dh $@
- # Add here commands to compile the package.
+override_dh_auto_configure:
mkdir debian/libcomplearn
mkdir debian/libcomplearn-gomp
cd debian/libcomplearn && ../../configure --enable-openmp=no --prefix=/usr && $(MAKE)
cd debian/libcomplearn-gomp && ../../configure --enable-openmp=yes --prefix=/usr && $(MAKE)
- touch build-stamp
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf debian/libcomplearn debian/libcomplearn-gomp
+
+override_dh_auto_install:
+ cd debian/libcomplearn && $(MAKE) DESTDIR=`pwd` install install-man
+ cd debian/libcomplearn-gomp && $(MAKE) DESTDIR=`pwd` install
+
+override_dh_strip:
+ dh_strip --dbg-package=libcomplearn1-dbg
get-orig-source:
uscan
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- rm -rf debian/libcomplearn debian/libcomplearn-gomp
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- cd debian/libcomplearn && $(MAKE) DESTDIR=`pwd` install install-man
- cd debian/libcomplearn-gomp && $(MAKE) DESTDIR=`pwd` install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installman
- dh_link
- dh_strip --dbg-package=libcomplearn1-dbg
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
More information about the debian-science-commits
mailing list