debian: Makefile skip tests

OpenSIPS · Aug 21, 2015 · 2c2c4eb · 2c2c4eb
1 parent de147c4
commit 2c2c4eb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 85 deletions.
diff --git a/Makefile b/Makefile
@@ -442,11 +442,10 @@ deb:
 	rm -rf debian
 	# dpkg-source cannot use links for debian source
 	cp -r packaging/debian debian
-	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage \
+	dpkg-buildpackage \
 		-I.git -I.gitignore \
-		-IMakefile.conf \
 		-I*.swp -I*~ \
-		-i\\.git\|Makefile\\.conf\|packaging\|debian\|^\\.\\w+\\.swp\|lex\\.yy\\.c\|cfg\\.tab\\.\(c\|h\) \
+		-i\\.git\|packaging\|debian\|^\\.\\w+\\.swp\|lex\\.yy\\.c\|cfg\\.tab\\.\(c\|h\) \
 		-rfakeroot -tc $(DEBBUILD_EXTRA_OPTIONS)
 	rm -rf debian
 

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -3,81 +3,3 @@ opensips (2.1.1-1) unstable; urgency=low
   * Initial Release (Closes: #556131)
 
  -- Razvan Crainea <razvan@opensips.org>  Wed, 19 Aug 2015 18:36:17 +0300
-
-
-opensips (2.1.0-1) stable; urgency=low
-
-  * Major Public Release.
-
- -- Razvan Crainea <razvan@opensips.org>  Fri, 14 Aug 2015 12:00:00 +0300
-
-
-opensips (2.1-rc2) stable; urgency=low
-
-  * Major Public Release.
-
- -- Bogdan-Andrei Iancu <bogdan@opensips.org>  Wed, 22 Apr 2015 17:40:41 +0300
-
-
-opensips (2.1-rc1) unstable; urgency=low
-
-  * Major Public Release.
-
- -- Bogdan-Andrei Iancu <bogdan@opensips.org>  Wed, 18 Mar 2015 18:22:57 +0200
-
-
-opensips (1.11.0-1) stable; urgency=low
-
-  * Major Public Release.
-
- -- Bogdan-Andrei Iancu <bogdan@opensips.org>  Thu, 20 Mar 2014 21:32:16 +0200
-
-
-opensips (1.10.0-1) stable; urgency=low
-
-  * Major Public Release.
-
- -- Bogdan-Andrei Iancu <bogdan@opensips.org>  Mon, 05 Aug 2013 16:31:46 +0200
-
-
-opensips (1.9.0-1) stable; urgency=low
-
-  * Major Public Release.
-
- -- Bogdan-Andrei Iancu <bogdan@opensips.org>  Tue, 29 Jan 2013 15:39:34 +0200
-
-
-opensips (1.8.0-1) stable; urgency=low
-
-  * Major Public Release.
-
- -- Bogdan-Andrei Iancu <bogdan@opensips.org>  Thu, 22 Mar 2012 09:00:00 +0200
-
-
-opensips (1.7.0-1) stable; urgency=low
-
-  * Major Public Release.
-
- -- Bogdan-Andrei Iancu <bogdan@opensips.org>  Thu, 12 Jul 2011 09:00:00 +0200
-
-
-opensips (1.6.0-1) unstable; urgency=low
-
-  * Major Public Release.
-
- -- Bogdan-Andrei Iancu <bogdan@opensips.org>  Thu, 15 Oct 2009 09:00:00 +0200
-
-
-opensips (1.5.0-1) unstable; urgency=low
-
-  * Major Public Release.
-
- -- Bogdan-Andrei Iancu <bogdan@opensips.org>  Mon, 21 Mar 2009 09:00:00 +0200
-
-
-opensips (1.4.0-1) unstable; urgency=low
-
-  * First Public Release.
-
- -- Bogdan-Andrei Iancu <bogdan@opensips.org>  Mon, 21 Jul 2008 09:00:00 +0200
-
diff --git a/packaging/debian/control b/packaging/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Razvan Crainea <razvan@opensips.org>
 Build-Depends: bison,
                debhelper (>= 9),
+               dh-python,
                dpkg-dev (>= 1.16.1.1),
                flex,
                libconfuse-dev,
@@ -16,6 +17,7 @@ Build-Depends: bison,
                libjson0-dev,
                libldap2-dev,
                liblua5.1-dev,
+               libmemcache-dev,
                libmemcached-dev,
                libmicrohttpd-dev,
                libmysqlclient-dev,
@@ -28,12 +30,11 @@ Build-Depends: bison,
                libsnmp-dev,
                libxml2-dev,
                libxmlrpc-core-c3-dev,
+               pkg-config,
+               python,
                unixodbc-dev,
                xsltproc,
-               zlib1g-dev,
-               python,
-               dh-python,
-               pkg-config
+               zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: http://www.opensips.org/
 

diff --git a/packaging/debian/rules b/packaging/debian/rules
@@ -207,6 +207,7 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	dh_auto_clean -- $(VARS) include_modules="$(ALL_MODULES)" proper
 	rm -f cfg.tab.h
+	rm -f Makefile.conf
 	rm -f utils/opensipsunix/opensipsunix.o utils/opensipsunix/opensipsunix
 	rm -f utils/db_berkeley/bdb_recover.o utils/db_berkeley/bdb_recover
 
@@ -262,6 +263,9 @@ override_dh_auto_install:
 override_dh_strip:
 	dh_strip --dbg-package=opensips-dbg
 
+override_dh_auto_test:
+	#Disable tests, too old and they are obsolete
+
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"