The following commit has been merged in the pristine-tar branch:
commit d4e3dac4958a8ea744e37509ceecba552208b4ed
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Sat Dec 6 17:46:08 2008 +
pristine-tar data for omvviewer_1.22.2.orig.tar.gz
diff --git a/omvviewer_1.22.2
The following commit has been merged in the pristine-tar branch:
commit 497146ba095368e64591b645295919b7f7b93a85
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Wed Jan 28 20:37:08 2009 +
pristine-tar data for omvviewer_1.22.7.orig.tar.gz
diff --git a/omvviewer_1.22.7
The following commit has been merged in the pristine-tar branch:
commit 70c048c6ca55dc7ab8564b3c9e822204e34c5f86
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Thu Feb 5 22:26:54 2009 +
pristine-tar data for omvviewer_1.22.8.orig.tar.gz
diff --git a/omvviewer_1.22.8
The following commit has been merged in the pristine-tar branch:
commit f2607ec05953be80f819126620e85b5a67918646
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Thu Feb 26 21:10:41 2009 +
pristine-tar data for slviewer-src-viewer-1.22.10-r112620.tar.gz
diff --git a/slviewer-src
The following commit has been merged in the upstream branch:
commit c8fb40a62dc78f520f508855317c5678538b
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Tue Nov 25 21:16:41 2008 +
Imported Upstream version 1.22.1
diff --git a/indra/llcommon/llversionviewer.h b/indra
The following commit has been merged in the upstream branch:
commit 6aa10a141a3246fe119cd9ef0a2fcaf554e48ad8
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Sat Feb 7 10:12:02 2009 +
remove build cruff mistake from upstream
diff --git a/indra/lib/python/indra/__init__.pyc
b
The following commit has been merged in the upstream branch:
commit 2c826baed37459e35b0e371e3311e1138909268e
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Thu Feb 26 21:10:31 2009 +
Imported Upstream version 1.22.10
diff --git a/indra/llcommon/llversionviewer.h b/indra
The following commit has been merged in the master branch:
commit 22fd7cfae5fcede98ba2581af2ad7c1497ea9d3d
Merge: 21c4e7cf04d86adfb236a5474d7367d70877b755
1836a2bcbf5c4da354e770b8d1642afe3ce4a362
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Tue Apr 14 11:18:51 2009 +0100
Merge
The following commit has been merged in the master branch:
commit 9bfc5d3d863ae5c5d84c042ffef61efcbe25c893
Merge: 901f3c5fa557d0ace5129dc7443412fcd91d6653
b9ef03b087ac9697d73d46b6e2deec3ba0db53be
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Fri Mar 13 11:17:19 2009 +
Merge
The following commit has been merged in the master branch:
commit 3f0fb36ce5f352a0a75ce33af0d7054ba05e7087
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Fri Mar 13 21:58:36 2009 +
Update debian/
diff --git a/debian/files b/debian/files
new file mode 100644
index 000
The following commit has been merged in the master branch:
commit 0db5da53ce5b1ed02480389f984da22ad6366939
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Fri Mar 13 22:33:48 2009 +
set changelog for unstable target
diff --git a/debian/changelog b/debian/changelog
index dd30a98
The following commit has been merged in the master branch:
commit 9664279e2814f8b54a1b3ac10ca19992d335b179
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Fri Mar 13 21:59:37 2009 +
remove cruff
diff --git a/debian/files b/debian/files
deleted file mode 100644
index e7b999b
The following commit has been merged in the master branch:
commit 2599d43b70bc9888002b11d97b1ed42688202e3a
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Fri Mar 13 11:24:35 2009 +
bump standards version and description
diff --git a/debian/control b/debian/control
index
The following commit has been merged in the pristine-tar branch:
commit e9d0b2d883c9d252a1c9cb39edd77747062f783e
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Fri Mar 13 11:13:31 2009 +
pristine-tar data for omvviewer-artwork_1.22.11+dfsg.orig.tar.gz
diff --git a/omvviewer
The following commit has been merged in the master branch:
commit b7c122a63bdb2ade38ebfce095361fe28328f097
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Fri Mar 13 11:20:34 2009 +
bump changelog
diff --git a/debian/changelog b/debian/changelog
index ef7a8fb..dd30a98 100644
The following commit has been merged in the master branch:
commit 2a5364ed74a8ffd57cec2181257d72a9979cb08f
Author: Robin Cornelius robin.cornel...@gmail.com
Date: Fri Mar 13 11:17:59 2009 +
add files we just lost
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
The following commit has been merged in the master branch:
commit 4ca9597b5d0a9bcbd90e8e1a6a7cf368f0d8ada1
Merge: c69389373aac4c09cf58822fa7b2b2e42a29c687
cf8d8a6992bc959da9667bdbabd73f4e13a999cc
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Thu Nov 27 19:56:56 2008 +
Merge commit
The following commit has been merged in the master branch:
commit c5031c256f08e6d5e6cd4af629ba97bfc28f1891
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Thu Nov 27 19:57:58 2008 +
Bump version
diff --git a/debian/changelog b/debian/changelog
index 6f60336..ef7a8fb 100644
--- a/debian
The following commit has been merged in the pristine-tar branch:
commit 22187c2d0ea3e868d28ea96096f074abc55652bc
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Thu Nov 27 19:56:43 2008 +
pristine-tar data for omvviewer-artwork_1.22.1+dfsg.orig.tar.gz
diff --git a/omvviewer
The annotated tag, upstream/1.22.1+dfsg has been created
at 99ac57b2e732c7e593ddf10bee1965eed67b7204 (tag)
tagging cf8d8a6992bc959da9667bdbabd73f4e13a999cc (commit)
replaces upstream/1.21.6+dfsg
tagged by Robin Cornelius
on Thu Nov 27 19:56:43 2008 +
- Shortlog
The following commit has been merged in the master branch:
commit e43a14cbd24d252aadf74718b7ab6aa3de46215d
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Mon Nov 17 12:25:56 2008 +
Update gconf-defaults with correct paths, enable nvidia header patch
diff --git a/debian/omvviewer.gconf
The following commit has been merged in the master branch:
commit 21c4e7cf04d86adfb236a5474d7367d70877b755
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Mon Nov 17 16:08:58 2008 +
Fix a build fault due to incorrect usage of Gtk message dialogs
diff --git a/debian/patches/series b
The following commit has been merged in the master branch:
commit 14c7d1906d3a0c2f853befd39048b3a96b1e6e1c
Author: Carlo Wood [EMAIL PROTECTED]
Date: Sun Nov 2 17:14:27 2008 +
Fix processing of CXXFLAGS/DEB_BUILD_OPTIONS
diff --git a/debian/rules b/debian/rules
index 07f4377..847bc52
The following commit has been merged in the master branch:
commit 0bdd7ff62052310c1ac7dc07412a0c0facaf7068
Author: Carlo Wood [EMAIL PROTECTED]
Date: Sun Nov 2 17:17:55 2008 +
Allow-CXXFLAGS-to-specify-the-debug-flag, applying change to upstream via
quilt
diff --git
The following commit has been merged in the master branch:
commit 528ee6d57f83cd52bd79c710ac677bcb169a2e37
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Nov 1 15:18:06 2008 +
Update build procedure and fix some mistakes
diff --git a/debian/patches/VWR-9557-nvidia-headers-missing
The following commit has been merged in the master branch:
commit ce4d28d6cd4e31878908775e14f04fdc840a3728
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Oct 18 11:24:30 2008 +0100
Stop joystick patch as it causes FTBFS and needs work
diff --git a/debian/patches/series b/debian
The following commit has been merged in the master branch:
commit 34cfa5758461a0e792761caa2e78bcdc8849130b
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Oct 18 12:29:23 2008 +0100
Fix additional bug with icon install
diff --git a/debian/omvviewer.install b/debian/omvviewer.install
The following commit has been merged in the master branch:
commit 8dcf305e837874e8e71a9905d1a6f99703199fca
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Oct 31 18:38:41 2008 +
Fix build if nvidia gl.h is present and pass CFLAGS to cmake
diff --git a/debian/patches/VWR-9557-nvidia
The following commit has been merged in the master branch:
commit 26168ae527154d758dc425967daf296ec13e231d
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Mon Jul 14 23:12:08 2008 +0200
update watch file
diff --git a/debian/watch b/debian/watch
index 531a418..55433c8 100644
--- a/debian
The following commit has been merged in the master branch:
commit 4d569d4cb01533c1a26aea35754b504e53dd62e2
Merge: 26168ae527154d758dc425967daf296ec13e231d
46a887b6320b04c5c24f7f94915cd6f5460216ac
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Jul 19 11:32:16 2008 +0200
Merge branch
The following commit has been merged in the master branch:
commit a740beb58d977bb0c9c9b6f67765552f46a31fd6
Merge: 4d569d4cb01533c1a26aea35754b504e53dd62e2
70b9f20eaf421febb4f848e117184c6f0e16477b
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Mon Jul 21 12:38:13 2008 +0200
Merge branch
The following commit has been merged in the master branch:
commit 9cfd5303065fe5ce41cd1b2adc9f8cbcb9e88f2f
Merge: a740beb58d977bb0c9c9b6f67765552f46a31fd6
83fc2f007523301a187c95bce8600be9672ec306
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Wed Sep 10 16:31:21 2008 +0100
sync to 1.21.1
The following commit has been merged in the master branch:
commit 804018f8a44cddcc7c05968a7566f8e275c9bd06
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Wed Sep 10 16:32:25 2008 +0100
bump change
diff --git a/debian/changelog b/debian/changelog
index 8bd939d..3f08140 100644
--- a/debian
The following commit has been merged in the master branch:
commit d36e733c814dee9fe738fd7ece3b951bb3ce7f09
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Oct 18 10:54:34 2008 +0100
Imported Upstream version 1.21.6+dfsg
diff --git a/indra/newview/res/install_icon.ico
b/indra/newview
The following commit has been merged in the master branch:
commit 6e79b3f7d05208fb21a6d5fbe9847a795cd00552
Merge: 387b75e654c74d50ad5975ba2cc6dd9beab7d829
d36e733c814dee9fe738fd7ece3b951bb3ce7f09
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Oct 18 10:54:34 2008 +0100
Merge commit
The following commit has been merged in the master branch:
commit c69389373aac4c09cf58822fa7b2b2e42a29c687
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Oct 18 10:55:19 2008 +0100
Import 1.21.6 artwork for release
diff --git a/debian/changelog b/debian/changelog
index 3f08140
The annotated tag, upstream/1.20.13+dfsg has been created
at 423150f161d9317a858e8938ead794b05c6a72f0 (tag)
tagging dc1129729dff0c6f26e5437e887b89eed74b09d0 (commit)
replaces upstream/1.20.4.0
tagged by Robin Cornelius
on Mon Jul 14 23:12:48 2008 +0200
- Shortlog
The annotated tag, upstream/1.21.1+dfsg has been created
at 4f2614d05a9beb83b13af87ba4b885d982dfa285 (tag)
tagging 83fc2f007523301a187c95bce8600be9672ec306 (commit)
replaces upstream/1.20.13+dfsg
tagged by Robin Cornelius
on Wed Sep 10 16:29:30 2008 +0100
- Shortlog
The annotated tag, upstream/1.21.6+dfsg has been created
at eaa5f83f8b106cfe870ef97add20d150579a2d74 (tag)
tagging d36e733c814dee9fe738fd7ece3b951bb3ce7f09 (commit)
replaces upstream/1.21.1+dfsg
tagged by Robin Cornelius
on Sat Oct 18 10:54:34 2008 +0100
- Shortlog
The following commit has been merged in the upstream branch:
commit e19771a9601d2a21953b584be3147718d9232707
Merge: d36e733c814dee9fe738fd7ece3b951bb3ce7f09
6a5a4cf91c4c00eb26b253a1d7cca9173042a62d
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Oct 18 10:58:20 2008 +0100
fix merge
The following commit has been merged in the pristine-tar branch:
commit b340021b8ac7c8030c14a7c8411e970aad609bdb
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Mon Jul 14 23:12:48 2008 +0200
pristine-tar data for omvviewer-artwork_1.20.13+dfsg.orig.tar.gz
diff --git a/omvviewer
The following commit has been merged in the pristine-tar branch:
commit 4e4a16d3a60602a82c76c2e93048e5ca41553257
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Wed Sep 10 16:29:29 2008 +0100
pristine-tar data for omvviewer-artwork_1.21.1+dfsg.orig.tar.gz
diff --git a/omvviewer
The following commit has been merged in the pristine-tar branch:
commit 7b9eacfd6dc7ad57b038abffba6a0d8ced433323
Merge: 4e4a16d3a60602a82c76c2e93048e5ca41553257
9e88feb6b9d341ffe8e40fd0723b5797ea0bc2e5
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Oct 18 10:58:55 2008 +0100
Merge
The following commit has been merged in the master branch:
commit 31ca7e6de553c47cb226bcb99b44b12d32044175
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Oct 17 17:21:10 2008 +0100
fix some lintian warnings and update standards
diff --git a/debian/changelog b/debian/changelog
index
The following commit has been merged in the master branch:
commit 4c7c6514a09d36c56d6e7f66927bdc58dac3e651
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Oct 17 17:21:24 2008 +0100
fix missing icon
diff --git a/debian/omvviewer.install b/debian/omvviewer.install
index 70cdb10..0758f0d
The following commit has been merged in the master branch:
commit 587e9a93efd71250c041b96eaefc5e806351c94f
Merge: 4c7c6514a09d36c56d6e7f66927bdc58dac3e651
7077f18e3017e8881074fa4d7baac87ea9a9e367
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Oct 18 10:32:20 2008 +0100
Merge commit
The following commit has been merged in the master branch:
commit 57b5d4c4d15641b669a6eebdf0621be55f587636
Merge: b059fc25cf514417e7fbeb4d6aeb72755884737d
a2d69614017bb017177749ca2cbdbdeb82873985
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Oct 3 19:13:35 2008 +0100
Merge commit
The following commit has been merged in the master branch:
commit 2ca025f3cef09198de320f4ad78857243afbac09
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Tue Oct 7 16:42:20 2008 +0100
Bump version and import security patch DEV-21775
diff --git a/debian/patches/DEV-21775.patch b/debian
The following commit has been merged in the master branch:
commit f6831f2b0aa6dc7b532908355b2f6f047d42fa6b
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Tue Oct 7 16:42:37 2008 +0100
Bump version and import security patch DEV-21775
diff --git a/debian/changelog b/debian/changelog
index
The following commit has been merged in the pristine-tar branch:
commit 8b00122a203839fa6f1c98cb1ea3103cdee9b93b
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Oct 3 19:13:33 2008 +0100
pristine-tar data for omvviewer_1.21.4.orig.tar.gz
diff --git a/omvviewer_1.21.4.orig.tar.gz.delta
The annotated tag, upstream/1.21.4 has been created
at a5bfc90ecfd73319794f3d16dbfdd653a74c910c (tag)
tagging a2d69614017bb017177749ca2cbdbdeb82873985 (commit)
replaces upstream/1.21.3
tagged by Robin Cornelius
on Fri Oct 3 19:13:33 2008 +0100
- Shortlog
The following commit has been merged in the master branch:
commit 5a0ace206caf18cc432a2ae52d75d9e006e0f20d
Merge: 0abdc0838ad63ede53daa458cbc47bdde355725d
4be010a09c5136b82a8b11b9b24fb5c8f0aaa838
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Sep 26 21:12:36 2008 +0100
Merge commit
The following commit has been merged in the master branch:
commit b059fc25cf514417e7fbeb4d6aeb72755884737d
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Sep 26 21:13:37 2008 +0100
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 63a5c16..a877b42 100644
The following commit has been merged in the pristine-tar branch:
commit 92a571c82213e52db1ee0bbe1448f9ac68166f24
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Sep 26 21:12:34 2008 +0100
pristine-tar data for omvviewer_1.21.3.orig.tar.gz
diff --git a/omvviewer_1.21.3.orig.tar.gz.delta
The annotated tag, upstream/1.21.3 has been created
at aa59de1a4fc22c3d1ad5a75e4b42d9d1bda4f2e5 (tag)
tagging 4be010a09c5136b82a8b11b9b24fb5c8f0aaa838 (commit)
replaces upstream/1.21.2
tagged by Robin Cornelius
on Fri Sep 26 21:12:34 2008 +0100
- Shortlog
The following commit has been merged in the master branch:
commit fec20b0b2ad7368eb1d844c88760777f8ce0ec42
Merge: 2cf70b5d4e0d8adba9cce2c2743caceec147eeab
768ef482a24229d6e615b6e73b46e527e16fe903
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sun Sep 14 17:00:28 2008 +0100
Merge commit
The following commit has been merged in the pristine-tar branch:
commit 19096eb6f65831cc50d165b5dc93f76aab5e220b
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sun Sep 14 17:00:26 2008 +0100
pristine-tar data for omvviewer_1.21.2.orig.tar.gz
diff --git a/omvviewer_1.21.2.orig.tar.gz.delta
The annotated tag, upstream/1.21.2 has been created
at 45247c22c618abb790241d8874874c295f97f6d3 (tag)
tagging 768ef482a24229d6e615b6e73b46e527e16fe903 (commit)
replaces upstream/1.21.1
tagged by Robin Cornelius
on Sun Sep 14 17:00:26 2008 +0100
- Shortlog
The following commit has been merged in the master branch:
commit 3b8445f30d738a4a62746042fa5bcbcb40f343c8
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Wed Sep 10 19:25:20 2008 +0100
Fix some final build mistakes in a pbuilder
diff --git a/debian/patches
The following commit has been merged in the master branch:
commit 6dbf70a80c14501bd4f3bf505022b002dca9bc06
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Wed Sep 10 19:25:37 2008 +0100
Fix some final build mistakes in a pbuilder
diff --git a/debian/control b/debian/control
index f95c635
The following commit has been merged in the master branch:
commit 2cf70b5d4e0d8adba9cce2c2743caceec147eeab
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Wed Sep 10 19:29:13 2008 +0100
Update changelog with details
diff --git a/debian/changelog b/debian/changelog
index e0a6feb..0da9d5e
The following commit has been merged in the master branch:
commit 2b9aae4e18fb99eb64ec499eaa345d50429f7cdb
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Mon Sep 8 22:09:04 2008 +0100
Update control file for new deps and Correct X-VCS
diff --git a/debian/control b/debian/control
index
The following commit has been merged in the master branch:
commit 270c15990153441f6197cb3d5bd8ec9af37fac2e
Merge: 2b9aae4e18fb99eb64ec499eaa345d50429f7cdb
e0d52e54a06cfccf2a3db9df1f05978618f47855
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Mon Sep 8 22:11:47 2008 +0100
Merge commit
The following commit has been merged in the master branch:
commit 1c0ec4dc41f7eaa283670aa590f23fd5b1ca96ed
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Tue Sep 9 21:30:31 2008 +0100
Bump to new version, fix build depends, and fix patch series
diff --git a/debian/changelog b/debian
The annotated tag, upstream/1.21.1 has been created
at 45a1adfb8b09477e241a2294799fc1c68b50ec5c (tag)
tagging e0d52e54a06cfccf2a3db9df1f05978618f47855 (commit)
replaces upstream/1.21.0.1
tagged by Robin Cornelius
on Mon Sep 8 22:11:46 2008 +0100
- Shortlog
The following commit has been merged in the pristine-tar branch:
commit df56b24a75fcbab01fd2fb3ad6f1e357c08bc808
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Mon Sep 8 22:11:45 2008 +0100
pristine-tar data for omvviewer_1.21.1.orig.tar.gz
diff --git a/omvviewer_1.21.1.orig.tar.gz.delta
The following commit has been merged in the master branch:
commit 21db3395602763f93e1e05f3f7b6f10f73ebb05a
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sun Sep 7 10:15:29 2008 +0100
Fix memcpy patch
diff --git a/debian/patches/lltemplatemessagereader_memcpy.patch
b/debian/patches
The following commit has been merged in the master branch:
commit 9997119ff2eb903dad0c18cab63a761217c2a67e
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sun Sep 7 10:20:37 2008 +0100
Rebase to correct upstream version
diff --git a/debian/changelog b/debian/changelog
index c453773
The tag, upstream/1.21.0 has been updated
to 6f164aed225aa4758a4e08e05080cc986e649d2b (commit)
from 378315bddb9858d532058b7cc28e16c950816553
- Shortlog
commit 6f164aed225aa4758a4e08e05080cc986e649d2b
Author: Robin
The following commit has been merged in the master branch:
commit f522a1f82136f9ef0507c7dd4b61521a6a3da382
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Sep 5 11:22:03 2008 +0100
More packaging fixes and correct openAL inclusion
diff --git a/debian/control b/debian/control
index
The following commit has been merged in the master branch:
commit 06fe2e9f2b89318156df14c96415ace0128c082d
Merge: f522a1f82136f9ef0507c7dd4b61521a6a3da382
6f164aed225aa4758a4e08e05080cc986e649d2b
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Sep 5 11:41:42 2008 +0100
Complete merge
The following commit has been merged in the master branch:
commit 59d9babea4ff6bb34b34ac71a1c88dc0063be10f
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Sep 5 11:42:30 2008 +0100
Bump change log
diff --git a/debian/changelog b/debian/changelog
index c34768e..c453773 100644
The following commit has been merged in the master branch:
commit a0c8f812835f5f6865a4fc0a18f59dc9c2a528f2
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Sep 5 12:16:39 2008 +0100
Import the glh_linear.h header directly into tree
diff --git a/indra/llwindow/glh/glh_linear.h b/indra
The following commit has been merged in the master branch:
commit 4998217f63b3461441e22e7a659cbb13d684
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Sep 5 16:14:44 2008 +0100
Add final patches to complete a full build
diff --git a/debian/patches/add_find_curl_cmake.patch
b
The following commit has been merged in the pristine-tar branch:
commit c4bee194f1d916f66693651032297fa7015d9ba4
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Sep 5 11:38:43 2008 +0100
pristine-tar data for omvviewer_1.21.0.1.orig.tar.gz
diff --git a/omvviewer_1.21.0.1
The annotated tag, upstream/1.21.0.1 has been created
at a93ce2d2b91f8b98c16988264f5b648a31366783 (tag)
tagging 6f164aed225aa4758a4e08e05080cc986e649d2b (commit)
replaces upstream/1.21.0
tagged by Robin Cornelius
on Fri Sep 5 11:38:44 2008 +0100
- Shortlog
The following commit has been merged in the master branch:
commit f14a84ac75594d99f35daad0ad1dbe052b5980b1
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Aug 29 18:36:07 2008 +0100
Buffer overrun prevension
diff --git a/debian/patches/VWR-8194_clamp_outline_for_broken_nvidia.dpatch
b
The following commit has been merged in the master branch:
commit 9b7faa0e0759c3f1543ba94d4486846086046ebc
Merge: f14a84ac75594d99f35daad0ad1dbe052b5980b1
991d82fa10b91c2d0a96b9314349b336a5cd6830
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Tue Sep 2 20:38:18 2008 +0100
Merge upstream
The following commit has been merged in the master branch:
commit 3c8b31efedafc5d4f22ec6f96890266f182e0bff
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Tue Sep 2 20:42:09 2008 +0100
Import new build system rules
diff --git a/debian/control b/debian/control
index 326e394..a7d3332 100644
The following commit has been merged in the pristine-tar branch:
commit b50999c62830678595a4ffd2ea2fda3784a25ab7
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Tue Sep 2 20:30:58 2008 +0100
pristine-tar data for omvviewer_1.21.0.orig.tar.gz
diff --git a/omvviewer_1.21.0.orig.tar.gz.delta
The annotated tag, upstream/1.21.0 has been created
at 378315bddb9858d532058b7cc28e16c950816553 (tag)
tagging 991d82fa10b91c2d0a96b9314349b336a5cd6830 (commit)
replaces upstream/1.20.15
tagged by Robin Cornelius
on Tue Sep 2 20:30:59 2008 +0100
- Shortlog
The following commit has been merged in the master branch:
commit 1aee16aa1d1aac6050f0cd2436bd98a531ba4b76
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Tue Sep 2 21:44:19 2008 +0100
Build fixes and extra required patches
diff --git a/debian/patches/dont_depend_on_artwork_to_build.patch
The following commit has been merged in the master branch:
commit 9e6a9ba119be5c36b974459c13af09486265d47e
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Tue Sep 2 21:44:46 2008 +0100
Build fixes and extra required patches
diff --git a/debian/changelog b/debian/changelog
index f4a9903
The following commit has been merged in the master branch:
commit 95d151f47e388a67e643f9befeb8dde9913c7248
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Tue Sep 2 21:52:24 2008 +0100
Fix openal patch
diff --git a/debian/patches/openal_1.21.0.diff
b/debian/patches/openal_1.21.0.diff
The following commit has been merged in the master branch:
commit 9d423c298ce22d5503d6c3210f03dda6e42f1f7d
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Tue Sep 2 23:47:40 2008 +0100
Add in llmozlib2 shared patch and fix build system to build in a temp
directory and fix clean rule too
The following commit has been merged in the master branch:
commit a93d5ccf65f1f9373c6be0a3250ffa4bfe48dac5
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sun Jul 20 13:18:37 2008 +0200
Fix minor issue with patch, reused existing variable name
diff --git
a/debian/patches/VWR
The following commit has been merged in the master branch:
commit 68bcb64fe89b49fed96db33eda580e949459820f
Merge: a93d5ccf65f1f9373c6be0a3250ffa4bfe48dac5
063f9d7ba6e3a163d14fbb92532a7fe025cafbb8
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Jul 25 13:35:23 2008 +0200
Merge commit
The following commit has been merged in the master branch:
commit e4a4413eb837eeb4bdd1ae8a4a4eec7abcf29f3f
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Jul 25 13:38:50 2008 +0200
Bump to new version and add in missing memcheck removal
diff --git a/debian/changelog b/debian/changelog
The following commit has been merged in the pristine-tar branch:
commit a77151b14e839bf32855e6ec2faccbfe0b2482a1
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Fri Jul 25 13:35:22 2008 +0200
pristine-tar data for omvviewer_1.20.15.orig.tar.gz
diff --git a/omvviewer_1.20.15
The annotated tag, upstream/1.20.15 has been created
at ed418ca58de5cb24b5d2a4045b4dca10dcc96a5a (tag)
tagging 063f9d7ba6e3a163d14fbb92532a7fe025cafbb8 (commit)
replaces upstream/1.20.14
tagged by Robin Cornelius
on Fri Jul 25 13:35:22 2008 +0200
- Shortlog
The following commit has been merged in the master branch:
commit 178b44468da68ba7afc2e321b8177aa50d5db823
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Jul 19 13:19:43 2008 +0200
and correcly commit changes to VWR-4981 patch
diff --git
a/debian/patches/VWR
The following commit has been merged in the master branch:
commit f82ac3f7f351bbff500b5f9db88a0545da6b6f98
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sun Jul 20 11:25:16 2008 +0200
Add in broken nvidia driver patch
diff --git a/debian/changelog b/debian/changelog
index 885c753
The following commit has been merged in the master branch:
commit 70b9f20eaf421febb4f848e117184c6f0e16477b
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Jul 19 10:56:40 2008 +0100
re add changelog, it got eaten somewhere
diff --git a/debian/changelog b/debian/changelog
new file mode
The following commit has been merged in the master branch:
commit 2093267ecbeace9b35c5bbffdd2ee5f2cea87221
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Wed Jul 9 12:07:05 2008 +0100
Fix binNMU lintian warning
diff --git a/debian/rules b/debian/rules
index 4c50119..bb82dd6 100755
The following commit has been merged in the master branch:
commit 9a8178e5f1e7aaa8e8eaffbcc23861f42a2a6730
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Wed Jul 9 12:08:06 2008 +0100
update standrads version
diff --git a/debian/control b/debian/control
index c0b3322..91e8795 100644
The following commit has been merged in the master branch:
commit 4e4d6c57ff7330cdb442ca70c3b55ba0d333d895
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Jul 12 22:08:40 2008 +0200
Temp fix as my etch builds do not support -X on dh_install and upstream has
not *yet* removed
The following commit has been merged in the master branch:
commit 9eaa7d9579e025943d86f04945709ceaa5069a77
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sun Jul 13 11:59:06 2008 +0200
rebase two patches due to file path changes in the source
diff --git a/debian/changelog b/debian
The following commit has been merged in the master branch:
commit 8526d3f6f4fdd83ab3a4c22a98d63755455583dc
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sun Jul 13 12:04:56 2008 +0200
finish rebasing patch
diff --git a/debian/patches/VWR-5082_set_bulk_inv_permissions.dpatch
b/debian
The following commit has been merged in the master branch:
commit 6460ec222ca4b1694a97635259945af756a8dc69
Merge: 4e4d6c57ff7330cdb442ca70c3b55ba0d333d895
9283698e4cdb3ab7e272643001943e312a89be67
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Sat Jul 12 22:15:54 2008 +0200
Merge commit
The following commit has been merged in the master branch:
commit 22f98c9d96db331b15d60d37b35128284414df90
Merge: c4ba6342b3404185bfa82be80d876a4798a14d21
68257a25aa7c14f30eada1ae866e487aa7500925
Author: Robin Cornelius [EMAIL PROTECTED]
Date: Wed Jul 16 23:11:35 2008 +0200
Merge commit
1 - 100 of 155 matches
Mail list logo