rev 6287 - in kde-extras/digikam-doc/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Sat May 19 15:45:06 UTC 2007
Author: msp
Date: 2007-05-19 15:45:05 +0000 (Sat, 19 May 2007)
New Revision: 6287
Added:
kde-extras/digikam-doc/trunk/debian/patches/lang-en.patch
Removed:
kde-extras/digikam-doc/trunk/debian/patches/lang-en.diff
Modified:
kde-extras/digikam-doc/trunk/debian/changelog
kde-extras/digikam-doc/trunk/debian/rules
Log:
* Conflict:/ Replaces: digikamimageplugins-doc, merged upstream
* Upstream is only shipping en docs, debian/patches/lang-en.patch to
correct configure{.in}
Modified: kde-extras/digikam-doc/trunk/debian/changelog
===================================================================
--- kde-extras/digikam-doc/trunk/debian/changelog 2007-05-19 12:24:52 UTC (rev 6286)
+++ kde-extras/digikam-doc/trunk/debian/changelog 2007-05-19 15:45:05 UTC (rev 6287)
@@ -1,12 +1,17 @@
digikam-doc (0.9.2~beta1-1) UNRELEASED; urgency=low
+ [ Debian KDE Extras Team ]
* NOT RELEASED YET
* New Upstream Release
- * Conflict:/ Replaces: digikamimageplugins-doc, upstream merged
+ * Conflict:/ Replaces: digikamimageplugins-doc, merged upstream
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Thu, 10 May 2007 08:42:17 +0100
+ [ Mark Purcell ]
+ * Upstream is only shipping en docs, debian/patches/lang-en.patch to
+ correct configure{.in}
+ -- Mark Purcell <msp at debian.org> Sat, 19 May 2007 13:15:11 +0100
+
digikam-doc (0.9.1-1) unstable; urgency=low
* New upstream release
Deleted: kde-extras/digikam-doc/trunk/debian/patches/lang-en.diff
Added: kde-extras/digikam-doc/trunk/debian/patches/lang-en.patch
===================================================================
--- kde-extras/digikam-doc/trunk/debian/patches/lang-en.patch (rev 0)
+++ kde-extras/digikam-doc/trunk/debian/patches/lang-en.patch 2007-05-19 15:45:05 UTC (rev 6287)
@@ -0,0 +1,111 @@
+diff -Nur digikam-doc-0.9.2~beta1/configure digikam-doc-0.9.2~beta1.new/configure
+--- digikam-doc-0.9.2~beta1/configure 2007-05-05 21:14:32.000000000 +0100
++++ digikam-doc-0.9.2~beta1.new/configure 2007-05-19 13:17:39.000000000 +0100
+@@ -33164,42 +33164,8 @@
+
+ ac_config_files="$ac_config_files doc/Makefile"
+
+-ac_config_files="$ac_config_files doc/da_digikam/Makefile"
+-
+-ac_config_files="$ac_config_files doc/de_digikam/Makefile"
+-
+ ac_config_files="$ac_config_files doc/digikam/Makefile"
+
+-ac_config_files="$ac_config_files doc/es_digikam/Makefile"
+-
+-ac_config_files="$ac_config_files doc/es_showfoto/Makefile"
+-
+-ac_config_files="$ac_config_files doc/et_digikam/Makefile"
+-
+-ac_config_files="$ac_config_files doc/et_showfoto/Makefile"
+-
+-ac_config_files="$ac_config_files doc/fr_showfoto/Makefile"
+-
+-ac_config_files="$ac_config_files doc/it_digikam/Makefile"
+-
+-ac_config_files="$ac_config_files doc/nl_digikam/Makefile"
+-
+-ac_config_files="$ac_config_files doc/nl_showfoto/Makefile"
+-
+-ac_config_files="$ac_config_files doc/pl_digikam/Makefile"
+-
+-ac_config_files="$ac_config_files doc/pl_showfoto/Makefile"
+-
+-ac_config_files="$ac_config_files doc/pt_BR_digikam/Makefile"
+-
+-ac_config_files="$ac_config_files doc/pt_digikam/Makefile"
+-
+-ac_config_files="$ac_config_files doc/pt_showfoto/Makefile"
+-
+-ac_config_files="$ac_config_files doc/ru_digikam/Makefile"
+-
+-ac_config_files="$ac_config_files doc/sv_digikam/Makefile"
+-
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -33815,24 +33781,7 @@
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+- "doc/da_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/da_digikam/Makefile" ;;
+- "doc/de_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/de_digikam/Makefile" ;;
+ "doc/digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/digikam/Makefile" ;;
+- "doc/es_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/es_digikam/Makefile" ;;
+- "doc/es_showfoto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/es_showfoto/Makefile" ;;
+- "doc/et_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/et_digikam/Makefile" ;;
+- "doc/et_showfoto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/et_showfoto/Makefile" ;;
+- "doc/fr_showfoto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/fr_showfoto/Makefile" ;;
+- "doc/it_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/it_digikam/Makefile" ;;
+- "doc/nl_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/nl_digikam/Makefile" ;;
+- "doc/nl_showfoto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/nl_showfoto/Makefile" ;;
+- "doc/pl_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pl_digikam/Makefile" ;;
+- "doc/pl_showfoto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pl_showfoto/Makefile" ;;
+- "doc/pt_BR_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt_BR_digikam/Makefile" ;;
+- "doc/pt_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt_digikam/Makefile" ;;
+- "doc/pt_showfoto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt_showfoto/Makefile" ;;
+- "doc/ru_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ru_digikam/Makefile" ;;
+- "doc/sv_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/sv_digikam/Makefile" ;;
+
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+@@ -34799,11 +34748,6 @@
+
+ { (exit 0); exit 0; }
+ _ACEOF
+-if test "x$with_fast_perl" = "xyes"; then
+- perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS \
+- || mv $CONFIG_STATUS.bak $CONFIG_STATUS
+- rm -f $CONFIG_STATUS.bak
+-fi
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+
+diff -Nur digikam-doc-0.9.2~beta1/configure.in digikam-doc-0.9.2~beta1.new/configure.in
+--- digikam-doc-0.9.2~beta1/configure.in 2007-05-05 21:14:21.000000000 +0100
++++ digikam-doc-0.9.2~beta1.new/configure.in 2007-05-19 13:17:33.000000000 +0100
+@@ -78,24 +78,7 @@
+ AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
+ AC_CONFIG_FILES([ Makefile ])
+ AC_CONFIG_FILES([ doc/Makefile ])
+-AC_CONFIG_FILES([ doc/da_digikam/Makefile ])
+-AC_CONFIG_FILES([ doc/de_digikam/Makefile ])
+ AC_CONFIG_FILES([ doc/digikam/Makefile ])
+-AC_CONFIG_FILES([ doc/es_digikam/Makefile ])
+-AC_CONFIG_FILES([ doc/es_showfoto/Makefile ])
+-AC_CONFIG_FILES([ doc/et_digikam/Makefile ])
+-AC_CONFIG_FILES([ doc/et_showfoto/Makefile ])
+-AC_CONFIG_FILES([ doc/fr_showfoto/Makefile ])
+-AC_CONFIG_FILES([ doc/it_digikam/Makefile ])
+-AC_CONFIG_FILES([ doc/nl_digikam/Makefile ])
+-AC_CONFIG_FILES([ doc/nl_showfoto/Makefile ])
+-AC_CONFIG_FILES([ doc/pl_digikam/Makefile ])
+-AC_CONFIG_FILES([ doc/pl_showfoto/Makefile ])
+-AC_CONFIG_FILES([ doc/pt_BR_digikam/Makefile ])
+-AC_CONFIG_FILES([ doc/pt_digikam/Makefile ])
+-AC_CONFIG_FILES([ doc/pt_showfoto/Makefile ])
+-AC_CONFIG_FILES([ doc/ru_digikam/Makefile ])
+-AC_CONFIG_FILES([ doc/sv_digikam/Makefile ])
+ AC_OUTPUT
+ dnl Put here things to be done at the very end - telling users
+ dnl about additional packages to install. Better yet is giving
Modified: kde-extras/digikam-doc/trunk/debian/rules
===================================================================
--- kde-extras/digikam-doc/trunk/debian/rules 2007-05-19 12:24:52 UTC (rev 6286)
+++ kde-extras/digikam-doc/trunk/debian/rules 2007-05-19 15:45:05 UTC (rev 6287)
@@ -5,8 +5,6 @@
include /usr/share/cdbs/1/class/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_AUTO_UPDATE_AUTOCONF := true
-
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
More information about the pkg-kde-commits
mailing list