Fri Jul 20 09:26:51 2012 UTC ()
Back out commit that went to the wrong branch.


(tron)
diff -r1.2052.2.2 -r1.2052.2.3 pkgsrc/doc/CHANGES-2012
diff -r1.11314.2.1 -r1.11314.2.2 pkgsrc/doc/TODO
cvs diff -r1.2052.2.2 -r1.2052.2.3 pkgsrc/doc/CHANGES-2012 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2012 2012/07/20 00:41:31 1.2052.2.2
+++ pkgsrc/doc/CHANGES-2012 2012/07/20 09:26:50 1.2052.2.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2012,v 1.2052.2.2 2012/07/20 00:41:31 gdt Exp $ 1$NetBSD: CHANGES-2012,v 1.2052.2.3 2012/07/20 09:26:50 tron Exp $
2 2
3***************************************************************************** 3*****************************************************************************
4PLEASE NOTE THAT THIS FILE IS ON THE PKGSRC-2012Q2 BRANCH, AND ONLY 4PLEASE NOTE THAT THIS FILE IS ON THE PKGSRC-2012Q2 BRANCH, AND ONLY
5PKGSRC RELEASE ENGINEERING CAN COMMIT FILES TO THIS BRANCH. IT MAY 5PKGSRC RELEASE ENGINEERING CAN COMMIT FILES TO THIS BRANCH. IT MAY
6NOT BE WHAT YOU MEANT TO DO. 6NOT BE WHAT YOU MEANT TO DO.
7***************************************************************************** 7*****************************************************************************
8 8
9Changes to the packages collection and infrastructure in 2012: 9Changes to the packages collection and infrastructure in 2012:
10 10
11 Updated net/xnap to 2.0nb2 [ryoon 2012-01-01] 11 Updated net/xnap to 2.0nb2 [ryoon 2012-01-01]
12 Updated cross/h8300-hms-gcc to 3.1nb6 [dholland 2012-01-02] 12 Updated cross/h8300-hms-gcc to 3.1nb6 [dholland 2012-01-02]
13 Updated security/cy2-gssapi to 2.1.25nb1 [obache 2012-01-02] 13 Updated security/cy2-gssapi to 2.1.25nb1 [obache 2012-01-02]
14 Updated audio/alsa-lib to 1.0.22 [sbd 2012-01-02] 14 Updated audio/alsa-lib to 1.0.22 [sbd 2012-01-02]
@@ -3211,14 +3211,13 @@ Changes to the packages collection and i @@ -3211,14 +3211,13 @@ Changes to the packages collection and i
3211 Updated print/hplip to 3.12.6 [schnoebe 2012-06-23] 3211 Updated print/hplip to 3.12.6 [schnoebe 2012-06-23]
3212 Updated graphics/GraphicsMagick to 1.3.16 [obache 2012-06-24] 3212 Updated graphics/GraphicsMagick to 1.3.16 [obache 2012-06-24]
3213 Updated emulators/qemu to 1.1.0nb1 [sbd 2012-06-25] 3213 Updated emulators/qemu to 1.1.0nb1 [sbd 2012-06-25]
3214 Updated devel/kdesdk3 to 3.5.10nb28 [sbd 2012-06-26] 3214 Updated devel/kdesdk3 to 3.5.10nb28 [sbd 2012-06-26]
3215 Updated devel/ecore to 1.1.0nb1 [sbd 2012-06-26] 3215 Updated devel/ecore to 1.1.0nb1 [sbd 2012-06-26]
3216 Updated audio/hydrogen to 0.9.4.2nb5 [sbd 2012-06-28] 3216 Updated audio/hydrogen to 0.9.4.2nb5 [sbd 2012-06-28]
3217 Updated mail/getmail to 4.30.2 [schmonz 2012-06-28] 3217 Updated mail/getmail to 4.30.2 [schmonz 2012-06-28]
3218 Updated www/wordpress to 3.4.1 [morr 2012-06-29] 3218 Updated www/wordpress to 3.4.1 [morr 2012-06-29]
3219 Updated security/f-prot-antivirus6-fs-bin to 6.2.1 [taca 2012-06-29] 3219 Updated security/f-prot-antivirus6-fs-bin to 6.2.1 [taca 2012-06-29]
3220 Updated security/f-prot-antivirus6-ms-bin to 6.2.1 [taca 2012-06-29] 3220 Updated security/f-prot-antivirus6-ms-bin to 6.2.1 [taca 2012-06-29]
3221 Updated security/f-prot-antivirus6-ws-bin to 6.2.1 [taca 2012-06-29] 3221 Updated security/f-prot-antivirus6-ws-bin to 6.2.1 [taca 2012-06-29]
3222 Updated mail/sylpheed to 3.2.0 [taca 2012-06-29] 3222 Updated mail/sylpheed to 3.2.0 [taca 2012-06-29]
3223 Updated sysutils/p5-Sys-Filesystem to 1.30nb3 [dholland 2012-06-30] 3223 Updated sysutils/p5-Sys-Filesystem to 1.30nb3 [dholland 2012-06-30]
3224 Updated devel/py-pyutil to 1.9.3 [gdt 2012-07-20] 
cvs diff -r1.11314.2.1 -r1.11314.2.2 pkgsrc/doc/TODO (expand / switch to unified diff)

