rev 9880 - in kde-extras/tora/trunk/debian: . patches

[Michael Meskes]

Author: meskes
Date: 2008-03-27 09:22:13 +0000 (Thu, 27 Mar 2008)
New Revision: 9880

Added:
   kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch
Removed:
   kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch
Modified:
   kde-extras/tora/trunk/debian/changelog
   kde-extras/tora/trunk/debian/rules
Log:
Preparing upload for new upstream version.



Modified: kde-extras/tora/trunk/debian/changelog
===================================================================
--- kde-extras/tora/trunk/debian/changelog	2008-03-26 23:41:10 UTC (rev 9879)
+++ kde-extras/tora/trunk/debian/changelog	2008-03-27 09:22:13 UTC (rev 9880)
@@ -1,3 +1,10 @@
+tora (1.3.23-1) unstable; urgency=low
+
+  * New upstream version
+  * Moved config.* handling from clean target to configure target.
+
+ -- Michael Meskes <meskes at debian.org>  Wed, 26 Mar 2008 09:55:07 +0100
+
 tora (1.3.22-7) unstable; urgency=low
 
   * Removed build dependency on libqt3-compat-headers, closes: #464914

Deleted: kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch

Added: kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch
===================================================================
--- kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch	                        (rev 0)
+++ kde-extras/tora/trunk/debian/patches/02_cleantarget.dpatch	2008-03-27 09:22:13 UTC (rev 9880)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_cleantarget by <meskes at debian.org>
+##
+## DP: Do not remove files that are part of the orig tarball,
+## DP: even if this files can be regenerated.
+--- tora-1.3.22/src/Makefile.in.orig	2007-09-21 13:58:19.000000000 +0200
++++ tora-1.3.22/src/Makefile.in	2007-09-21 13:59:30.000000000 +0200
+@@ -4220,10 +4220,6 @@
+ 
+ clean-local:
+ 	rm -f *.moc
+-	for file in `ls *.ui`; do \
+-		rm -f `echo $$file | sed 's/\.ui/\.cpp/g'`; \
+-		rm -f `echo $$file | sed 's/\.ui/\.h/g'`; \
+-	done
+ 
+ tora_toad.h: i18n/tora_toad.qm
+ 	$(top_builddir)/utils/chex/chex $< > $@
+--- tora-1.3.22/src/Makefile.am.orig	2007-09-21 13:59:11.000000000 +0200
++++ tora-1.3.22/src/Makefile.am	2007-09-21 13:59:37.000000000 +0200
+@@ -724,10 +724,6 @@
+ 
+ clean-local:
+ 	rm -f *.moc
+-	for file in `ls *.ui`; do \
+-		rm -f `echo $$file | sed 's/\.ui/\.cpp/g'`; \
+-		rm -f `echo $$file | sed 's/\.ui/\.h/g'`; \
+-	done
+ 
+ tora_toad.h: i18n/tora_toad.qm
+ 	$(top_builddir)/utils/chex/chex $< > $@

Modified: kde-extras/tora/trunk/debian/rules
===================================================================
--- kde-extras/tora/trunk/debian/rules	2008-03-26 23:41:10 UTC (rev 9879)
+++ kde-extras/tora/trunk/debian/rules	2008-03-27 09:22:13 UTC (rev 9880)
@@ -14,8 +14,15 @@
 configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
 	# Add here commands to configure the package.
-	./configure --prefix=/usr --without-oracle --without-rpath --disable-new-check --with-kde --enable-libsuffix=
+	./configure --prefix=/usr --without-oracle --without-rpath --disable-new-check --with-kde --enable-libsuffix= --infodir=/usr/share/info
 
 	touch configure-stamp
 
@@ -40,12 +47,6 @@
 	find . -name "*.qm" -exec rm {} \;
 	rm -f tora.pro license/tolicenseui.h license/tolicenseui.cpp license/tolicense.moc license/tolicenseui.moc
 	rm -f tora.1
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
 
 	dh_clean