[med-svn] r9331 - in trunk/packages/rostlab/libzerg/trunk/debian: . patches

Andreas Tille tille at alioth.debian.org
Wed Jan 18 12:40:04 UTC 2012 

Author: tille
Date: 2012-01-18 12:40:04 +0000 (Wed, 18 Jan 2012)
New Revision: 9331

Added:
   trunk/packages/rostlab/libzerg/trunk/debian/patches/save_makefile.patch
Modified:
   trunk/packages/rostlab/libzerg/trunk/debian/changelog
   trunk/packages/rostlab/libzerg/trunk/debian/control
   trunk/packages/rostlab/libzerg/trunk/debian/patches/autotools
   trunk/packages/rostlab/libzerg/trunk/debian/patches/blastpgp
   trunk/packages/rostlab/libzerg/trunk/debian/patches/series
   trunk/packages/rostlab/libzerg/trunk/debian/rules
Log:
Make sure the package can be builded twice in a row


Modified: trunk/packages/rostlab/libzerg/trunk/debian/changelog
===================================================================
--- trunk/packages/rostlab/libzerg/trunk/debian/changelog	2012-01-18 12:38:59 UTC (rev 9330)
+++ trunk/packages/rostlab/libzerg/trunk/debian/changelog	2012-01-18 12:40:04 UTC (rev 9331)
@@ -1,5 +1,6 @@
 libzerg (1.0.7-3) unstable; urgency=low
 
+  [ Laszlo Kajan ]
   * Tille: debian/upstream-metadata.yaml: Added some missing fields
     Tue, 10 Jan 2012 08:30:18 +0100
   * Kajan: Renamed libzerg-dev to libzerg0-dev, Provides: libzerg-dev
@@ -7,8 +8,13 @@
   * dh build now, no more CDBS, with dh-autoreconf.
   * No more debian-changes patches.
 
- -- Laszlo Kajan <lkajan at rostlab.org>  Wed, 18 Jan 2012 12:07:20 +0100
+  [ Andreas Tille ]
+  * debian/patches/save_makefile.patch
+    - Make sure original Makefile can be restored
+  * debian/rules: Fixed clean target
 
+ -- Andreas Tille <tille at debian.org>  Wed, 18 Jan 2012 13:35:10 +0100
+
 libzerg (1.0.7-2) unstable; urgency=low
 
   * Patched lexer to handle blastpgp [2.2.18] output.

Modified: trunk/packages/rostlab/libzerg/trunk/debian/control
===================================================================
--- trunk/packages/rostlab/libzerg/trunk/debian/control	2012-01-18 12:38:59 UTC (rev 9330)
+++ trunk/packages/rostlab/libzerg/trunk/debian/control	2012-01-18 12:40:04 UTC (rev 9331)
@@ -2,7 +2,8 @@
 Section: science
 Priority: extra
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Laszlo Kajan <lkajan at rostlab.org>
+Uploaders: Laszlo Kajan <lkajan at rostlab.org>,
+ Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, flex, perl
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/rostlab/libzerg/trunk/

Modified: trunk/packages/rostlab/libzerg/trunk/debian/patches/autotools
===================================================================
--- trunk/packages/rostlab/libzerg/trunk/debian/patches/autotools	2012-01-18 12:38:59 UTC (rev 9330)
+++ trunk/packages/rostlab/libzerg/trunk/debian/patches/autotools	2012-01-18 12:40:04 UTC (rev 9331)
@@ -1,13 +1,9 @@
-Index: libzerg-1.0.7/AUTHORS
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libzerg-1.0.7/AUTHORS	2012-01-18 11:27:33.000000000 +0100
+--- /dev/null
++++ libzerg/AUTHORS
 @@ -0,0 +1 @@
 +Copyright (C) 2002  Apuã Paquola - Instituto de Química - Universidade de São Paulo - Brasil
-Index: libzerg-1.0.7/Makefile.am
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libzerg-1.0.7/Makefile.am	2012-01-18 11:39:04.384243056 +0100
+--- /dev/null
++++ libzerg/Makefile.am
 @@ -0,0 +1,16 @@
 +ACLOCAL_AMFLAGS = -I m4
 +
@@ -25,10 +21,8 @@
 +
 +clean-local:
 +	rm -f zerglexer.c lex.zerg.c
-Index: libzerg-1.0.7/configure.ac
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libzerg-1.0.7/configure.ac	2012-01-18 11:27:33.000000000 +0100
+--- /dev/null
++++ libzerg/configure.ac
 @@ -0,0 +1,12 @@
 +AC_INIT([libzerg], [1.0.7], [debian-med-packaging at lists.alioth.debian.org])
 +AC_CONFIG_MACRO_DIR([m4])
@@ -42,9 +36,7 @@
 +
 +AC_CONFIG_FILES([Makefile])
 +AC_OUTPUT
-Index: libzerg-1.0.7/m4/.createdir
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libzerg-1.0.7/m4/.createdir	2012-01-18 11:39:46.628242847 +0100
+--- /dev/null
++++ libzerg/m4/.createdir
 @@ -0,0 +1 @@
 +create this directory

