[med-svn] r10587 - in trunk/packages/maq/trunk/debian: . patches

Wed Apr 25 12:40:58 UTC 2012

Author: tille
Date: 2012-04-25 12:40:57 +0000 (Wed, 25 Apr 2012)
New Revision: 10587

Removed:
   trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch
Modified:
   trunk/packages/maq/trunk/debian/changelog
   trunk/packages/maq/trunk/debian/compat
   trunk/packages/maq/trunk/debian/control
   trunk/packages/maq/trunk/debian/docs
   trunk/packages/maq/trunk/debian/patches/series
   trunk/packages/maq/trunk/debian/rules
Log:
Use dh_autoreconf rather than another patch which does not work reliable which in turn implies using dh rather than cdbs; drop explicit quilt dependency; fix debian/docs


Modified: trunk/packages/maq/trunk/debian/changelog
===================================================================

--- trunk/packages/maq/trunk/debian/changelog	2012-04-25 12:24:40 UTC (rev 10586)
+++ trunk/packages/maq/trunk/debian/changelog	2012-04-25 12:40:57 UTC (rev 10587)
@@ -9,7 +9,7 @@
      - Moved PMID to references
   * debian/source/format: 3.0 (quilt)
   * debian/reference: removed because references are kept in
-    debian/upstream
+    debian/upstream (also removed from debian/docs)
   * debian/control:
      - Standards-Version: 3.9.3 (no changes needed)
      - Fixed Vcs fields

Modified: trunk/packages/maq/trunk/debian/compat
===================================================================
--- trunk/packages/maq/trunk/debian/compat	2012-04-25 12:24:40 UTC (rev 10586)
+++ trunk/packages/maq/trunk/debian/compat	2012-04-25 12:40:57 UTC (rev 10587)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/maq/trunk/debian/control
===================================================================
--- trunk/packages/maq/trunk/debian/control	2012-04-25 12:24:40 UTC (rev 10586)
+++ trunk/packages/maq/trunk/debian/control	2012-04-25 12:40:57 UTC (rev 10587)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>,
  Charles Plessy <plessy at debian.org>
-Build-Depends: cdbs, debhelper (>= 8), autotools-dev, zlib1g-dev, quilt
+Build-Depends: debhelper (>= 9), autotools-dev, zlib1g-dev, dh-autoreconf
 Standards-Version: 3.9.3
 Homepage: http://maq.sourceforge.net/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/maq/trunk/

Modified: trunk/packages/maq/trunk/debian/docs
===================================================================
--- trunk/packages/maq/trunk/debian/docs	2012-04-25 12:24:40 UTC (rev 10586)
+++ trunk/packages/maq/trunk/debian/docs	2012-04-25 12:40:57 UTC (rev 10587)
@@ -1,4 +1,3 @@
-NEWS
 README
+AUTHORS
 maq.pdf
-debian/reference

Deleted: trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch
===================================================================
--- trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch	2012-04-25 12:24:40 UTC (rev 10586)
+++ trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch	2012-04-25 12:40:57 UTC (rev 10587)
@@ -1,64 +0,0 @@
-Author: autoreconf
-Forwarded: not-needed
-Description: autoreconf 2.62 ran after applying 10_prevent_-64_option.patch
- By applying this patch, we do not need to do some autoreconf magic at
- build time.
-diff --git a/configure b/configure
-index 240b0ff..568a609 100755
---- a/configure
-+++ b/configure
-@@ -3822,53 +3822,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;;
- 	esac;;
-   *)
--    { $as_echo "$as_me:$LINENO: checking if gcc accepts -m64" >&5
--$as_echo_n "checking if gcc accepts -m64... " >&6; }
--    CFLAGS="-m64"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ext_CFLAGS="-m64"; { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ext_CFLAGS="-D_FILE_OFFSET_BITS=64"; { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;;
-+    ext_CFLAGS="-D_FILE_OFFSET_BITS=64";;
- esac
- # Check whether --enable-experimental was given.
- if test "${enable_experimental+set}" = set; then

Modified: trunk/packages/maq/trunk/debian/patches/series
===================================================================
--- trunk/packages/maq/trunk/debian/patches/series	2012-04-25 12:24:40 UTC (rev 10586)
+++ trunk/packages/maq/trunk/debian/patches/series	2012-04-25 12:40:57 UTC (rev 10587)
@@ -1,2 +1 @@
 10_prevent_-64_option.patch
-20_prevent_-64_option.patch

Modified: trunk/packages/maq/trunk/debian/rules
===================================================================
--- trunk/packages/maq/trunk/debian/rules	2012-04-25 12:24:40 UTC (rev 10586)
+++ trunk/packages/maq/trunk/debian/rules	2012-04-25 12:40:57 UTC (rev 10587)
@@ -3,12 +3,12 @@
 # (C) Charles Plessy, Andreas Tille
 # GPL
 
-DEB_COMPRESS_EXCLUDE := .pdf    # The PDF doc will not be compressed
-
 #needed to make the zlib headers behave (they don't like the combination
 #of _FILE_OFFSET_BITS=64 but not _LARGEFILE64_SOURCE
 CFLAGS+= -D_LARGEFILE64_SOURCE
 
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@ --with autoreconf
+
+override_dh_compress:
+	dh_compress --exclude=.pdf


