rev 5590 - in kde-extras/kwlan: tags tags/0.6.0-1/debian tags/0.6.0-1/debian/patches trunk/debian trunk/debian/patches

Fathi Boudra fboudra-guest at alioth.debian.org
Thu Feb 15 12:43:24 CET 2007


Author: fboudra-guest
Date: 2007-02-15 12:43:22 +0100 (Thu, 15 Feb 2007)
New Revision: 5590

Added:
   kde-extras/kwlan/tags/0.6.0-1/
Removed:
   kde-extras/kwlan/tags/0.6.0-1/debian/patches/11_add_doc_installation.diff
   kde-extras/kwlan/trunk/debian/patches/11_add_doc_installation.diff
Modified:
   kde-extras/kwlan/tags/0.6.0-1/debian/changelog
   kde-extras/kwlan/tags/0.6.0-1/debian/patches/02_autotools_update.diff
   kde-extras/kwlan/tags/0.6.0-1/debian/patches/03_libtool_update.diff
   kde-extras/kwlan/tags/0.6.0-1/debian/patches/10_kdepot.diff
   kde-extras/kwlan/tags/0.6.0-1/debian/rules
   kde-extras/kwlan/trunk/debian/changelog
   kde-extras/kwlan/trunk/debian/patches/02_autotools_update.diff
   kde-extras/kwlan/trunk/debian/patches/03_libtool_update.diff
   kde-extras/kwlan/trunk/debian/patches/10_kdepot.diff
   kde-extras/kwlan/trunk/debian/rules
Log:
tags kwlan 0.6.0-1

Copied: kde-extras/kwlan/tags/0.6.0-1 (from rev 5589, kde-extras/kwlan/trunk)