Modified: trunk/packages/rostlab/libzerg/trunk/debian/patches/blastpgp
===================================================================
--- trunk/packages/rostlab/libzerg/trunk/debian/patches/blastpgp	2012-01-18 12:38:59 UTC (rev 9330)
+++ trunk/packages/rostlab/libzerg/trunk/debian/patches/blastpgp	2012-01-18 12:40:04 UTC (rev 9331)
@@ -1,7 +1,5 @@
-Index: libzerg-1.0.7/zerglexer.lex
-===================================================================
---- libzerg-1.0.7.orig/zerglexer.lex	2012-01-18 10:48:59.816242808 +0100
-+++ libzerg-1.0.7/zerglexer.lex	2012-01-18 11:13:05.372241974 +0100
+--- libzerg.orig/zerglexer.lex
++++ libzerg/zerglexer.lex
 @@ -35,10 +35,11 @@
  static char _zerg_internal_buffer[INTERNAL_BUFFER_LENGTH];
  static char* _zerg_description_score;
@@ -409,10 +407,8 @@
  }
 +
 +// vim:et:ts=2:
-Index: libzerg-1.0.7/zerg.h
-===================================================================
---- libzerg-1.0.7.orig/zerg.h	2012-01-18 10:48:59.840242614 +0100
-+++ libzerg-1.0.7/zerg.h	2012-01-18 11:13:05.376242356 +0100
+--- libzerg.orig/zerg.h
++++ libzerg/zerg.h
 @@ -6,37 +6,51 @@
  #ifndef _zerg_h_
  #define _zerg_h_
@@ -504,10 +500,8 @@
  void zerg_ignore(int code);
  void zerg_ignore_all();
  void zerg_unignore(int code);
-Index: libzerg-1.0.7/Makefile.am
-===================================================================
---- libzerg-1.0.7.orig/Makefile.am	2012-01-18 11:09:28.568242624 +0100
-+++ libzerg-1.0.7/Makefile.am	2012-01-18 11:13:05.388243106 +0100
+--- libzerg.orig/Makefile.am
++++ libzerg/Makefile.am
 @@ -4,7 +4,7 @@
  
  lib_LTLIBRARIES = libzerg.la

Added: trunk/packages/rostlab/libzerg/trunk/debian/patches/save_makefile.patch
===================================================================
--- trunk/packages/rostlab/libzerg/trunk/debian/patches/save_makefile.patch	                        (rev 0)
+++ trunk/packages/rostlab/libzerg/trunk/debian/patches/save_makefile.patch	2012-01-18 12:40:04 UTC (rev 9331)
@@ -0,0 +1,30 @@
+Author: Andreas Tille <tille at debian.org>
+Description: Save original Makefile to enable proper restauration of original state
+
+--- libzerg.orig/Makefile
++++ /dev/null
+@@ -1,24 +0,0 @@
+-CC=gcc
+-CFLAGS=-O3 -fPIC
+-LOADLIBES=libzerg.a
+-PREFIX=/usr/local/libzerg
+-
+-libzerg.a: zerglexer.o
+-	ar rc $@ $^
+-	ranlib libzerg.a
+-
+-zerglexer.o: zerglexer.c zerg.h
+-
+-lex.zerg.c: zerglexer.lex
+-	flex -Cf zerglexer.lex
+-
+-zerglexer.c: lex.zerg.c
+-	perl -pe 's/ret_val = EOB_ACT_CONTINUE_SCAN;/ret_val = EOB_ACT_CONTINUE_SCAN;\n\nDESCONTA;/; s/\#define YY_BUF_SIZE 16384/\#define YY_BUF_SIZE 2097152/' lex.zerg.c > zerglexer.c
+-
+-clean:
+-	rm -f *.o *~ zerglexer.c libzerg.a lex.zerg.c
+-
+-install:
+-	mkdir -m 0755 -p ${PREFIX}/lib ${PREFIX}/include; \
+-	cp libzerg.a ${PREFIX}/lib; \
+-	cp zerg.h ${PREFIX}/include

Modified: trunk/packages/rostlab/libzerg/trunk/debian/patches/series
===================================================================
--- trunk/packages/rostlab/libzerg/trunk/debian/patches/series	2012-01-18 12:38:59 UTC (rev 9330)
+++ trunk/packages/rostlab/libzerg/trunk/debian/patches/series	2012-01-18 12:40:04 UTC (rev 9331)
@@ -1,2 +1,3 @@
 autotools
 blastpgp
+save_makefile.patch

Modified: trunk/packages/rostlab/libzerg/trunk/debian/rules
===================================================================
--- trunk/packages/rostlab/libzerg/trunk/debian/rules	2012-01-18 12:38:59 UTC (rev 9330)
+++ trunk/packages/rostlab/libzerg/trunk/debian/rules	2012-01-18 12:40:04 UTC (rev 9331)
@@ -6,6 +6,11 @@
 %:
 	dh --with autoreconf $@ 
 
+override_dh_clean:
+	dh_clean
+	rm -rf *.lo *.la *.o .libs
+	rm -rf *.c libtool stamp-h1 Makefile
+
 .PHONY: override_dh_strip
 override_dh_strip:
 	dh_strip --dbg-package=libzerg0-dbg

More information about the debian-med-commit mailing list