[Pkg-mysql-commits] r1160 - in trunk: . debian/patches
Monty Taylor
mtaylor-guest at alioth.debian.org
Wed Feb 20 15:18:42 UTC 2008
Author: mtaylor-guest
Date: 2008-02-20 15:18:41 +0000 (Wed, 20 Feb 2008)
New Revision: 1160
Modified:
trunk/
trunk/debian/patches/90_upstreamdebiandir.dpatch
Log:
Updated upstreamdebiandir patch.
Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-02-19 16:18:08.877000093 -0300
committer: Monty Taylor <monty at inaugust.com>
properties:
branch-nick: trunk
+ timestamp: 2008-02-19 16:58:01.111999989 -0300
committer: Monty Taylor <monty at inaugust.com>
properties:
branch-nick: trunk
Name: bzr:revision-id:v3-trunk0
- 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz
608 monty at inaugust.com-20080218184224-jq7u016hfc6gvt16
609 monty at inaugust.com-20080218191319-s202z6cpd2wkk6mx
610 monty at inaugust.com-20080218193205-41o5j3pbcsjpnwhp
611 monty at inaugust.com-20080219191434-rk81tk20rs716j21
612 monty at inaugust.com-20080219191453-lt7mlbmdj6vqmv2z
613 monty at inaugust.com-20080219191808-lm6fzgy5dldmgs00
+ 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz
608 monty at inaugust.com-20080218184224-jq7u016hfc6gvt16
609 monty at inaugust.com-20080218191319-s202z6cpd2wkk6mx
610 monty at inaugust.com-20080218193205-41o5j3pbcsjpnwhp
611 monty at inaugust.com-20080219191434-rk81tk20rs716j21
612 monty at inaugust.com-20080219191453-lt7mlbmdj6vqmv2z
613 monty at inaugust.com-20080219191808-lm6fzgy5dldmgs00
614 monty at inaugust.com-20080219195801-1qsjv2edorbp07gu
Modified: trunk/debian/patches/90_upstreamdebiandir.dpatch
===================================================================
--- trunk/debian/patches/90_upstreamdebiandir.dpatch 2008-02-20 15:18:39 UTC (rev 1159)
+++ trunk/debian/patches/90_upstreamdebiandir.dpatch 2008-02-20 15:18:41 UTC (rev 1160)
@@ -5,19 +5,52 @@
## DP: No description.
@DPATCH@
-diff -urNad mysql-dfsg-5.0-5.0.45~/configure mysql-dfsg-5.0-5.0.45/configure
---- mysql-dfsg-5.0-5.0.45~/configure 2007-07-04 15:10:10.000000000 +0200
-+++ mysql-dfsg-5.0-5.0.45/configure 2007-07-17 14:55:49.000000000 +0200
-@@ -41876,7 +41876,7 @@
+diff -urNad mysql-dfsg-5.0-5.0.51a~/Makefile.am mysql-dfsg-5.0-5.0.51a/Makefile.am
+--- mysql-dfsg-5.0-5.0.51a~/Makefile.am 2008-01-11 12:43:18.000000000 -0200
++++ mysql-dfsg-5.0-5.0.51a/Makefile.am 2008-02-19 16:38:21.948929495 -0300
+@@ -33,7 +33,7 @@
+ @thread_dirs@ pstack \
+ @sql_union_dirs@ scripts @man_dirs@ tests SSL\
+ BUILD netware os2 @libmysqld_dirs@ \
+- @bench_dirs@ support-files @tools_dirs@ win debian
++ @bench_dirs@ support-files @tools_dirs@ win
+ # Run these targets before any others, also make part of clean target,
+ # to make sure we create new links after a clean.
+diff -urNad mysql-dfsg-5.0-5.0.51a~/Makefile.in mysql-dfsg-5.0-5.0.51a/Makefile.in
+--- mysql-dfsg-5.0-5.0.51a~/Makefile.in 2008-02-19 16:34:10.506600613 -0300
++++ mysql-dfsg-5.0-5.0.51a/Makefile.in 2008-02-19 16:37:53.079284308 -0300
+@@ -386,7 +386,7 @@
+ @thread_dirs@ pstack \
+ @sql_union_dirs@ scripts @man_dirs@ tests SSL\
+ BUILD netware os2 @libmysqld_dirs@ \
+- @bench_dirs@ support-files @tools_dirs@ win debian
++ @bench_dirs@ support-files @tools_dirs@ win
+
+ # Run these targets before any others, also make part of clean target,
+@@ -594,7 +594,7 @@
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkdir_p) $(distdir)/bdb $(distdir)/config/ac-macros $(distdir)/debian $(distdir)/include $(distdir)/libmysql $(distdir)/ndb/include $(distdir)/ndb/src
++ $(mkdir_p) $(distdir)/bdb $(distdir)/config/ac-macros $(distdir)/include $(distdir)/libmysql $(distdir)/ndb/include $(distdir)/ndb/src
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+diff -urNad mysql-dfsg-5.0-5.0.51a~/configure mysql-dfsg-5.0-5.0.51a/configure
+--- mysql-dfsg-5.0-5.0.51a~/configure 2008-02-19 16:34:14.378821279 -0300
++++ mysql-dfsg-5.0-5.0.51a/configure 2008-02-19 16:34:53.177032263 -0300
+@@ -41886,7 +41886,7 @@
+
+
# Output results
- ac_config_files="$ac_config_files Makefile extra/Makefile mysys/Makefile strings/Makefile regex/Makefile heap/Makefile myisam/Makefile myisammrg/Makefile os2/Makefile os2/include/Makefile os2/include/sys/Makefile man/Makefile BUILD/Makefile vio/Makefile libmysql/Makefile client/Makefile pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile sql-common/Makefile SSL/Makefile dbug/Makefile scripts/Makefile include/Makefile sql-bench/Makefile server-tools/Makefile server-tools/instance-manager/Makefile tests/Makefile Docs/Makefile support-files/Makefile support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile mysql-test/Makefile netware/Makefile include/mysql_version.h cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile win/Makefile zlib/Makefile debian/Makefile debian/defs.mk debian/control cmd-line-utils/readline/Makefile"
+ ac_config_files="$ac_config_files Makefile extra/Makefile mysys/Makefile strings/Makefile regex/Makefile heap/Makefile myisam/Makefile myisammrg/Makefile os2/Makefile os2/include/Makefile os2/include/sys/Makefile man/Makefile BUILD/Makefile vio/Makefile libmysql/Makefile client/Makefile pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile sql-common/Makefile SSL/Makefile dbug/Makefile scripts/Makefile include/Makefile sql-bench/Makefile server-tools/Makefile server-tools/instance-manager/Makefile tests/Makefile Docs/Makefile support-files/Makefile support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile mysql-test/Makefile netware/Makefile include/mysql_version.h cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile win/Makefile zlib/Makefile cmd-line-utils/readline/Makefile"
ac_config_commands="$ac_config_commands default"
-@@ -42602,9 +42602,6 @@
+@@ -42612,9 +42612,6 @@
"cmd-line-utils/libedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd-line-utils/libedit/Makefile" ;;
"win/Makefile" ) CONFIG_FILES="$CONFIG_FILES win/Makefile" ;;
"zlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES zlib/Makefile" ;;
@@ -27,3 +60,14 @@
"cmd-line-utils/readline/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd-line-utils/readline/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+diff -urNad mysql-dfsg-5.0-5.0.51a~/configure.in mysql-dfsg-5.0-5.0.51a/configure.in
+--- mysql-dfsg-5.0-5.0.51a~/configure.in 2008-02-19 16:34:15.042859120 -0300
++++ mysql-dfsg-5.0-5.0.51a/configure.in 2008-02-19 16:38:06.916072821 -0300
+@@ -3000,7 +3000,6 @@
+ cmd-line-utils/libedit/Makefile dnl
+ win/Makefile dnl
+ zlib/Makefile dnl
+- debian/Makefile debian/defs.mk debian/control dnl
+ cmd-line-utils/readline/Makefile)
+ AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
+ AC_OUTPUT
More information about the Pkg-mysql-commits
mailing list