Modified: kde-extras/kwlan/tags/0.6.0-1/debian/changelog
===================================================================
--- kde-extras/kwlan/trunk/debian/changelog	2007-02-14 22:43:00 UTC (rev 5589)
+++ kde-extras/kwlan/tags/0.6.0-1/debian/changelog	2007-02-15 11:43:22 UTC (rev 5590)
@@ -1,8 +1,11 @@
-kwlan (0.5.8-2) UNRELEASED; urgency=low
+kwlan (0.6.0-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Update kdepot patch.
+  * Remove 11_add_doc_installation patch.
+  * Clean up rules.
 
- -- Mark Purcell <msp at debian.org>  Sun,  7 Jan 2007 12:59:58 +0000
+ -- Fathi Boudra <fboudra at free.fr>  Thu, 15 Feb 2007 11:00:25 +0100
 
 kwlan (0.5.8-1) unstable; urgency=low
 

Modified: kde-extras/kwlan/tags/0.6.0-1/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/02_autotools_update.diff	2007-02-14 22:43:00 UTC (rev 5589)
+++ kde-extras/kwlan/tags/0.6.0-1/debian/patches/02_autotools_update.diff	2007-02-15 11:43:22 UTC (rev 5590)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh	2006-11-28 21:36:48.000000000 +0100
-+++ b/admin/install-sh	2006-12-02 19:48:30.000000000 +0100
+--- a/admin/install-sh	2006-12-15 23:42:04.000000000 +0100
++++ b/admin/install-sh	2007-02-15 10:58:51.000000000 +0100
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -291,8 +291,8 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
 diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing	2006-11-28 21:36:48.000000000 +0100
-+++ b/admin/missing	2006-12-02 19:48:30.000000000 +0100
+--- a/admin/missing	2006-12-15 23:42:04.000000000 +0100
++++ b/admin/missing	2007-02-15 10:58:51.000000000 +0100
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.

Modified: kde-extras/kwlan/tags/0.6.0-1/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/03_libtool_update.diff	2007-02-14 22:43:00 UTC (rev 5589)
+++ kde-extras/kwlan/tags/0.6.0-1/debian/patches/03_libtool_update.diff	2007-02-15 11:43:22 UTC (rev 5590)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2006-11-28 21:36:48.000000000 +0100
-+++ b/admin/libtool.m4.in	2006-12-02 19:48:30.000000000 +0100
+--- a/admin/libtool.m4.in	2006-12-15 23:42:04.000000000 +0100
++++ b/admin/libtool.m4.in	2007-02-15 10:58:51.000000000 +0100
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -3795,8 +3795,8 @@
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2006-11-28 21:36:48.000000000 +0100
-+++ b/admin/ltmain.sh	2006-12-02 19:48:30.000000000 +0100
+--- a/admin/ltmain.sh	2006-12-15 23:42:04.000000000 +0100
++++ b/admin/ltmain.sh	2007-02-15 10:58:51.000000000 +0100
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.

Modified: kde-extras/kwlan/tags/0.6.0-1/debian/patches/10_kdepot.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/10_kdepot.diff	2007-02-14 22:43:00 UTC (rev 5589)
+++ kde-extras/kwlan/tags/0.6.0-1/debian/patches/10_kdepot.diff	2007-02-15 11:43:22 UTC (rev 5590)
@@ -1,12 +1,27 @@
-diff -Nur kwlan-0.5.4/admin/cvs.sh kwlan-0.5.4.new/admin/cvs.sh
---- kwlan-0.5.4/admin/cvs.sh	2006-08-23 22:13:14.000000000 +0200
-+++ kwlan-0.5.4.new/admin/cvs.sh	2006-09-21 18:57:47.000000000 +0200
-@@ -560,7 +560,7 @@
+diff -Nur kwlan-0.6.0/admin/cvs.sh kwlan-0.6.0.new/admin/cvs.sh
+--- kwlan-0.6.0/admin/cvs.sh	2006-12-15 23:42:04.000000000 +0100
++++ kwlan-0.6.0.new/admin/cvs.sh	2007-02-15 12:22:45.000000000 +0100
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+ 
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+   test -z "$VERBOSE" || echo "Making messages in $subdir"
+   (cd $subdir
+@@ -554,10 +556,10 @@
     fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
+-   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+-   if ! test -f $kdepotpath; then
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+-   fi
++#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++#   if ! test -f $kdepotpath; then
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++#   fi
+ 
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
--	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
-+	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $kdepotpath" \
-    exit_code=$?
-    if test "$exit_code" != 0; then
-        echo "make exit code: $exit_code"
+ 	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages

Deleted: kde-extras/kwlan/tags/0.6.0-1/debian/patches/11_add_doc_installation.diff

Modified: kde-extras/kwlan/tags/0.6.0-1/debian/rules
===================================================================
--- kde-extras/kwlan/trunk/debian/rules	2007-02-14 22:43:00 UTC (rev 5589)
+++ kde-extras/kwlan/tags/0.6.0-1/debian/rules	2007-02-15 11:43:22 UTC (rev 5590)
@@ -5,9 +5,6 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_BUILDDIR = .
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-sudo
-
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]

Modified: kde-extras/kwlan/trunk/debian/changelog
===================================================================
--- kde-extras/kwlan/trunk/debian/changelog	2007-02-14 22:43:00 UTC (rev 5589)
+++ kde-extras/kwlan/trunk/debian/changelog	2007-02-15 11:43:22 UTC (rev 5590)
@@ -1,8 +1,11 @@
-kwlan (0.5.8-2) UNRELEASED; urgency=low
+kwlan (0.6.0-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Update kdepot patch.
+  * Remove 11_add_doc_installation patch.
+  * Clean up rules.
 
- -- Mark Purcell <msp at debian.org>  Sun,  7 Jan 2007 12:59:58 +0000
+ -- Fathi Boudra <fboudra at free.fr>  Thu, 15 Feb 2007 11:00:25 +0100
 
 kwlan (0.5.8-1) unstable; urgency=low
 

Modified: kde-extras/kwlan/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/02_autotools_update.diff	2007-02-14 22:43:00 UTC (rev 5589)
+++ kde-extras/kwlan/trunk/debian/patches/02_autotools_update.diff	2007-02-15 11:43:22 UTC (rev 5590)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh	2006-11-28 21:36:48.000000000 +0100
-+++ b/admin/install-sh	2006-12-02 19:48:30.000000000 +0100
+--- a/admin/install-sh	2006-12-15 23:42:04.000000000 +0100
++++ b/admin/install-sh	2007-02-15 10:58:51.000000000 +0100
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -291,8 +291,8 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
 diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing	2006-11-28 21:36:48.000000000 +0100
-+++ b/admin/missing	2006-12-02 19:48:30.000000000 +0100
+--- a/admin/missing	2006-12-15 23:42:04.000000000 +0100
++++ b/admin/missing	2007-02-15 10:58:51.000000000 +0100
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.

Modified: kde-extras/kwlan/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/03_libtool_update.diff	2007-02-14 22:43:00 UTC (rev 5589)
+++ kde-extras/kwlan/trunk/debian/patches/03_libtool_update.diff	2007-02-15 11:43:22 UTC (rev 5590)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2006-11-28 21:36:48.000000000 +0100
-+++ b/admin/libtool.m4.in	2006-12-02 19:48:30.000000000 +0100
+--- a/admin/libtool.m4.in	2006-12-15 23:42:04.000000000 +0100
++++ b/admin/libtool.m4.in	2007-02-15 10:58:51.000000000 +0100
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -3795,8 +3795,8 @@
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2006-11-28 21:36:48.000000000 +0100
-+++ b/admin/ltmain.sh	2006-12-02 19:48:30.000000000 +0100
+--- a/admin/ltmain.sh	2006-12-15 23:42:04.000000000 +0100
++++ b/admin/ltmain.sh	2007-02-15 10:58:51.000000000 +0100
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.

Modified: kde-extras/kwlan/trunk/debian/patches/10_kdepot.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/10_kdepot.diff	2007-02-14 22:43:00 UTC (rev 5589)
+++ kde-extras/kwlan/trunk/debian/patches/10_kdepot.diff	2007-02-15 11:43:22 UTC (rev 5590)
@@ -1,12 +1,27 @@
-diff -Nur kwlan-0.5.4/admin/cvs.sh kwlan-0.5.4.new/admin/cvs.sh
---- kwlan-0.5.4/admin/cvs.sh	2006-08-23 22:13:14.000000000 +0200
-+++ kwlan-0.5.4.new/admin/cvs.sh	2006-09-21 18:57:47.000000000 +0200
-@@ -560,7 +560,7 @@
+diff -Nur kwlan-0.6.0/admin/cvs.sh kwlan-0.6.0.new/admin/cvs.sh
+--- kwlan-0.6.0/admin/cvs.sh	2006-12-15 23:42:04.000000000 +0100
++++ kwlan-0.6.0.new/admin/cvs.sh	2007-02-15 12:22:45.000000000 +0100
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+ 
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+   test -z "$VERBOSE" || echo "Making messages in $subdir"
+   (cd $subdir
+@@ -554,10 +556,10 @@
     fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
+-   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+-   if ! test -f $kdepotpath; then
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+-   fi
++#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++#   if ! test -f $kdepotpath; then
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++#   fi
+ 
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
--	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
-+	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $kdepotpath" \
-    exit_code=$?
-    if test "$exit_code" != 0; then
-        echo "make exit code: $exit_code"
+ 	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages

Deleted: kde-extras/kwlan/trunk/debian/patches/11_add_doc_installation.diff

Modified: kde-extras/kwlan/trunk/debian/rules
===================================================================
--- kde-extras/kwlan/trunk/debian/rules	2007-02-14 22:43:00 UTC (rev 5589)
+++ kde-extras/kwlan/trunk/debian/rules	2007-02-15 11:43:22 UTC (rev 5590)
@@ -5,9 +5,6 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_BUILDDIR = .
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-sudo
-
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]




More information about the pkg-kde-commits mailing list