[Pkg-gnutls-commits] r1881 - in /packages/gnutls28/trunk/debian: changelog patches/30_forcesystemlibopts.diff patches/40_Clean-up-after-test.patch patches/series rules source/options

Sun Aug 25 08:27:00 UTC 2013

Author: ametzler
Date: Sun Aug 25 08:26:57 2013
New Revision: 1881

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1881
Log:
fix make distclean

Added:
    packages/gnutls28/trunk/debian/patches/40_Clean-up-after-test.patch
Modified:
    packages/gnutls28/trunk/debian/changelog
    packages/gnutls28/trunk/debian/patches/30_forcesystemlibopts.diff
    packages/gnutls28/trunk/debian/patches/series
    packages/gnutls28/trunk/debian/rules
    packages/gnutls28/trunk/debian/source/options

Modified: packages/gnutls28/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/changelog?rev=1881&op=diff
==============================================================================

--- packages/gnutls28/trunk/debian/changelog	(original)
+++ packages/gnutls28/trunk/debian/changelog	Sun Aug 25 08:26:57 2013
@@ -1,10 +1,9 @@
-gnutls28 (3.2.3-3) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
+gnutls28 (3.2.3-3) experimental; urgency=low
+
   * Switch to dh, to easily allow us to move gtk-doc-tools to
     Build-Depends-Indep. Closes: #682596
 
- -- Andreas Metzler <ametzler at debian.org>  Sun, 04 Aug 2013 14:09:53 +0200
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 25 Aug 2013 10:25:52 +0200
 
 gnutls28 (3.2.3-2) experimental; urgency=low
 

Modified: packages/gnutls28/trunk/debian/patches/30_forcesystemlibopts.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/30_forcesystemlibopts.diff?rev=1881&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/patches/30_forcesystemlibopts.diff	(original)
+++ packages/gnutls28/trunk/debian/patches/30_forcesystemlibopts.diff	Sun Aug 25 08:26:57 2013
@@ -1,13 +1,39 @@
 Description: Link against debian libopts.
 Author: Andreas Metzler <ametzler at debian.org>
+Last-Update: 2013-08-24
 
---- gnutls28-3.0.15.orig/configure
-+++ gnutls28-3.0.15/configure
-@@ -14261,6 +14261,7 @@ _ACEOF
-   NEED_LIBOPTS_DIR=''
+--- gnutls28-3.2.3.orig/configure
++++ gnutls28-3.2.3/configure
+@@ -52951,10 +52951,6 @@ else
+ fi
  
+ 
+-enable_local_libopts=yes
+-
+-NEED_LIBOPTS_DIR=true
+-
+ 
+   ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+@@ -53917,9 +53913,6 @@ _ACEOF
+ 
+   LIBOPTS_BUILD_BLOCKED=''
+ 
+-
+-  NEED_LIBOPTS_DIR=''
+-
    # Check whether --enable-local-libopts was given.
-+enable_local_libopts='no'
  if test "${enable_local_libopts+set}" = set; then :
    enableval=$enable_local_libopts;
-     if test x$enableval = xyes ; then
+@@ -54517,10 +54510,10 @@ $as_echo "#define NO_OPTIONAL_OPT_ARGS 1
+ 
+ 
+ 
+-    ac_config_files="$ac_config_files src/libopts/Makefile"
+ 
+ 
+           fi    # end of AC_DEFUN of LIBOPTS_CHECK
++ac_config_files="$ac_config_files src/libopts/Makefile"
+ 
+ 
+ ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "

Added: packages/gnutls28/trunk/debian/patches/40_Clean-up-after-test.patch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/40_Clean-up-after-test.patch?rev=1881&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/patches/40_Clean-up-after-test.patch	(added)
+++ packages/gnutls28/trunk/debian/patches/40_Clean-up-after-test.patch	Sun Aug 25 08:26:57 2013
@@ -0,0 +1,24 @@
+From 9b3fccf68d34a96585bb4311e7b2d7dd86864e91 Mon Sep 17 00:00:00 2001
+From: Andreas Metzler <ametzler at downhill.at.eu.org>
+Date: Sat, 24 Aug 2013 16:14:03 +0200
+Subject: [PATCH 1/5] Clean up after test.
+
+---
+ tests/sha2/sha2 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/sha2/sha2 b/tests/sha2/sha2
+index 7dcd36a..c8e3b71 100755
+--- a/tests/sha2/sha2
++++ b/tests/sha2/sha2
+@@ -89,6 +89,6 @@ if test "$num" != "4"; then
+     exit 1
+ fi
+ 
+-rm -f verify-sha2 new-user.pem new-subsubca.pem new-subca.pem new-ca.pem template-sha2
++rm -f verify-sha2 new-user.pem new-subsubca.pem new-subca.pem new-ca.pem template-sha2 out
+ 
+ exit 0
+-- 
+1.7.10.4
+

Modified: packages/gnutls28/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/series?rev=1881&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/patches/series	(original)
+++ packages/gnutls28/trunk/debian/patches/series	Sun Aug 25 08:26:57 2013
@@ -1,2 +1,3 @@
 14_version_gettextcat.diff
 30_forcesystemlibopts.diff
+40_Clean-up-after-test.patch

Modified: packages/gnutls28/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/rules?rev=1881&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/rules	(original)
+++ packages/gnutls28/trunk/debian/rules	Sun Aug 25 08:26:57 2013
@@ -37,7 +37,8 @@
 override_dh_auto_clean:
 	if [ -e doc/gnutls.pdf ] ; then \
 		mv -v doc/gnutls.pdf doc/gnutls.pdf.debbackup ; fi
-	dh_auto_clean --verbose
+	if test -e Makefile ; then $(MAKE) distclean ; fi
+	#dh_auto_clean --verbose
 	# restore gnutls.pdf
 	if [ -e doc/gnutls.pdf.debbackup ] && [ ! -e doc/gnutls.pdf ] ; \
 		then mv -v doc/gnutls.pdf.debbackup doc/gnutls.pdf ; fi
@@ -47,12 +48,12 @@
 		rm -v $$i src/$$t.h;\
 		done
 	rm -fv `grep -l 'has been AutoGen-ed ' doc/manpages/*.?`
-	rm -f config.h config.log config.status lib/includes/gnutls/gnutls.h \
-		lib/gnutls.pc libdane/gnutls-dane.pc libtool stamp* \
-		guile/pre-inst-guile tests/sha2/out
 
-override_dh_auto_build-indep:
+override_dh_auto_build:
+	dh_auto_build --verbose --parallel
+ifeq ($(filter --disable-doc,$(AMCONFBUILDINDEP)),)
 	$(MAKE) html
+endif
 
 override_dh_auto_install:
 	dh_auto_install --verbose

Modified: packages/gnutls28/trunk/debian/source/options
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/source/options?rev=1881&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/source/options	(original)
+++ packages/gnutls28/trunk/debian/source/options	Sun Aug 25 08:26:57 2013
@@ -1,2 +1,2 @@
 # Don't store changes on autogenerated files
-extend-diff-ignore = "doc/.*\.(html|info.*)$|Makefile$|doc/.*|po/.*|\.dirstamp$"
+extend-diff-ignore = "po/.*"


