You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/03/13 23:10:17 UTC

svn commit: r517906 - in /incubator/qpid/branches/qpid.0-9: ./ cpp/LICENSE cpp/LICENSE.txt cpp/Makefile.am cpp/NOTICE cpp/NOTICE.txt cpp/README cpp/rpm/Makefile.am

Author: aconway
Date: Tue Mar 13 15:10:16 2007
New Revision: 517906

URL: http://svn.apache.org/viewvc?view=rev&rev=517906
Log:
Merged revisions 499803 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid

........
  r499803 | aconway | 2007-01-25 09:26:45 -0500 (Thu, 25 Jan 2007) | 4 lines
  
  * Removed .txt extension from README NOTICE LICENSE to follow common practice.
  * Updated all references to .txt files.
  * rpm/Makefile.am: Fixed local-clean target to clean up generaed directories.
........

Added:
    incubator/qpid/branches/qpid.0-9/cpp/LICENSE
      - copied unchanged from r499803, incubator/qpid/trunk/qpid/cpp/LICENSE
    incubator/qpid/branches/qpid.0-9/cpp/NOTICE
      - copied unchanged from r499803, incubator/qpid/trunk/qpid/cpp/NOTICE
Removed:
    incubator/qpid/branches/qpid.0-9/cpp/LICENSE.txt
    incubator/qpid/branches/qpid.0-9/cpp/NOTICE.txt
Modified:
    incubator/qpid/branches/qpid.0-9/   (props changed)
    incubator/qpid/branches/qpid.0-9/cpp/Makefile.am
    incubator/qpid/branches/qpid.0-9/cpp/README
    incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am

Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 13 15:10:16 2007
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317,496665,496678,497341,497439,498591,499049,499374
+/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317,496665,496678,497341,497439,498591,499049,499374,499803

Modified: incubator/qpid/branches/qpid.0-9/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/Makefile.am?view=diff&rev=517906&r1=517905&r2=517906
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/Makefile.am Tue Mar 13 15:10:16 2007
@@ -2,7 +2,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = \
-  README README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3 \
+  README-dev DESIGN LICENSE NOTICE README.rhel3 README \
   etc/qpidd \
   $(PACKAGE).spec \
   $(PACKAGE).spec.in

Modified: incubator/qpid/branches/qpid.0-9/cpp/README
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/README?view=diff&rev=517906&r1=517905&r2=517906
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/README (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/README Tue Mar 13 15:10:16 2007
@@ -1,3 +1,5 @@
+= Qpid C++ =
+
 Qpid C++ is a C++ implementation of the AMQP protcol  described at
 http://amqp.org/
 

Modified: incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am?view=diff&rev=517906&r1=517905&r2=517906
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/rpm/Makefile.am Tue Mar 13 15:10:16 2007
@@ -7,8 +7,8 @@
 SPEC=${top_srcdir}/qpidc.spec
 RPMOPTS=--define "_sourcedir ${abs_top_srcdir}" --define "_topdir ${abs_builddir}"
 
-clean:
-	rm -rf BUILD  RPMS  SOURCES  SPECS  SRPMS
+clean-local:
+	-rm -rf BUILD  RPMS  SOURCES  SPECS  SRPMS
 
 .PHONY: rpm srpm dist