--- pkgsrc/doc/TODO 2012/07/20 00:41:31 1.11314.2.1
+++ pkgsrc/doc/TODO 2012/07/20 09:26:50 1.11314.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: TODO,v 1.11314.2.1 2012/07/20 00:41:31 gdt Exp $ 1$NetBSD: TODO,v 1.11314.2.2 2012/07/20 09:26:50 tron Exp $
2 2
3Suggested new packages 3Suggested new packages
4====================== 4======================
5 5
6 any unresolved PRs (if you have commit access) 6 any unresolved PRs (if you have commit access)
7 http://www.netbsd.org/Gnats/category/pkg.html 7 http://www.netbsd.org/Gnats/category/pkg.html
8 8
9 any complete, polished packages in pkgsrc-wip (ditto) 9 any complete, polished packages in pkgsrc-wip (ditto)
10 http://pkgsrc-wip.sourceforge.net/ 10 http://pkgsrc-wip.sourceforge.net/
11 11
12 bacula-rescue 12 bacula-rescue
13 Scripts used to help create rescue boot cd's for bare metal 13 Scripts used to help create rescue boot cd's for bare metal
14 restores with bacula. Scripts exist for linux, solaris, and 14 restores with bacula. Scripts exist for linux, solaris, and
@@ -1061,26 +1061,27 @@ For possible perl packages updates, see  @@ -1061,26 +1061,27 @@ For possible perl packages updates, see
1061 o py-FourSuite-1.0.2 1061 o py-FourSuite-1.0.2
1062 o py-HappyDoc-3.0 1062 o py-HappyDoc-3.0
1063 o py-Scientific-doc-2.5.5 1063 o py-Scientific-doc-2.5.5
1064 o py-creole-1.0.4 [pkg/46593] 1064 o py-creole-1.0.4 [pkg/46593]
1065 o py-dbus-1.1.0 [needs dbus>=1.4] 1065 o py-dbus-1.1.0 [needs dbus>=1.4]
1066 o py-docutils-0.9 [pkg/46573] 1066 o py-docutils-0.9 [pkg/46573]
1067 o py-docutils-0.9.1 1067 o py-docutils-0.9.1
1068 o py-game-1.9.1 [needs portmidi] 1068 o py-game-1.9.1 [needs portmidi]
1069 o py-gnosis-1.2.2 1069 o py-gnosis-1.2.2
1070 o py-gnosis-utils-1.2.1 1070 o py-gnosis-utils-1.2.1
1071 o py-gobject-3.2.2 1071 o py-gobject-3.2.2
1072 o py-ldap-2.4.10 1072 o py-ldap-2.4.10
1073 o py-libxml2-2.8.0 1073 o py-libxml2-2.8.0
 1074 o py-pyutil-1.9.3 [pkg/46551]
1074 o py-qt4-4.9.3 1075 o py-qt4-4.9.3
1075 o py-setuptools_trial-0.5.12 [pkg/46550] 1076 o py-setuptools_trial-0.5.12 [pkg/46550]
1076 o py-sip-4.13.3 1077 o py-sip-4.13.3
1077 o py-sybase-0.37 1078 o py-sybase-0.37
1078 o py-urwid-1.0.1 1079 o py-urwid-1.0.1
1079 o qbrew-0.3.9 1080 o qbrew-0.3.9
1080 o qiv-2.2.4 [pkg/46167] 1081 o qiv-2.2.4 [pkg/46167]
1081 o qnetwalk-1.3 1082 o qnetwalk-1.3
1082 o qt4-qscintilla-2.6.2 1083 o qt4-qscintilla-2.6.2
1083 o quilt-0.60 1084 o quilt-0.60
1084 o qvplay-0.95 1085 o qvplay-0.95
1085 o radiance-3.7.2 1086 o radiance-3.7.2
1086 o raine-0.51.8 1087 o raine-0.51.8